From d0fd1f8e1f57bc443309e64da87f4b67c475d1a1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 8 Dec 2004 20:01:22 +0000
Subject: [PATCH] upgrade to Netgen 4.4
---
Mesh/3D_Mesh_Netgen.cpp | 6 +-
Netgen/Makefile | 10 +-
Netgen/NEWS | 9 -
Netgen/README | 2 +-
Netgen/VERSION | 2 +-
Netgen/libsrc/csg/algprim.cpp | 80 +-
Netgen/libsrc/csg/algprim.hpp | 9 +-
Netgen/libsrc/csg/brick.cpp | 2 +-
Netgen/libsrc/csg/brick.hpp | 3 +-
Netgen/libsrc/csg/bspline2d.cpp | 9 +-
Netgen/libsrc/csg/csg.hpp | 17 +-
Netgen/libsrc/csg/csgeom.cpp | 1715 +++--
Netgen/libsrc/csg/csgeom.hpp | 48 +-
Netgen/libsrc/csg/csgparser.cpp | 576 +-
Netgen/libsrc/csg/edgeflw.cpp | 515 +-
Netgen/libsrc/csg/edgeflw.hpp | 25 +-
Netgen/libsrc/csg/edgeflw2.cpp | 1404 ++++
Netgen/libsrc/csg/edgeflw_new.cpp | 1553 +++++
Netgen/libsrc/csg/edgeflw_old.cpp | 1405 ++++
Netgen/libsrc/csg/genmesh.cpp | 1097 ++-
Netgen/libsrc/csg/identify.cpp | 173 +-
Netgen/libsrc/csg/identify.hpp | 7 +
Netgen/libsrc/csg/polyhedra.cpp | 130 +-
Netgen/libsrc/csg/polyhedra.hpp | 6 +
Netgen/libsrc/csg/singularref.cpp | 59 +-
Netgen/libsrc/csg/singularref.hpp | 23 +
Netgen/libsrc/csg/solid.cpp | 2132 +++---
Netgen/libsrc/csg/solid.hpp | 86 +-
Netgen/libsrc/csg/specpoin.cpp | 2056 +++---
Netgen/libsrc/csg/specpoin.hpp | 17 +-
Netgen/libsrc/csg/specpoin_new.cpp | 1367 ++++
Netgen/libsrc/csg/specpoin_old.cpp | 1370 ++++
Netgen/libsrc/csg/surface.cpp | 20 +-
Netgen/libsrc/csg/surface.hpp | 13 +-
Netgen/libsrc/csg/triapprox.cpp | 91 +-
Netgen/libsrc/csg/triapprox.hpp | 9 +-
Netgen/libsrc/general/array.hpp | 19 +-
Netgen/libsrc/general/bitarray.hpp | 4 +-
Netgen/libsrc/general/dynamicmem.cpp | 4 +-
Netgen/libsrc/general/flags.cpp | 8 +-
Netgen/libsrc/general/hashtabl.cpp | 1 +
Netgen/libsrc/general/hashtabl.hpp | 273 +-
Netgen/libsrc/general/moveablemem.cpp | 16 +-
Netgen/libsrc/general/moveablemem.hpp | 4 +-
Netgen/libsrc/general/mystring.cpp | 7 +-
Netgen/libsrc/general/mystring.hpp | 16 +
Netgen/libsrc/general/optmem.cpp | 8 +-
Netgen/libsrc/general/optmem.hpp | 20 +-
Netgen/libsrc/general/sort.cpp | 1 +
Netgen/libsrc/general/sort.hpp | 1 +
Netgen/libsrc/general/symbolta.hpp | 68 +-
Netgen/libsrc/general/table.cpp | 79 +-
Netgen/libsrc/general/table.hpp | 42 +-
Netgen/libsrc/general/template.hpp | 46 +-
Netgen/libsrc/geom2d/genmesh2d.cpp | 30 +-
Netgen/libsrc/geom2d/geom2dmesh.cpp | 123 +-
Netgen/libsrc/geom2d/spline2d.cpp | 597 +-
Netgen/libsrc/geom2d/spline2d.hpp | 41 +-
Netgen/libsrc/geom2d/splinegeometry2.cpp | 208 +-
Netgen/libsrc/geom2d/splinegeometry2.hpp | 44 +-
Netgen/libsrc/gprim/adtree.cpp | 3473 +++++-----
Netgen/libsrc/gprim/adtree.hpp | 8 +-
Netgen/libsrc/gprim/geom3d.cpp | 10 +
Netgen/libsrc/gprim/geom3d.hpp | 4 +
Netgen/libsrc/gprim/geomfuncs.hpp | 9 +-
Netgen/libsrc/gprim/geomobjects.hpp | 13 +
Netgen/libsrc/gprim/geomops.hpp | 17 +
Netgen/libsrc/gprim/transform3d.cpp | 1 +
Netgen/libsrc/gprim/transform3d.hpp | 47 +-
Netgen/libsrc/include/FlexLexer.h | 2 +-
Netgen/libsrc/include/mystdlib.h | 1 +
Netgen/libsrc/interface/Makefile | 2 +-
Netgen/libsrc/interface/nginterface.cpp | 387 +-
Netgen/libsrc/interface/nginterface.h | 29 +-
Netgen/libsrc/interface/nglib.cpp | 61 +-
Netgen/libsrc/interface/nglib.h | 30 +-
Netgen/libsrc/interface/readuser.cpp | 86 +-
Netgen/libsrc/interface/writeelmer.cpp | 127 +
Netgen/libsrc/interface/writefluent.cpp | 27 +-
Netgen/libsrc/interface/writegmsh.cpp | 200 +
Netgen/libsrc/interface/writepermas.cpp | 327 +-
Netgen/libsrc/interface/writepermas2.cpp | 173 +
Netgen/libsrc/interface/writetecplot.cpp | 2 +-
Netgen/libsrc/interface/writeuser.cpp | 204 +-
Netgen/libsrc/interface/writeuser.hpp | 21 +-
Netgen/libsrc/interface/wuchemnitz.cpp | 2 +-
Netgen/libsrc/linalg/Makefile | 2 +-
Netgen/libsrc/linalg/basemat.cpp | 51 +-
Netgen/libsrc/linalg/basemat.hpp | 24 +-
Netgen/libsrc/linalg/densemat.hpp | 16 +-
Netgen/libsrc/linalg/linalg.hpp | 2 +
Netgen/libsrc/linalg/sparsmat.cpp | 60 +-
Netgen/libsrc/linalg/sparsmat.hpp | 16 +-
Netgen/libsrc/linalg/vector.cpp | 1 +
Netgen/libsrc/makefile.inc | 10 +-
Netgen/libsrc/makefile.mach.FREEBSD | 26 +
Netgen/libsrc/makefile.mach.INTEL | 22 +-
Netgen/libsrc/makefile.mach.LINUX | 21 +-
Netgen/libsrc/makefile.mach.LINUXGCC33 | 33 +
Netgen/libsrc/meshing/adfront2.cpp | 47 +-
Netgen/libsrc/meshing/adfront2.hpp | 3 +-
Netgen/libsrc/meshing/adfront3.cpp | 150 +-
Netgen/libsrc/meshing/adfront3.hpp | 28 +-
Netgen/libsrc/meshing/bisect.cpp | 99 +-
Netgen/libsrc/meshing/bisect.hpp | 8 +-
Netgen/libsrc/meshing/clusters.cpp | 13 +-
Netgen/libsrc/meshing/curvedelems.cpp | 145 +-
Netgen/libsrc/meshing/curvedelems.hpp | 6 +-
Netgen/libsrc/meshing/curvedelems2.cpp | 65 +-
Netgen/libsrc/meshing/delaunay.cpp | 471 +-
Netgen/libsrc/meshing/findip.hpp | 8 -
Netgen/libsrc/meshing/geomsearch.cpp | 434 +-
Netgen/libsrc/meshing/global.cpp | 6 +-
Netgen/libsrc/meshing/hpref_prism.hpp | 300 +
Netgen/libsrc/meshing/hpref_quad.hpp | 2129 ++++++
Netgen/libsrc/meshing/hpref_tet.hpp | 2842 ++++++++
Netgen/libsrc/meshing/hpref_trig.hpp | 750 ++
Netgen/libsrc/meshing/hprefinement.cpp | 5788 +++++++---------
Netgen/libsrc/meshing/hprefinement.hpp | 207 +-
Netgen/libsrc/meshing/improve2.cpp | 68 +-
Netgen/libsrc/meshing/improve2.hpp | 2 +-
Netgen/libsrc/meshing/improve2gen.cpp | 348 +-
Netgen/libsrc/meshing/improve3.cpp | 181 +-
Netgen/libsrc/meshing/localh.hpp | 2 +
Netgen/libsrc/meshing/meshclass.cpp | 7247 +++++++++++---------
Netgen/libsrc/meshing/meshclass.hpp | 61 +-
Netgen/libsrc/meshing/meshfunc.cpp | 117 +-
Netgen/libsrc/meshing/meshfunc.hpp | 7 +-
Netgen/libsrc/meshing/meshing.hpp | 16 +-
Netgen/libsrc/meshing/meshing2.cpp | 302 +-
Netgen/libsrc/meshing/meshing3.cpp | 119 +-
Netgen/libsrc/meshing/meshing3.hpp | 70 +-
Netgen/libsrc/meshing/meshtool.cpp | 1291 ++--
Netgen/libsrc/meshing/meshtool.hpp | 1 +
Netgen/libsrc/meshing/meshtype.cpp | 571 +-
Netgen/libsrc/meshing/meshtype.hpp | 138 +-
Netgen/libsrc/meshing/msghandler.cpp | 91 +-
Netgen/libsrc/meshing/msghandler.hpp | 9 +-
Netgen/libsrc/meshing/netrule2.cpp | 64 +-
Netgen/libsrc/meshing/netrule3.cpp | 17 +-
Netgen/libsrc/meshing/parser2.cpp | 15 +-
Netgen/libsrc/meshing/parser3.cpp | 2 +-
Netgen/libsrc/meshing/prism2rls.cpp | 13 +-
Netgen/libsrc/meshing/prism2rls_2.cpp | 446 ++
Netgen/libsrc/meshing/quadrls.cpp | 60 +-
Netgen/libsrc/meshing/refine.cpp | 554 +-
Netgen/libsrc/meshing/ruler2.cpp | 136 +-
Netgen/libsrc/meshing/ruler2.hpp | 27 +-
Netgen/libsrc/meshing/ruler3.cpp | 1 -
Netgen/libsrc/meshing/secondorder.cpp | 220 +-
Netgen/libsrc/meshing/smoothing2.cpp | 1326 ++--
Netgen/libsrc/meshing/smoothing3.cpp | 171 +-
Netgen/libsrc/meshing/topology.cpp | 216 +-
Netgen/libsrc/meshing/topology.hpp | 10 +-
Netgen/libsrc/meshing/zrefine.cpp | 2 +-
Netgen/libsrc/occ/occgenmesh.cpp | 1121 ++-
Netgen/libsrc/occ/occgeom.cpp | 1072 ++-
Netgen/libsrc/occ/occgeom.hpp | 230 +-
Netgen/libsrc/occ/occmeshsurf.cpp | 343 +-
Netgen/libsrc/occ/occmeshsurf.hpp | 30 +-
Netgen/libsrc/stlgeom/meshstlsurface.cpp | 16 +-
Netgen/libsrc/stlgeom/meshstlsurface.hpp | 1 +
Netgen/libsrc/stlgeom/stlgeom.cpp | 3 +-
Netgen/libsrc/stlgeom/stlgeom.hpp | 2 +-
Netgen/libsrc/stlgeom/stlgeomchart.cpp | 2 +-
Netgen/libsrc/stlgeom/stlgeommesh.cpp | 13 +-
Netgen/libsrc/visualization/Makefile | 2 +-
Netgen/libsrc/visualization/mvdraw.cpp | 2193 +++---
Netgen/libsrc/visualization/mvdraw.hpp | 24 +-
Netgen/libsrc/visualization/soldata.hpp | 28 +-
Netgen/libsrc/visualization/stlmeshing.cpp | 48 +-
Netgen/libsrc/visualization/vispar.hpp | 89 +
Netgen/libsrc/visualization/vscsg.cpp | 2 +-
Netgen/libsrc/visualization/vsmesh.cpp | 2877 ++++----
Netgen/libsrc/visualization/vsocc.cpp | 743 ++
Netgen/libsrc/visualization/vssolution.cpp | 1009 ++-
Netgen/libsrc/visualization/vssolution.hpp | 22 +-
Netgen/nglib_addon.cpp | 12 +-
178 files changed, 39979 insertions(+), 20576 deletions(-)
delete mode 100644 Netgen/NEWS
create mode 100644 Netgen/libsrc/csg/edgeflw2.cpp
create mode 100644 Netgen/libsrc/csg/edgeflw_new.cpp
create mode 100644 Netgen/libsrc/csg/edgeflw_old.cpp
create mode 100644 Netgen/libsrc/csg/specpoin_new.cpp
create mode 100644 Netgen/libsrc/csg/specpoin_old.cpp
create mode 100644 Netgen/libsrc/interface/writeelmer.cpp
create mode 100644 Netgen/libsrc/interface/writegmsh.cpp
create mode 100644 Netgen/libsrc/interface/writepermas2.cpp
create mode 100644 Netgen/libsrc/makefile.mach.FREEBSD
create mode 100644 Netgen/libsrc/makefile.mach.LINUXGCC33
create mode 100644 Netgen/libsrc/meshing/hpref_prism.hpp
create mode 100644 Netgen/libsrc/meshing/hpref_quad.hpp
create mode 100644 Netgen/libsrc/meshing/hpref_tet.hpp
create mode 100644 Netgen/libsrc/meshing/hpref_trig.hpp
create mode 100644 Netgen/libsrc/meshing/prism2rls_2.cpp
create mode 100644 Netgen/libsrc/visualization/vispar.hpp
create mode 100644 Netgen/libsrc/visualization/vsocc.cpp
diff --git a/Mesh/3D_Mesh_Netgen.cpp b/Mesh/3D_Mesh_Netgen.cpp
index 47e93fc394..2bf80623de 100644
--- a/Mesh/3D_Mesh_Netgen.cpp
+++ b/Mesh/3D_Mesh_Netgen.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Mesh_Netgen.cpp,v 1.11 2004-07-14 22:42:26 geuzaine Exp $
+// $Id: 3D_Mesh_Netgen.cpp,v 1.12 2004-12-08 20:01:21 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -53,8 +53,12 @@ void Optimize_Netgen(Mesh * m)
#else
+namespace nglib {
#include "nglib.h"
#include "nglib_addon.h"
+}
+
+using namespace nglib;
class Netgen{
private:
diff --git a/Netgen/Makefile b/Netgen/Makefile
index 7b5828793d..0fe37469fa 100644
--- a/Netgen/Makefile
+++ b/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2004-07-03 02:28:46 geuzaine Exp $
+# $Id: Makefile,v 1.7 2004-12-08 20:01:21 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -68,6 +68,7 @@ SRC = libsrc/opti/linopt.cpp \
libsrc/meshing/clusters.cpp \
libsrc/meshing/curvedelems.cpp \
libsrc/meshing/curvedelems2.cpp \
+ libsrc/meshing/hprefinement.cpp \
libsrc/interface/nglib.cpp \
libsrc/gprim/geomtest3d.cpp \
libsrc/gprim/geom2d.cpp \
@@ -257,7 +258,7 @@ bisect.o: libsrc/meshing/bisect.cpp libsrc/include/mystdlib.h \
libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
- libsrc/meshing/specials.hpp libsrc/interface/writeuser.hpp
+ libsrc/meshing/specials.hpp
meshtool.o: libsrc/meshing/meshtool.cpp libsrc/include/mystdlib.h \
libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
@@ -2169,10 +2170,7 @@ genmesh.o: libsrc/csg/genmesh.cpp libsrc/include/mystdlib.h \
libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
- libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
- libsrc/include/stlgeom.hpp libsrc/stlgeom/stlgeom.hpp \
- libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
- libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp
+ libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
spline3d.o: libsrc/csg/spline3d.cpp libsrc/include/mystdlib.h \
libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
diff --git a/Netgen/NEWS b/Netgen/NEWS
deleted file mode 100644
index 76efa8384b..0000000000
--- a/Netgen/NEWS
+++ /dev/null
@@ -1,9 +0,0 @@
-New features and improvements in NG4.3:
-
-- support for high order curved elements
-- new, hand written CSG parser
-- CSG primitives 'ellipticcylinder' and 'ellipsoid'
-- improvements for Delaunay meshing
-- improvements in surface optimization
-- mesh interface with full topology (element-face-edge-vertex)
-
diff --git a/Netgen/README b/Netgen/README
index 75a8ff1ebf..12dca8d3b7 100644
--- a/Netgen/README
+++ b/Netgen/README
@@ -4,7 +4,7 @@ Sch\"oberl's NETGEN mesh generator:
- only the libsrc directory was kept from the original distribution
-- the file meshing/improve2d.cpp was slightly modified to fix build
+- the file meshing/improve2.cpp was slightly modified to fix build
problems on machines without TCL/TK
**IMPORTANT NOTICE**
diff --git a/Netgen/VERSION b/Netgen/VERSION
index 74c0c9cbcc..f56504b6db 100644
--- a/Netgen/VERSION
+++ b/Netgen/VERSION
@@ -1 +1 @@
-NG Version 4.3.1
\ No newline at end of file
+NG Version 4.4
\ No newline at end of file
diff --git a/Netgen/libsrc/csg/algprim.cpp b/Netgen/libsrc/csg/algprim.cpp
index 756e4bd1af..1123706b1e 100644
--- a/Netgen/libsrc/csg/algprim.cpp
+++ b/Netgen/libsrc/csg/algprim.cpp
@@ -65,6 +65,7 @@ void QuadraticSurface :: PrintCoeff (ostream & ost) const
}
+
Point<3> QuadraticSurface :: GetSurfacePoint () const
{
MyError ("GetSurfacePoint called for QuadraticSurface");
@@ -152,8 +153,8 @@ int Plane :: IsIdentic (const Surface & s2, int & inv, double eps) const
if (fabs (s2.CalcFunctionValue(hp)) > eps) return 0;
Vec<3> n1, n2;
- GetNormalVector (p, n1);
- s2.GetNormalVector (p, n2);
+ n1 = GetNormalVector (p);
+ n2 = s2.GetNormalVector (p);
inv = (n1 * n2 < 0);
return 1;
}
@@ -195,7 +196,7 @@ void Plane :: FromPlane (const Point<2> & pplane, Point<3> & p3d, double h) cons
void Plane :: Project (Point<3> & p3d) const
{
- double val = CalcFunctionValue (p3d);
+ double val = Plane::CalcFunctionValue (p3d);
p3d -= val * n;
}
@@ -205,7 +206,7 @@ INSOLID_TYPE Plane :: BoxInSolid (const BoxSphere<3> & box) const
double val;
Point<3> p;
- val = CalcFunctionValue (box.Center());
+ val = Plane::CalcFunctionValue (box.Center());
if (val > box.Diam() / 2) return IS_OUTSIDE;
if (val < -box.Diam() / 2) return IS_INSIDE;
@@ -230,7 +231,7 @@ INSOLID_TYPE Plane :: BoxInSolid (const BoxSphere<3> & box) const
for (i = 0; i < 8; i++)
{
p = box.GetPointNr (i);
- val = CalcFunctionValue (p);
+ val = Plane::CalcFunctionValue (p);
if (val < 0)
return DOES_INTERSECT;
}
@@ -257,7 +258,7 @@ INSOLID_TYPE Plane :: BoxInSolid (const BoxSphere<3> & box) const
for (i = 0; i < 8; i++)
{
p = box.GetPointNr (i);
- val = CalcFunctionValue (p);
+ val = Plane::CalcFunctionValue (p);
if (val > 0)
return DOES_INTERSECT;
}
@@ -283,10 +284,10 @@ INSOLID_TYPE Plane :: BoxInSolid (const BoxSphere<3> & box) const
-double Plane :: CalcFunctionValue (const Point<3> & p3d) const
-{
- return cx * p3d(0) + cy * p3d(1) + cz * p3d(2) + c1;
-}
+// double Plane :: CalcFunctionValue (const Point<3> & p3d) const
+// {
+// return cx * p3d(0) + cy * p3d(1) + cz * p3d(2) + c1;
+// }
void Plane :: CalcGradient (const Point<3> & /* p */, Vec<3> & grad) const
{
@@ -583,7 +584,6 @@ Ellipsoid (const Point<3> & aa,
v2 = av2;
v3 = av3;
- cout << "orhtogonal ? " << (v1*v2) << ", " << (v1*v3) << ", " << (v2*v3) << endl;
CalcData();
}
@@ -595,11 +595,11 @@ void Ellipsoid :: CalcData ()
Vec<3> hv1, hv2, hv3;
double lv1 = v1.Length2 ();
- if (!lv1) lv1 = 1;
+ if (lv1 < 1e-32) lv1 = 1;
double lv2 = v2.Length2 ();
- if (!lv2) lv2 = 1;
+ if (lv2 < 1e-32) lv2 = 1;
double lv3 = v3.Length2 ();
- if (!lv3) lv3 = 1;
+ if (lv3 < 1e-32) lv3 = 1;
rmin = sqrt (min3 (lv1, lv2, lv3));
@@ -888,15 +888,6 @@ void Cylinder :: DefineTangentialPlane (const Point<3> & ap1, const Point<3> & a
ex /= ex.Length();
ey = Cross (ez, ex);
-
- /*
- ez = p1 - a;
- ez -= (ez * vab) * vap;
- ez /= ez.Length();
-
- ezt = Cross (vab, ez);
- */
-
}
@@ -1107,9 +1098,9 @@ void EllipticCylinder :: CalcData ()
Vec<3> hvl, hvs;
double lvl = vl.Length2 ();
- if (!lvl) lvl = 1;
+ if (lvl < 1e-32) lvl = 1;
double lvs = vs.Length2 ();
- if (!lvs) lvs = 1;
+ if (lvs < 1e-32) lvs = 1;
hvl = (1.0 / lvl) * vl;
hvs = (1.0 / lvs) * vs;
@@ -1255,7 +1246,7 @@ void Cone :: CalcData ()
minr = (ra < rb) ? ra : rb;
- vab = (b - a);
+ vab = b - a;
vabl = vab.Length();
Vec<3> va (a);
@@ -1265,7 +1256,7 @@ void Cone :: CalcData ()
//
// z(P) = t0vec * P + t0 = (P-a, b-a)/(b-a,b-a)
// R(z(P)) = t1vec * P + t1 = rb * z + ra * (1-z)
- // r(P)^2 =||P-a||^2 - ||a-b||^2 z^2
+ // r(P)^2 =||P-a||^2 - ||a-b||^2 z^2k
t0vec = vab;
@@ -1293,9 +1284,9 @@ void Cone :: CalcData ()
c1 = va.Length2() - (vab * vab) * t0 * t0 - t1 * t1;
- (*testout) << "t0vec = " << t0vec << " t0 = " << t0 << endl;
- (*testout) << "t1vec = " << t1vec << " t1 = " << t1 << endl;
- PrintCoeff (*testout);
+ // (*testout) << "t0vec = " << t0vec << " t0 = " << t0 << endl;
+ // (*testout) << "t1vec = " << t1vec << " t1 = " << t1 << endl;
+ // PrintCoeff (*testout);
}
@@ -1316,9 +1307,36 @@ INSOLID_TYPE Cone :: BoxInSolid (const BoxSphere<3> & box) const
double Cone :: HesseNorm () const
{
- return 2 / minr; // old: 2 / minr
+ return 2 / minr;
+}
+
+
+double Cone :: LocH (const Point<3> & p, double x,
+ double c, double hmax) const
+{
+ double bloch = Surface::LocH (p, x, c, hmax);
+ Vec<3> g;
+ CalcGradient (p, g);
+
+ double lam = Abs(g);
+ double meancurv =
+ -( 2 * g(0)*g(1)*cxy - 2 * czz * (g(0)*g(0)+g(1)*g(1))
+ +2 * g(1)*g(2)*cyz - 2 * cxx * (g(1)*g(1)+g(2)*g(2))
+ +2 * g(0)*g(2)*cxz - 2 * cyy * (g(0)*g(0)+g(2)*g(2))) / (3*lam*lam*lam);
+
+ // cout << "type = " << typeid(*this).name() << ", baseh = " << bloch << ", meancurv = " << meancurv << endl;
+ // return bloch;
+
+ meancurv = fabs (meancurv);
+ if (meancurv < 1e-20) meancurv = 1e-20;
+
+ // cout << "c = " << c << ", safety = " << mparam.curvaturesafety << endl;
+ double hcurv = 1.0/(3*meancurv*mparam.curvaturesafety);
+
+ return min2 (hmax, hcurv);
}
+
Point<3> Cone :: GetSurfacePoint () const
{
Vec<3> vr = vab.GetNormal ();
diff --git a/Netgen/libsrc/csg/algprim.hpp b/Netgen/libsrc/csg/algprim.hpp
index 83261edd16..aeb829f9c1 100644
--- a/Netgen/libsrc/csg/algprim.hpp
+++ b/Netgen/libsrc/csg/algprim.hpp
@@ -38,8 +38,10 @@ public:
const { return DOES_INTERSECT; }
*/
virtual double HesseNorm () const { return cxx + cyy + czz; }
+
virtual Point<3> GetSurfacePoint () const;
+
virtual void Print (ostream & ist) const;
virtual void Read (istream & ist);
void PrintCoeff (ostream & ost) const;
@@ -86,7 +88,8 @@ public:
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const;
///
- virtual double CalcFunctionValue (const Point<3> & point) const;
+ inline virtual double CalcFunctionValue (const Point<3> & p3d) const
+ {return cx * p3d(0) + cy * p3d(1) + cz * p3d(2) + c1;}
///
virtual void CalcGradient (const Point<3> & point,
Vec<3> & grad) const;
@@ -316,6 +319,10 @@ public:
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const;
///
virtual double HesseNorm () const;
+
+ virtual double LocH (const Point<3> & p, double x,
+ double c, double hmax) const;
+
///
virtual Point<3> GetSurfacePoint () const;
diff --git a/Netgen/libsrc/csg/brick.cpp b/Netgen/libsrc/csg/brick.cpp
index e4224ae512..f408e922f4 100644
--- a/Netgen/libsrc/csg/brick.cpp
+++ b/Netgen/libsrc/csg/brick.cpp
@@ -52,7 +52,7 @@ IsIdentic (const Surface & s2, int & inv, double eps) const
if (id)
{
Vec<3> n2;
- s2.GetNormalVector(p1, n2);
+ n2 = s2.GetNormalVector(p1);
inv = (n * n2) < 0;
}
return id;
diff --git a/Netgen/libsrc/csg/brick.hpp b/Netgen/libsrc/csg/brick.hpp
index 1733335101..11106b66d3 100644
--- a/Netgen/libsrc/csg/brick.hpp
+++ b/Netgen/libsrc/csg/brick.hpp
@@ -54,7 +54,7 @@ class Brick : public Primitive
public:
Brick (Point<3> ap1, Point<3> ap2, Point<3> ap3, Point<3> ap4);
- ~Brick ();
+ virtual ~Brick ();
static Primitive * CreateDefault ();
@@ -90,6 +90,7 @@ protected:
Point<3> pmin, pmax;
public:
OrthoBrick (const Point<3> & ap1, const Point<3> & ap2);
+
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const;
virtual void Reduce (const BoxSphere<3> & box);
};
diff --git a/Netgen/libsrc/csg/bspline2d.cpp b/Netgen/libsrc/csg/bspline2d.cpp
index ebb284a28b..93b5e89621 100644
--- a/Netgen/libsrc/csg/bspline2d.cpp
+++ b/Netgen/libsrc/csg/bspline2d.cpp
@@ -30,14 +30,13 @@ bool BSplineCurve2d :: Inside (const Point<2> & p, double & dist) const
dist = Dist (p, hp);
double scal = (hp-p) * n;
cout << "scal = " << scal << endl;
- char ch;
- // cin >> ch;
+
return scal >= 0;
}
double BSplineCurve2d :: ProjectParam (const Point<2> & p) const
{
- double t, dt, mindist, mint;
+ double t, dt, mindist, mint = 0.0;
int n1;
mindist = 1e10;
@@ -148,11 +147,11 @@ Vec<2> BSplineCurve2d :: EvalPrime (double t) const
Vec<2> BSplineCurve2d :: EvalPrimePrime (double t) const
{
int n, n1, n2, n3, n4;
- double loct, ddb1, ddb2, ddb3, ddb4;
+ double ddb1, ddb2, ddb3, ddb4;
Vec<2> hv;
n = int(t);
- // loct = t - n;
+ // double loct = t - n;
ddb1 = 0.5;
ddb4 = 0.5;
diff --git a/Netgen/libsrc/csg/csg.hpp b/Netgen/libsrc/csg/csg.hpp
index 08dd054901..e150860232 100644
--- a/Netgen/libsrc/csg/csg.hpp
+++ b/Netgen/libsrc/csg/csg.hpp
@@ -17,15 +17,21 @@ namespace netgen
#include "solid.hpp"
#include "identify.hpp"
#include "singularref.hpp"
-
#include "csgeom.hpp"
-#include "triapprox.hpp"
+#ifndef SMALLLIB
+#define _INCLUDE_MORE
+#endif
+#ifdef LINUX
+#define _INCLUDE_MORE
+#endif
+
+#ifdef _INCLUDE_MORE
+#include "triapprox.hpp"
#include "algprim.hpp"
#include "brick.hpp"
#include "spline3d.hpp"
-// #include "spline2d.hpp"
#include "manifold.hpp"
#include "curve2d.hpp"
#include "explicitcurve2d.hpp"
@@ -33,11 +39,10 @@ namespace netgen
#include "polyhedra.hpp"
#include "extrusion.hpp"
#include "revolution.hpp"
-
-// #include "geom2dmesh.hpp"
#include "specpoin.hpp"
#include "edgeflw.hpp"
-#include "meshsurf.hpp"
+#include "meshsurf.hpp"
+#endif
}
#endif
diff --git a/Netgen/libsrc/csg/csgeom.cpp b/Netgen/libsrc/csg/csgeom.cpp
index 7e1051b781..f7c25ee9c6 100644
--- a/Netgen/libsrc/csg/csgeom.cpp
+++ b/Netgen/libsrc/csg/csgeom.cpp
@@ -8,359 +8,355 @@
namespace netgen
{
-int CSGeometry :: changeval = 0;
+ int CSGeometry :: changeval = 0;
-TopLevelObject ::
-TopLevelObject (Solid * asolid,
- Surface * asurface)
-{
- solid = asolid;
- surface = asurface;
-
- SetRGB (0, 0, 1);
- SetTransparent (0);
- SetVisible (1);
- SetLayer (1);
-
- if (!surface)
- maxh = solid->GetMaxH();
- else
- maxh = surface->GetMaxH();
-
- SetBCProp (-1);
-}
-
-void TopLevelObject :: GetData (ostream & ost)
-{
- ost << red << " " << green << " " << blue << " "
- << transp << " " << visible << " ";
-}
-
-void TopLevelObject :: SetData (istream & ist)
-{
- ist >> red >> green >> blue >> transp >> visible;
-}
-
-
+ TopLevelObject ::
+ TopLevelObject (Solid * asolid,
+ Surface * asurface)
+ {
+ solid = asolid;
+ surface = asurface;
+ SetRGB (0, 0, 1);
+ SetTransparent (0);
+ SetVisible (1);
+ SetLayer (1);
+ if (!surface)
+ maxh = solid->GetMaxH();
+ else
+ maxh = surface->GetMaxH();
-CSGeometry :: CSGeometry ()
- : boundingbox (Point<3> (-1000, -1000, -1000),
- Point<3> (1000, 1000, 1000)),
- identicsurfaces (100), filename("")
-{
- ;
-}
-
+ SetBCProp (-1);
+ }
+ void TopLevelObject :: GetData (ostream & ost)
+ {
+ ost << red << " " << green << " " << blue << " "
+ << transp << " " << visible << " ";
+ }
-CSGeometry :: CSGeometry (const string & afilename)
- : boundingbox (Point<3> (-1000, -1000, -1000),
- Point<3> (1000, 1000, 1000)),
- identicsurfaces (100), filename(afilename)
-{
- changeval++;
-}
+ void TopLevelObject :: SetData (istream & ist)
+ {
+ ist >> red >> green >> blue >> transp >> visible;
+ }
-CSGeometry :: ~CSGeometry ()
-{
- Clean();
-}
-
-void CSGeometry :: Clean ()
-{
- int i;
-
- // for (i = 0; i < solids.Size(); i++)
- // delete solids[i];
- solids.DeleteAll ();
-
- for (i = 0; i < surfaces.Size(); i++)
- delete surfaces[i];
- surfaces.DeleteAll ();
+
+ Box<3> CSGeometry::default_boundingbox (Point<3> (-1000, -1000, -1000),
+ Point<3> ( 1000, 1000, 1000));
+
+
+ CSGeometry :: CSGeometry ()
+ : boundingbox (default_boundingbox),
+ identicsurfaces (100), filename("")
+ {
+ ;
+ }
+
+ CSGeometry :: CSGeometry (const string & afilename)
+ : boundingbox (default_boundingbox),
+ identicsurfaces (100), filename(afilename)
+ {
+ changeval++;
+ }
+
+ CSGeometry :: ~CSGeometry ()
+ {
+ Clean();
+ }
+
+
+ void CSGeometry :: Clean ()
+ {
+ for (int i = 0; i < solids.Size(); i++)
+ delete solids[i]->S1();
+ for (int i = 0; i < solids.Size(); i++)
+ delete solids[i];
+ solids.DeleteAll ();
+
+ /*
+ for (int i = 0; i < surfaces.Size(); i++)
+ delete surfaces[i];
+ surfaces.DeleteAll ();
+ */
- for (i = 0; i < toplevelobjects.Size(); i++)
- delete toplevelobjects[i];
- toplevelobjects.DeleteAll ();
+ for (int i = 0; i < toplevelobjects.Size(); i++)
+ delete toplevelobjects[i];
+ toplevelobjects.DeleteAll ();
+ for (int i = 0; i < triapprox.Size(); i++)
+ delete triapprox[i];
+ triapprox.DeleteAll();
- for (i = 0; i < triapprox.Size(); i++)
- delete triapprox[i];
- triapprox.DeleteAll();
+ changeval++;
+ }
- changeval++;
-}
+ class WritePrimitivesIt : public SolidIterator
+ {
+ ostream & ost;
+ public:
+ WritePrimitivesIt (ostream & aost) : ost(aost) { ; }
+ virtual ~WritePrimitivesIt () { ; }
-class WritePrimitivesIt : public SolidIterator
-{
- ostream & ost;
-public:
- WritePrimitivesIt (ostream & aost);
- ~WritePrimitivesIt ();
- virtual void Do (Solid * sol);
-};
-
-WritePrimitivesIt :: WritePrimitivesIt (ostream & aost)
- : SolidIterator(), ost(aost)
-{
- ;
-}
-WritePrimitivesIt :: ~WritePrimitivesIt ()
-{
- ;
-}
+ virtual void Do (Solid * sol);
+ };
-void WritePrimitivesIt :: Do (Solid * sol)
-{
- Primitive * prim = sol->GetPrimitive();
- if (prim)
- {
- char * classname;
- ARRAY<double> coeffs;
-
- prim -> GetPrimitiveData (classname, coeffs);
-
- if (sol->Name())
- ost << "primitive "
- << sol->Name() << " "
- << classname << " " << coeffs.Size();
- for (int i = 0; i < coeffs.Size(); i++)
- ost << " " << coeffs[i];
- ost << endl;
- }
-}
+ void WritePrimitivesIt :: Do (Solid * sol)
+ {
+ Primitive * prim = sol->GetPrimitive();
+ if (prim)
+ {
+ char * classname;
+ ARRAY<double> coeffs;
+
+ prim -> GetPrimitiveData (classname, coeffs);
+
+ if (sol->Name())
+ ost << "primitive "
+ << sol->Name() << " "
+ << classname << " " << coeffs.Size();
+ for (int i = 0; i < coeffs.Size(); i++)
+ ost << " " << coeffs[i];
+ ost << endl;
+ }
+ }
+
+ void CSGeometry :: Save (ostream & ost)
+ {
+ ost << "boundingbox "
+ << boundingbox.PMin()(0) << " "
+ << boundingbox.PMin()(1) << " "
+ << boundingbox.PMin()(2) << " "
+ << boundingbox.PMax()(0) << " "
+ << boundingbox.PMax()(1) << " "
+ << boundingbox.PMax()(2) << endl;
+ WritePrimitivesIt wpi(ost);
+ IterateAllSolids (wpi, 1);
-void CSGeometry :: Save (ostream & ost)
-{
- ost << "boundingbox "
- << boundingbox.PMin()(0) << " "
- << boundingbox.PMin()(1) << " "
- << boundingbox.PMin()(2) << " "
- << boundingbox.PMax()(0) << " "
- << boundingbox.PMax()(1) << " "
- << boundingbox.PMax()(2) << endl;
-
-
- WritePrimitivesIt wpi(ost);
- IterateAllSolids (wpi, 1);
-
- int i;
- for (i = 0; i < solids.Size(); i++)
- {
- if (!solids[i]->GetPrimitive())
- {
- ost << "solid " << solids.GetName(i) << " ";
- solids[i] -> GetSolidData (ost);
- ost << endl;
- }
- }
+ for (int i = 0; i < solids.Size(); i++)
+ {
+ if (!solids[i]->GetPrimitive())
+ {
+ ost << "solid " << solids.GetName(i) << " ";
+ solids[i] -> GetSolidData (ost);
+ ost << endl;
+ }
+ }
- for (i = 0; i < GetNTopLevelObjects(); i++)
- {
- TopLevelObject * tlo = GetTopLevelObject (i);
- ost << "toplevel ";
- if (tlo -> GetSurface())
- ost << "surface " << tlo->GetSolid()->Name() << " "
- << tlo->GetSurface()->Name() << " ";
- else
- ost << "solid " << tlo->GetSolid()->Name() << " ";
- tlo->GetData(ost);
- ost << endl;
- }
+ for (int i = 0; i < GetNTopLevelObjects(); i++)
+ {
+ TopLevelObject * tlo = GetTopLevelObject (i);
+ ost << "toplevel ";
+ if (tlo -> GetSurface())
+ ost << "surface " << tlo->GetSolid()->Name() << " "
+ << tlo->GetSurface()->Name() << " ";
+ else
+ ost << "solid " << tlo->GetSolid()->Name() << " ";
+ tlo->GetData(ost);
+ ost << endl;
+ }
- for (i = 0; i < identifications.Size(); i++)
- {
- ost << "identify ";
- identifications[i] -> GetData (ost);
- ost << endl;
- }
+ for (int i = 0; i < identifications.Size(); i++)
+ {
+ ost << "identify ";
+ identifications[i] -> GetData (ost);
+ ost << endl;
+ }
- ost << "end" << endl;
-}
+ ost << "end" << endl;
+ }
-void CSGeometry :: Load (istream & ist)
-{
- // CSGeometry * geo = new CSGeometry;
+ void CSGeometry :: Load (istream & ist)
+ {
+ // CSGeometry * geo = new CSGeometry;
- char key[100], name[100], classname[100], sname[100];
- int ncoeff, i, j;
- ARRAY<double> coeff;
-
- while (ist.good())
- {
- ist >> key;
- if (strcmp (key, "boundingbox") == 0)
- {
- Point<3> pmin, pmax;
- ist >> pmin(0) >> pmin(1) >> pmin(2);
- ist >> pmax(0) >> pmax(1) >> pmax(2);
- SetBoundingBox (Box<3> (pmin, pmax));
- }
- if (strcmp (key, "primitive") == 0)
- {
- ist >> name >> classname >> ncoeff;
- coeff.SetSize (ncoeff);
- for (i = 0; i < ncoeff; i++)
- ist >> coeff[i];
-
- Primitive * nprim = Primitive::CreatePrimitive (classname);
- nprim -> SetPrimitiveData (coeff);
- Solid * nsol = new Solid (nprim);
-
- for (j = 0; j < nprim->GetNSurfaces(); j++)
- {
- sprintf (sname, "%s,%d", name, j);
- AddSurface (sname, &nprim->GetSurface(j));
- nprim -> SetSurfaceId (j, GetNSurf());
- }
- SetSolid (name, nsol);
- }
- else if (strcmp (key, "solid") == 0)
- {
- ist >> name;
- Solid * nsol = Solid::CreateSolid (ist, solids);
-
- cout << " I have found solid " << name << " = ";
- nsol -> GetSolidData (cout);
- cout << endl;
-
- SetSolid (name, nsol);
- }
- else if (strcmp (key, "toplevel") == 0)
- {
- char type[20], solname[50], surfname[50];
- const Solid * sol = NULL;
- const Surface * surf = NULL;
- int nr;
+ char key[100], name[100], classname[100], sname[100];
+ int ncoeff, i, j;
+ ARRAY<double> coeff;
- ist >> type;
- if (strcmp (type, "solid") == 0)
- {
- ist >> solname;
- sol = GetSolid (solname);
- }
- if (strcmp (type, "surface") == 0)
- {
- ist >> solname >> surfname;
- sol = GetSolid (solname);
- surf = GetSurface (surfname);
- }
- nr = SetTopLevelObject ((Solid*)sol, (Surface*)surf);
- GetTopLevelObject (nr) -> SetData (ist);
- }
- else if (strcmp (key, "identify") == 0)
- {
- char type[10], surfname1[50], surfname2[50];
- const Surface * surf1;
- const Surface * surf2;
-
-
- ist >> type >> surfname1 >> surfname2;
- surf1 = GetSurface(surfname1);
- surf2 = GetSurface(surfname2);
+ while (ist.good())
+ {
+ ist >> key;
+ if (strcmp (key, "boundingbox") == 0)
+ {
+ Point<3> pmin, pmax;
+ ist >> pmin(0) >> pmin(1) >> pmin(2);
+ ist >> pmax(0) >> pmax(1) >> pmax(2);
+ SetBoundingBox (Box<3> (pmin, pmax));
+ }
+ if (strcmp (key, "primitive") == 0)
+ {
+ ist >> name >> classname >> ncoeff;
+ coeff.SetSize (ncoeff);
+ for (i = 0; i < ncoeff; i++)
+ ist >> coeff[i];
+
+ Primitive * nprim = Primitive::CreatePrimitive (classname);
+ nprim -> SetPrimitiveData (coeff);
+ Solid * nsol = new Solid (nprim);
+
+ for (j = 0; j < nprim->GetNSurfaces(); j++)
+ {
+ sprintf (sname, "%s,%d", name, j);
+ AddSurface (sname, &nprim->GetSurface(j));
+ nprim -> SetSurfaceId (j, GetNSurf());
+ }
+ SetSolid (name, nsol);
+ }
+ else if (strcmp (key, "solid") == 0)
+ {
+ ist >> name;
+ Solid * nsol = Solid::CreateSolid (ist, solids);
+
+ cout << " I have found solid " << name << " = ";
+ nsol -> GetSolidData (cout);
+ cout << endl;
+
+ SetSolid (name, nsol);
+ }
+ else if (strcmp (key, "toplevel") == 0)
+ {
+ char type[20], solname[50], surfname[50];
+ const Solid * sol = NULL;
+ const Surface * surf = NULL;
+ int nr;
+
+ ist >> type;
+ if (strcmp (type, "solid") == 0)
+ {
+ ist >> solname;
+ sol = GetSolid (solname);
+ }
+ if (strcmp (type, "surface") == 0)
+ {
+ ist >> solname >> surfname;
+ sol = GetSolid (solname);
+ surf = GetSurface (surfname);
+ }
+ nr = SetTopLevelObject ((Solid*)sol, (Surface*)surf);
+ GetTopLevelObject (nr) -> SetData (ist);
+ }
+ else if (strcmp (key, "identify") == 0)
+ {
+ char type[10], surfname1[50], surfname2[50];
+ const Surface * surf1;
+ const Surface * surf2;
+
+
+ ist >> type >> surfname1 >> surfname2;
+ surf1 = GetSurface(surfname1);
+ surf2 = GetSurface(surfname2);
- AddIdentification (new PeriodicIdentification
- (GetNIdentifications(),
- *this, surf1, surf2));
- }
- else if (strcmp (key, "end") == 0)
- break;
- }
+ AddIdentification (new PeriodicIdentification
+ (GetNIdentifications(),
+ *this, surf1, surf2));
+ }
+ else if (strcmp (key, "end") == 0)
+ break;
+ }
- changeval++;
-}
+ changeval++;
+ }
-void CSGeometry :: AddSurface (Surface * surf)
-{
- static int cntsurfs = 0;
- cntsurfs++;
- char name[15];
- sprintf (name, "nnsurf%d", cntsurfs);
- AddSurface (name, surf);
-}
+ void CSGeometry :: AddSurface (Surface * surf)
+ {
+ static int cntsurfs = 0;
+ cntsurfs++;
+ char name[15];
+ sprintf (name, "nnsurf%d", cntsurfs);
+ AddSurface (name, surf);
+ }
-void CSGeometry :: AddSurface (char * name, Surface * surf)
-{
- surfaces.Set (name, surf);
- surf->SetName (name);
- changeval++;
-}
-
-
-const Surface * CSGeometry :: GetSurface (const char * name) const
-{
- if (surfaces.Used(name))
- return surfaces.Get(name);
- else
- return NULL;
-}
+ void CSGeometry :: AddSurface (char * name, Surface * surf)
+ {
+ surfaces.Set (name, surf);
+ surf->SetName (name);
+ changeval++;
+ }
+
+ void CSGeometry :: AddSurfaces (Primitive * prim)
+ {
+ for (int i = 0; i < prim->GetNSurfaces(); i++)
+ {
+ AddSurface (&prim->GetSurface(i));
+ prim->SetSurfaceId (i, GetNSurf()-1);
+ }
+ }
-const Surface * CSGeometry :: GetSurface (int i) const
-{
- if (i >= 0 && i < surfaces.Size())
- return surfaces[i];
- else
- return NULL;
-}
+ const Surface * CSGeometry :: GetSurface (const char * name) const
+ {
+ if (surfaces.Used(name))
+ return surfaces.Get(name);
+ else
+ return NULL;
+ }
+ /*
+ const Surface * CSGeometry :: GetSurface (int i) const
+ {
+ if (i >= 0 && i < surfaces.Size())
+ return surfaces[i];
+ else
+ throw NgException ("CSGeometry::GetSurface out of range");
+ }
+ */
-void CSGeometry :: SetSolid (const char * name, Solid * sol)
-{
- Solid * oldsol = NULL;
+ void CSGeometry :: SetSolid (const char * name, Solid * sol)
+ {
+ Solid * oldsol = NULL;
- if (solids.Used (name))
- oldsol = solids.Get(name);
+ if (solids.Used (name))
+ oldsol = solids.Get(name);
- solids.Set (name, sol);
- sol->SetName (name);
+ solids.Set (name, sol);
+ sol->SetName (name);
- if (oldsol)
- {
- if (oldsol->op != Solid::ROOT ||
- sol->op != Solid::ROOT)
- {
- cerr << "Setsolid: old or new no root" << endl;
- }
- oldsol -> s1 = sol -> s1;
- }
- changeval++;
-}
+ if (oldsol)
+ {
+ if (oldsol->op != Solid::ROOT ||
+ sol->op != Solid::ROOT)
+ {
+ cerr << "Setsolid: old or new no root" << endl;
+ }
+ oldsol -> s1 = sol -> s1;
+ }
+ changeval++;
+ }
-const Solid * CSGeometry :: GetSolid (const char * name) const
-{
- if (solids.Used(name))
- return solids.Get(name);
- else
- return NULL;
-}
+ const Solid * CSGeometry :: GetSolid (const char * name) const
+ {
+ if (solids.Used(name))
+ return solids.Get(name);
+ else
+ return NULL;
+ }
-const Solid * CSGeometry :: GetSolid (const string & name) const
-{
- if (solids.Used(name.c_str()))
- return solids.Get(name.c_str());
- else
- return NULL;
-}
+ const Solid * CSGeometry :: GetSolid (const string & name) const
+ {
+ if (solids.Used(name.c_str()))
+ return solids.Get(name.c_str());
+ else
+ return NULL;
+ }
@@ -369,699 +365,656 @@ const Solid * CSGeometry :: GetSolid (const string & name) const
-class RemoveDummyIterator : public SolidIterator
-{
-public:
+ class RemoveDummyIterator : public SolidIterator
+ {
+ public:
- RemoveDummyIterator();
- ~RemoveDummyIterator();
- virtual void Do(Solid * sol);
-};
+ RemoveDummyIterator() { ; }
+ virtual ~RemoveDummyIterator() { ; }
+ virtual void Do(Solid * sol);
+ };
-RemoveDummyIterator :: RemoveDummyIterator()
-{
- ;
-}
-
-RemoveDummyIterator :: ~RemoveDummyIterator()
-{
- ;
-}
-
-void RemoveDummyIterator :: Do(Solid * sol)
-{
- if ( (sol->op == Solid::SUB || sol->op == Solid::SECTION ||
- sol->op == Solid::UNION)
- && sol->s1->op == Solid::DUMMY)
- sol->s1 = sol->s1->s1;
- if ( (sol->op == Solid::SECTION || sol->op == Solid::UNION)
- && sol->s2->op == Solid::DUMMY)
- sol->s2 = sol->s2->s1;
-}
+ void RemoveDummyIterator :: Do(Solid * sol)
+ {
+ if ( (sol->op == Solid::SUB || sol->op == Solid::SECTION ||
+ sol->op == Solid::UNION)
+ && sol->s1->op == Solid::DUMMY)
+ sol->s1 = sol->s1->s1;
+ if ( (sol->op == Solid::SECTION || sol->op == Solid::UNION)
+ && sol->s2->op == Solid::DUMMY)
+ sol->s2 = sol->s2->s1;
+ }
-int CSGeometry :: SetTopLevelObject (Solid * sol, Surface * surf)
-{
- return toplevelobjects.Append (new TopLevelObject (sol, surf)) - 1;
-}
-
-void CSGeometry :: GetTopLevelObject (int nr, Solid *& sol, Surface *& surf)
-{
- sol = toplevelobjects[nr]->GetSolid();
- surf = toplevelobjects[nr]->GetSurface();
-}
+ int CSGeometry :: SetTopLevelObject (Solid * sol, Surface * surf)
+ {
+ return toplevelobjects.Append (new TopLevelObject (sol, surf)) - 1;
+ }
+ TopLevelObject * CSGeometry ::
+ GetTopLevelObject (const Solid * sol, const Surface * surf)
+ {
+ for (int i = 0; i < toplevelobjects.Size(); i++)
+ {
+ if (toplevelobjects[i]->GetSolid() == sol &&
+ toplevelobjects[i]->GetSurface() == surf)
+ return (toplevelobjects[i]);
+ }
+ return NULL;
+ }
-void CSGeometry :: GetTopLevelObject (int nr, const Solid *& sol, const Surface *& surf) const
-{
- sol = toplevelobjects[nr]->GetSolid();
- surf = toplevelobjects[nr]->GetSurface();
-}
-
-TopLevelObject * CSGeometry ::
-GetTopLevelObject (const Solid * sol, const Surface * surf)
-{
- for (int i = 0; i < toplevelobjects.Size(); i++)
- {
- if (toplevelobjects[i]->GetSolid() == sol &&
- toplevelobjects[i]->GetSurface() == surf)
- return (toplevelobjects[i]);
- }
- return NULL;
-}
-
-void CSGeometry :: RemoveTopLevelObject (Solid * sol, Surface * surf)
-{
- for (int i = 0; i < toplevelobjects.Size(); i++)
- {
- if (toplevelobjects[i]->GetSolid() == sol &&
- toplevelobjects[i]->GetSurface() == surf)
- {
- delete toplevelobjects[i];
- toplevelobjects.DeleteElement (i+1);
- changeval++;
- break;
- }
- }
-}
+ void CSGeometry :: RemoveTopLevelObject (Solid * sol, Surface * surf)
+ {
+ for (int i = 0; i < toplevelobjects.Size(); i++)
+ {
+ if (toplevelobjects[i]->GetSolid() == sol &&
+ toplevelobjects[i]->GetSurface() == surf)
+ {
+ delete toplevelobjects[i];
+ toplevelobjects.DeleteElement (i+1);
+ changeval++;
+ break;
+ }
+ }
+ }
-void CSGeometry :: AddIdentification (Identification * ident)
-{
- identifications.Append (ident);
-}
+ void CSGeometry :: AddIdentification (Identification * ident)
+ {
+ identifications.Append (ident);
+ }
-void CSGeometry :: SetFlags (const char * solidname, const Flags & flags)
-{
- Solid * solid = solids.Elem(solidname);
- ARRAY<int> surfind;
+ void CSGeometry :: SetFlags (const char * solidname, const Flags & flags)
+ {
+ Solid * solid = solids.Elem(solidname);
+ ARRAY<int> surfind;
- int i;
- double maxh = flags.GetNumFlag ("maxh", -1);
- if (maxh > 0 && solid)
- {
- solid->GetSurfaceIndices (surfind);
+ int i;
+ double maxh = flags.GetNumFlag ("maxh", -1);
+ if (maxh > 0 && solid)
+ {
+ solid->GetSurfaceIndices (surfind);
- for (i = 0; i < surfind.Size(); i++)
- {
- if (surfaces[surfind[i]]->GetMaxH() > maxh)
- surfaces[surfind[i]] -> SetMaxH (maxh);
- }
+ for (i = 0; i < surfind.Size(); i++)
+ {
+ if (surfaces[surfind[i]]->GetMaxH() > maxh)
+ surfaces[surfind[i]] -> SetMaxH (maxh);
+ }
- solid->SetMaxH (maxh);
- }
+ solid->SetMaxH (maxh);
+ }
- if (flags.NumFlagDefined ("bc"))
- {
- solid->GetSurfaceIndices (surfind);
- int bc = int (flags.GetNumFlag("bc", -1));
- for (i = 0; i < surfind.Size(); i++)
- {
- if (surfaces[surfind[i]]->GetBCProperty() == -1)
- surfaces[surfind[i]]->SetBCProperty(bc);
- }
- }
-}
+ if (flags.NumFlagDefined ("bc"))
+ {
+ solid->GetSurfaceIndices (surfind);
+ int bc = int (flags.GetNumFlag("bc", -1));
+ for (i = 0; i < surfind.Size(); i++)
+ {
+ if (surfaces[surfind[i]]->GetBCProperty() == -1)
+ surfaces[surfind[i]]->SetBCProperty(bc);
+ }
+ }
+ }
-void CSGeometry :: FindIdenticSurfaces (double eps)
-{
- int i, j;
- int inv;
- int nsurf = GetNSurf();
+ void CSGeometry :: FindIdenticSurfaces (double eps)
+ {
+ int inv;
+ int nsurf = GetNSurf();
- isidenticto.SetSize(nsurf);
- for (i = 0; i < nsurf; i++)
- isidenticto[i] = i;
+ isidenticto.SetSize(nsurf);
+ for (int i = 0; i < nsurf; i++)
+ isidenticto[i] = i;
- for (i = 0; i < nsurf; i++)
- for (j = i+1; j < nsurf; j++)
- if (GetSurface(j) -> IsIdentic (*GetSurface(i), inv, eps))
- {
- INDEX_2 i2(i, j);
- identicsurfaces.Set (i2, inv);
- isidenticto[j] = isidenticto[i];
- // (*testout) << "surfaces " << i2 << " are identic" << endl;
- }
-
- /*
- (*testout) << "identicmap:" << endl;
- for (i = 0; i < isidenticto.Size(); i++)
- (*testout) << i << " -> " << isidenticto[i] << endl;
-
- for (i = 0; i < nsurf; i++)
- GetSurface(i)->Print (*testout);
- */
-}
-
-
-void CSGeometry ::
-GetIndependentSurfaceIndices (const Solid * sol,
- const BoxSphere<3> & box,
- ARRAY<int> & locsurf) const
-{
- int i, j;
-
- ReducePrimitiveIterator rpi(box);
- UnReducePrimitiveIterator urpi;
-
- ((Solid*)sol) -> IterateSolid (rpi);
- sol -> GetSurfaceIndices (locsurf);
- ((Solid*)sol) -> IterateSolid (urpi);
+ for (int i = 0; i < nsurf; i++)
+ for (int j = i+1; j < nsurf; j++)
+ if (GetSurface(j) -> IsIdentic (*GetSurface(i), inv, eps))
+ {
+ INDEX_2 i2(i, j);
+ identicsurfaces.Set (i2, inv);
+ isidenticto[j] = isidenticto[i];
+ // (*testout) << "surfaces " << i2 << " are identic" << endl;
+ }
+
+ /*
+ (*testout) << "identicmap:" << endl;
+ for (int i = 0; i < isidenticto.Size(); i++)
+ (*testout) << i << " -> " << isidenticto[i] << endl;
+
+ for (int i = 0; i < nsurf; i++)
+ GetSurface(i)->Print (*testout);
+ */
+ }
- int cntindep = 0;
- bool indep;
- for (i = locsurf.Size()-1; i >= 0; i--)
- {
- indep = 1;
- for (j = 0; j < i; j++)
- {
- INDEX_2 i2(locsurf[i], locsurf[j]);
- i2.Sort();
- if (identicsurfaces.Used (i2))
+
+ void CSGeometry ::
+ GetIndependentSurfaceIndices (const Solid * sol,
+ const BoxSphere<3> & box,
+ ARRAY<int> & locsurf) const
+ {
+ ReducePrimitiveIterator rpi(box);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)sol) -> IterateSolid (rpi);
+ sol -> GetSurfaceIndices (locsurf);
+ ((Solid*)sol) -> IterateSolid (urpi);
+
+ for (int i = 0; i < locsurf.Size(); i++)
+ locsurf[i] = isidenticto[locsurf[i]];
+
+ for (int i = locsurf.Size()-1; i >= 0; i--)
+ {
+ bool indep = 1;
+ for (int j = 0; j < i; j++)
+ if (locsurf[i] == locsurf[j])
{
indep = 0;
break;
}
- }
- if (!indep)
- locsurf.Delete(i);
- }
- for (i = 0; i < locsurf.Size(); i++)
- locsurf[i] = isidenticto[locsurf[i]];
-}
+ if (!indep) locsurf.Delete(i);
+ }
-void CSGeometry ::
-GetIndependentSurfaceIndices (const Solid * sol,
- const Point<3> & p, Vec<3> & v,
- ARRAY<int> & locsurf) const
-{
- Point<3> p2 = p + 1e-2 * v;
- BoxSphere<3> box (p2, p2);
- box.Increase (1e-3);
- box.CalcDiamCenter();
- GetIndependentSurfaceIndices (sol, box, locsurf);
-}
+ /*
+ // delete identified
+ for (int i = locsurf.Size()-1; i >= 0; i--)
+ {
+ bool indep = 1;
+ for (int j = 0; j < i; j++)
+ {
+ if (identicsurfaces.Used (INDEX_2::Sort (locsurf[i], locsurf[j])) !=
+ (isidenticto[locsurf[i]] == isidenticto[locsurf[j]]))
+ {
+ cerr << "different result" << endl;
+ exit(1);
+ }
+ if (isidenticto[locsurf[i]] == isidenticto[locsurf[j]])
+ {
+ indep = 0;
+ break;
+ }
+ }
+ if (!indep)
+ locsurf.Delete(i);
+ }
-void CSGeometry ::
-CalcTriangleApproximation(const Box<3> & boundingbox,
- double detail, double facets)
-{
- PrintMessage (1, "Calc Triangle Approximation");
+ for (int i = 0; i < locsurf.Size(); i++)
+ locsurf[i] = isidenticto[locsurf[i]];
+ */
+ }
- FindIdenticSurfaces (1e-6);
-
- int i, j, k;
- // int nms = GetNMainSolids ();
- int ntlo = GetNTopLevelObjects();
- triapprox.SetSize (ntlo);
- ARRAY<int> surfind;
+ void CSGeometry ::
+ GetIndependentSurfaceIndices (const Solid * sol,
+ const Point<3> & p, Vec<3> & v,
+ ARRAY<int> & locsurf) const
+ {
+ Point<3> p2 = p + 1e-2 * v;
+ BoxSphere<3> box (p2, p2);
+ box.Increase (1e-3);
+ box.CalcDiamCenter();
+ GetIndependentSurfaceIndices (sol, box, locsurf);
+ }
- // cout << "bb = " << boundingbox.PMin () << " - " << boundingbox.PMax() << endl;
- for (i = 0; i < ntlo; i++)
- {
- Solid * sol;
- Surface * surf;
- GetTopLevelObject (i, sol, surf);
+ void CSGeometry ::
+ CalcTriangleApproximation(const Box<3> & boundingbox,
+ double detail, double facets)
+ {
+ PrintMessage (1, "Calc Triangle Approximation");
- // ((Solid*)MainSolid (i)) -> CalcSurfaceInverse ();
- sol -> CalcSurfaceInverse ();
+ // FindIdenticSurfaces (1e-6);
+
+ int ntlo = GetNTopLevelObjects();
- TriangleApproximation * tams = new TriangleApproximation();
- triapprox[i] = tams;
+ for (int i = 0; i < triapprox.Size(); i++)
+ delete triapprox[i];
+ triapprox.SetSize (ntlo);
- for (j = 0; j < GetNSurf(); j++)
- {
- PrintMessageCR (3, "Surface ", j, "/", GetNSurf());
- if (surf && surf != GetSurface(j))
- continue;
+ ARRAY<int> surfind;
- TriangleApproximation tas;
- GetSurface (j) -> GetTriangleApproximation (tas, boundingbox, facets);
-
+ for (int i = 0; i < ntlo; i++)
+ {
+ Solid * sol;
+ Surface * surf;
+ GetTopLevelObject (i, sol, surf);
- int oldnp = tams -> GetNP();
+ sol -> CalcSurfaceInverse ();
- if (!tas.GetNP())
- continue;
+ TriangleApproximation * tams = new TriangleApproximation();
+ triapprox[i] = tams;
- for (k = 0; k < tas.GetNP(); k++)
- {
- Vec<3> n;
+ // sol -> GetSurfaceIndices (surfind);
+ for (int j = 0; j < GetNSurf(); j++)
+ // for (int jj = 0; jj < surfind.Size(); jj++)
+ {
+ // int j = surfind[jj];
- tams -> AddPoint (tas.GetPoint(k));
- GetSurface(j) -> GetNormalVector (tas.GetPoint(k), n);
- n.Normalize();
- if (GetSurface(j)->Inverse()) n *= -1;
- tams -> AddNormal (n);
- }
+ PrintMessageCR (3, "Surface ", j, "/", GetNSurf());
+ // PrintMessageCR (3, "Surface ", j, "/", surfind.Size());
-
- BoxSphere<3> surfbox;
+ if (surf && surf != GetSurface(j))
+ continue;
- if (tas.GetNP())
- surfbox.Set (tas.GetPoint(0));
- for (k = 1; k < tas.GetNP(); k++)
- surfbox.Add (tas.GetPoint(k));
- surfbox.Increase (1e-6);
- surfbox.CalcDiamCenter();
+ TriangleApproximation tas;
+ GetSurface (j) -> GetTriangleApproximation (tas, boundingbox, facets);
- Solid * surflocsol = sol -> GetReducedSolid (surfbox);
- if (!surflocsol)
- continue;
+ int oldnp = tams -> GetNP();
- for (k = 0; k < tas.GetNT(); k++)
- {
- const TATriangle & tri = tas.GetTriangle (k);
-
- // check triangle
- BoxSphere<3> box;
- box.Set (tas.GetPoint (tri[0]));
- box.Add (tas.GetPoint (tri[1]));
- box.Add (tas.GetPoint (tri[2]));
- box.Increase (1e-6);
- box.CalcDiamCenter();
-
-
- Solid * locsol = surflocsol -> GetReducedSolid (box);
-
- if (locsol)
- {
- TATriangle tria(j,
- tri[0] + oldnp,
- tri[1] + oldnp,
- tri[2] + oldnp);
- // tams->AddTriangle (tria);
- RefineTriangleApprox (locsol, j, box, detail,
- tria, *tams);
- delete locsol;
- }
- }
+ if (!tas.GetNP())
+ continue;
- }
+ for (int k = 0; k < tas.GetNP(); k++)
+ {
+ tams -> AddPoint (tas.GetPoint(k));
+ Vec<3> n = GetSurface(j) -> GetNormalVector (tas.GetPoint(k));
+ n.Normalize();
+ if (GetSurface(j)->Inverse()) n *= -1;
+ tams -> AddNormal (n);
+ }
- tams->RemoveUnusedPoints ();
- PrintMessage (2, "Object ", i, " has ", tams->GetNT(), " triangles");
- }
+
+ BoxSphere<3> surfbox;
- Change();
-}
+ if (tas.GetNP())
+ surfbox.Set (tas.GetPoint(0));
+ for (int k = 1; k < tas.GetNP(); k++)
+ surfbox.Add (tas.GetPoint(k));
+ surfbox.Increase (1e-6);
+ surfbox.CalcDiamCenter();
+ Solid * surflocsol = sol -> GetReducedSolid (surfbox);
+ if (!surflocsol)
+ continue;
+ for (int k = 0; k < tas.GetNT(); k++)
+ {
+ const TATriangle & tri = tas.GetTriangle (k);
+
+ // check triangle
+ BoxSphere<3> box;
+ box.Set (tas.GetPoint (tri[0]));
+ box.Add (tas.GetPoint (tri[1]));
+ box.Add (tas.GetPoint (tri[2]));
+ box.Increase (1e-6);
+ box.CalcDiamCenter();
+
+
+ Solid * locsol = surflocsol -> GetReducedSolid (box);
+
+ if (locsol)
+ {
+ TATriangle tria(j,
+ tri[0] + oldnp,
+ tri[1] + oldnp,
+ tri[2] + oldnp);
+
+ RefineTriangleApprox (locsol, j, box, detail,
+ tria, *tams);
+ delete locsol;
+ }
+ }
+ }
-void CSGeometry ::
-RefineTriangleApprox (Solid * locsol,
- int surfind,
- const BoxSphere<3> & box,
- double detail,
- const TATriangle & tria,
- TriangleApproximation & tams)
-{
- int i, j;
+ tams->RemoveUnusedPoints ();
+ PrintMessage (2, "Object ", i, " has ", tams->GetNT(), " triangles");
+ }
- // ARRAY<int> lsurfi;
- int pinds[6];
+ Change();
+ }
- static ARRAY<int> surfused;
- surfused.SetSize(GetNSurf());
+
+ void CSGeometry ::
+ RefineTriangleApprox (Solid * locsol,
+ int surfind,
+ const BoxSphere<3> & box,
+ double detail,
+ const TATriangle & tria,
+ TriangleApproximation & tams)
+ {
+ int pinds[6];
+ ArrayMem<int,500> surfused(GetNSurf());
- ReducePrimitiveIterator rpi(box);
- UnReducePrimitiveIterator urpi;
+ ReducePrimitiveIterator rpi(box);
+ UnReducePrimitiveIterator urpi;
- locsol -> IterateSolid (rpi);
- // locsol -> GetSurfaceIndices (lsurfi);
+ locsol -> IterateSolid (rpi);
+ // locsol -> GetSurfaceIndices (lsurfi);
- IndexSet iset(GetNSurf());
- locsol -> GetSurfaceIndices (iset);
- const ARRAY<int> & lsurfi = iset.Array();
+ IndexSet iset(GetNSurf());
+ locsol -> GetSurfaceIndices (iset);
+ const ARRAY<int> & lsurfi = iset.Array();
- locsol -> IterateSolid (urpi);
+ locsol -> IterateSolid (urpi);
- int surfii = -1;
- for (i = 0; i < lsurfi.Size(); i++)
- if (lsurfi[i] == surfind)
- {
- surfii = i;
- break;
- }
+ int surfii = -1;
+ for (int i = 0; i < lsurfi.Size(); i++)
+ if (lsurfi[i] == surfind)
+ {
+ surfii = i;
+ break;
+ }
- if (surfii == -1)
- return;
+ if (surfii == -1)
+ return;
- int cntindep = 0;
+ int cntindep = 0;
- for (i = 0; i < lsurfi.Size(); i++)
- {
- int linkto = isidenticto[lsurfi[i]];
- surfused[linkto] = 0;
- }
+ for (int i = 0; i < lsurfi.Size(); i++)
+ {
+ int linkto = isidenticto[lsurfi[i]];
+ surfused[linkto] = 0;
+ }
- for (i = 0; i < lsurfi.Size(); i++)
- {
- int linkto = isidenticto[lsurfi[i]];
- if (!surfused[linkto])
- {
- surfused[linkto] = 1;
- cntindep++;
- }
- }
+ for (int i = 0; i < lsurfi.Size(); i++)
+ {
+ int linkto = isidenticto[lsurfi[i]];
+ if (!surfused[linkto])
+ {
+ surfused[linkto] = 1;
+ cntindep++;
+ }
+ }
- int inverse = surfaces[surfind]->Inverse();
+ int inverse = surfaces[surfind]->Inverse();
- if (cntindep == 1)
- {
- // (*testout) << "add trig of surf " << surfind << endl;
- if (cntindep > 1) (*testout) << "not unique" << endl;
- tams.AddTriangle (tria);
- return;
- }
+ if (cntindep == 1)
+ {
+ tams.AddTriangle (tria);
+ return;
+ }
- if (cntindep == 2)
- {
- // just 2 surfaces:
- // if smooth, project inner points to edge and finish
+ if (cntindep == 2)
+ {
+ // just 2 surfaces:
+ // if smooth, project inner points to edge and finish
- int otherind;
+ int otherind = -1;
- for (i = 0; i < lsurfi.Size(); i++)
- {
- INDEX_2 i2 (lsurfi[i], surfind);
- i2.Sort();
+ for (int i = 0; i < lsurfi.Size(); i++)
+ {
+ INDEX_2 i2 (lsurfi[i], surfind);
+ i2.Sort();
- if (i != surfii && !identicsurfaces.Used(i2))
- otherind = lsurfi[i];
- }
-
- double kappa = GetSurface(otherind)->
- MaxCurvature (); // Loc (box.Center(), box.Diam());
-
- if (kappa * box.Diam() < 0.1)
- {
- int pnums[6];
- static int between[3][3] =
- { { 1, 2, 3 },
- { 0, 2, 4 },
- { 0, 1, 5 } };
- int onsurface[3];
-
- for (j = 0; j < 3; j++)
- {
- int pi = tria[j];
- pnums[j] = pi;
- onsurface[j] =
- !locsol->IsStrictIn (tams.GetPoint (pi), 1e-6) &&
- locsol->IsIn (tams.GetPoint (pi), 1e-6);
- }
+ if (i != surfii && !identicsurfaces.Used(i2))
+ otherind = lsurfi[i];
+ }
+
+ double kappa = GetSurface(otherind)-> MaxCurvature ();
+
+ if (kappa * box.Diam() < 0.1)
+ {
+ int pnums[6];
+ static int between[3][3] =
+ { { 1, 2, 3 },
+ { 0, 2, 4 },
+ { 0, 1, 5 } };
+ int onsurface[3];
+
+ for (int j = 0; j < 3; j++)
+ {
+ int pi = tria[j];
+ pnums[j] = pi;
+ onsurface[j] =
+ !locsol->IsStrictIn (tams.GetPoint (pi), 1e-6) &&
+ locsol->IsIn (tams.GetPoint (pi), 1e-6);
+ }
- for (j = 0; j < 3; j++)
- {
- int lpi1 = between[j][0];
- int lpi2 = between[j][1];
- int lpin = between[j][2];
- if (onsurface[lpi1] == onsurface[lpi2])
- pnums[lpin] = -1;
- else
- {
- const Point<3> & p1 = tams.GetPoint (pnums[lpi1]);
- const Point<3> & p2 = tams.GetPoint (pnums[lpi2]);
- double f1 = GetSurface(otherind)->CalcFunctionValue (p1);
- double f2 = GetSurface(otherind)->CalcFunctionValue (p2);
- // Point<3> pn = Center (p1, p2);
-
- Point<3> pn;
- if ( fabs (f1-f2) > 1e-20 )
- {
- double l2 = -f1/(f2-f1);
- double l1 = f2/(f2-f1);
- pn = Point<3>(l1 * p1(0) + l2 * p2(0),
- l1 * p1(1) + l2 * p2(1),
- l1 * p1(2) + l2 * p2(2));
- }
- else
- {
+ for (int j = 0; j < 3; j++)
+ {
+ int lpi1 = between[j][0];
+ int lpi2 = between[j][1];
+ int lpin = between[j][2];
+ if (onsurface[lpi1] == onsurface[lpi2])
+ pnums[lpin] = -1;
+ else
+ {
+ const Point<3> & p1 = tams.GetPoint (pnums[lpi1]);
+ const Point<3> & p2 = tams.GetPoint (pnums[lpi2]);
+ double f1 = GetSurface(otherind)->CalcFunctionValue (p1);
+ double f2 = GetSurface(otherind)->CalcFunctionValue (p2);
+
+ Point<3> pn;
+ if ( fabs (f1-f2) > 1e-20 )
+ {
+ double l2 = -f1/(f2-f1);
+ double l1 = f2/(f2-f1);
+ pn = Point<3>(l1 * p1(0) + l2 * p2(0),
+ l1 * p1(1) + l2 * p2(1),
+ l1 * p1(2) + l2 * p2(2));
+ }
+ else
pn = p1;
- }
- pnums[lpin] = tams.AddPoint (pn);
+ pnums[lpin] = tams.AddPoint (pn);
- GetSurface (surfind)->Project (pn);
+ GetSurface (surfind)->Project (pn);
- Vec<3> n;
- GetSurface (surfind)->GetNormalVector (pn, n);
- if (inverse) n *= -1;
- tams.AddNormal(n);
- }
- }
+ Vec<3> n;
+ n = GetSurface (surfind)->GetNormalVector (pn);
+ if (inverse) n *= -1;
+ tams.AddNormal(n);
+ }
+ }
- int vcase = 0;
- if (onsurface[0]) vcase++;
- if (onsurface[1]) vcase+=2;
- if (onsurface[2]) vcase+=4;
+ int vcase = 0;
+ if (onsurface[0]) vcase++;
+ if (onsurface[1]) vcase+=2;
+ if (onsurface[2]) vcase+=4;
- static int trias[8][6] =
- { { 0, 0, 0, 0, 0, 0 },
- { 1, 6, 5, 0, 0, 0 },
- { 2, 4, 6, 0, 0, 0 },
- { 1, 2, 4, 1, 4, 5 },
- { 3, 5, 4, 0, 0, 0 },
- { 1, 6, 4, 1, 4, 3 },
- { 2, 3, 6, 3, 5, 6 },
- { 1, 2, 3, 0, 0, 0 } };
- static int ntrias[4] =
- { 0, 1, 2, 1 };
-
- int nvis = 0;
- for (j = 0; j < 3; j++)
- if (onsurface[j])
- nvis++;
-
- for (j = 0; j < ntrias[nvis]; j++)
- {
- TATriangle ntria(tria.SurfaceIndex(),
- pnums[trias[vcase][3*j]-1],
- pnums[trias[vcase][3*j+1]-1],
- pnums[trias[vcase][3*j+2]-1]);
- tams.AddTriangle (ntria);
- }
+ static int trias[8][6] =
+ { { 0, 0, 0, 0, 0, 0 },
+ { 1, 6, 5, 0, 0, 0 },
+ { 2, 4, 6, 0, 0, 0 },
+ { 1, 2, 4, 1, 4, 5 },
+ { 3, 5, 4, 0, 0, 0 },
+ { 1, 6, 4, 1, 4, 3 },
+ { 2, 3, 6, 3, 5, 6 },
+ { 1, 2, 3, 0, 0, 0 } };
+ static int ntrias[4] =
+ { 0, 1, 2, 1 };
+
+ int nvis = 0;
+ for (int j = 0; j < 3; j++)
+ if (onsurface[j])
+ nvis++;
+
+ for (int j = 0; j < ntrias[nvis]; j++)
+ {
+ TATriangle ntria(tria.SurfaceIndex(),
+ pnums[trias[vcase][3*j]-1],
+ pnums[trias[vcase][3*j+1]-1],
+ pnums[trias[vcase][3*j+2]-1]);
+ tams.AddTriangle (ntria);
+ }
- /* saturn changes:
+ /* saturn changes:
- int pvis[3];
- for (j = 0; j < 3; j++)
+ int pvis[3];
+ for (j = 0; j < 3; j++)
pvis[j] = !locsol->IsStrictIn (tams.GetPoint (j+1), 1e-6) &&
- locsol->IsIn (tams.GetPoint (j+1), 1e-6);
+ locsol->IsIn (tams.GetPoint (j+1), 1e-6);
- int newpi[3];
- for (j = 0; j < 3; j++)
+ int newpi[3];
+ for (j = 0; j < 3; j++)
+ {
+ int pi1 = j;
+ int pi2 = (j+1) % 3;
+ int pic = j;
+
+ if (pvis[pi1] != pvis[pi2])
{
- int pi1 = j;
- int pi2 = (j+1) % 3;
- int pic = j;
-
- if (pvis[pi1] != pvis[pi2])
- {
- Point<3> hp = Center (tams.GetPoint (tria.PNum (pi1+1)),
- tams.GetPoint (tria.PNum (pi2+1)));
-
- newpi[j] = tams.AddPoint (hp);
- Vec<3> n = tams.GetNormal (pi1);
- tams.AddNormal (n);
- }
- else
- newpi[j] = 0;
+ Point<3> hp = Center (tams.GetPoint (tria.PNum (pi1+1)),
+ tams.GetPoint (tria.PNum (pi2+1)));
+
+ newpi[j] = tams.AddPoint (hp);
+ Vec<3> n = tams.GetNormal (pi1);
+ tams.AddNormal (n);
+ }
+ else
+ newpi[j] = 0;
}
- int nvis = 0;
- for (j = 0; j <= nvis; j++)
+ int nvis = 0;
+ for (j = 0; j <= nvis; j++)
if (pvis[j]) nvis++;
- int si = tria.SurfaceIndex();
- switch (nvis)
+ int si = tria.SurfaceIndex();
+ switch (nvis)
{
case 0:
- break;
+ break;
case 1:
- {
- int visj;
- for (j = 0; j < 3; j++)
- if (pvis[j]) visj = j;
- int pivis = tria.PNum (visj+1);
- int pic1 = newpi[(visj+1)%3];
- int pic2 = newpi[(visj+2)%3];
+ {
+ int visj;
+ for (j = 0; j < 3; j++)
+ if (pvis[j]) visj = j;
+ int pivis = tria.PNum (visj+1);
+ int pic1 = newpi[(visj+1)%3];
+ int pic2 = newpi[(visj+2)%3];
- cout << pivis << "," << pic1 << "," << pic2 << endl;
+ cout << pivis << "," << pic1 << "," << pic2 << endl;
- tams.AddTriangle (TATriangle (si, pivis, pic1,pic2));
- break;
- }
+ tams.AddTriangle (TATriangle (si, pivis, pic1,pic2));
+ break;
+ }
case 2:
- {
- int nvisj;
- for (j = 0; j < 3; j++)
- if (!pvis[j]) nvisj = j;
-
- int pivis1 = tria.PNum ((nvisj+1)%3+1);
- int pivis2 = tria.PNum ((nvisj+2)%3+1);
- int pic1 = newpi[nvisj];
- int pic2 = newpi[(nvisj+2)%3];
-
- tams.AddTriangle (TATriangle (si, pivis1, pic1,pic2));
- tams.AddTriangle (TATriangle (si, pivis1, pic1,pivis2));
- break;
- }
+ {
+ int nvisj;
+ for (j = 0; j < 3; j++)
+ if (!pvis[j]) nvisj = j;
+
+ int pivis1 = tria.PNum ((nvisj+1)%3+1);
+ int pivis2 = tria.PNum ((nvisj+2)%3+1);
+ int pic1 = newpi[nvisj];
+ int pic2 = newpi[(nvisj+2)%3];
+
+ tams.AddTriangle (TATriangle (si, pivis1, pic1,pic2));
+ tams.AddTriangle (TATriangle (si, pivis1, pic1,pivis2));
+ break;
+ }
case 3:
- {
- tams.AddTriangle (tria);
- break;
- }
+ {
+ tams.AddTriangle (tria);
+ break;
+ }
}
- */
- return;
- }
- }
+ */
+ return;
+ }
+ }
- // bisection
- if (box.Diam() < detail)
- return;
-
- for (i = 0; i < 3; i++)
- pinds[i] = tria[i];
+ // bisection
+ if (box.Diam() < detail)
+ return;
+
+ for (int i = 0; i < 3; i++)
+ pinds[i] = tria[i];
- static int between[3][3] =
- { { 0, 1, 5 },
- { 0, 2, 4 },
- { 1, 2, 3 } };
+ static int between[3][3] =
+ { { 0, 1, 5 },
+ { 0, 2, 4 },
+ { 1, 2, 3 } };
- for (i = 0; i < 3; i++)
- {
- int pi1 = tria[between[i][0]];
+ for (int i = 0; i < 3; i++)
+ {
+ // int pi1 = tria[between[i][0]];
- Point<3> newp = Center (tams.GetPoint (tria[between[i][0]]),
- tams.GetPoint (tria[between[i][1]]));
- Vec<3> n;
+ Point<3> newp = Center (tams.GetPoint (tria[between[i][0]]),
+ tams.GetPoint (tria[between[i][1]]));
+ Vec<3> n;
- GetSurface(surfind)->Project (newp);
- GetSurface(surfind)->GetNormalVector (newp, n);
+ GetSurface(surfind)->Project (newp);
+ n = GetSurface(surfind)->GetNormalVector (newp);
- pinds[between[i][2]] = tams.AddPoint (newp);
- if (inverse) n *= -1;
- tams.AddNormal (n);
- }
+ pinds[between[i][2]] = tams.AddPoint (newp);
+ if (inverse) n *= -1;
+ tams.AddNormal (n);
+ }
- static int trias[4][4] =
- { { 0, 5, 4 },
- { 5, 1, 3 },
- { 4, 3, 2 },
- { 3, 4, 5 } };
+ static int trias[4][4] =
+ { { 0, 5, 4 },
+ { 5, 1, 3 },
+ { 4, 3, 2 },
+ { 3, 4, 5 } };
- for (i = 0; i < 4; i++)
- {
- TATriangle ntri(surfind,
- pinds[trias[i][0]],
- pinds[trias[i][1]],
- pinds[trias[i][2]]);
-
- // check triangle
- BoxSphere<3> nbox;
- nbox.Set (tams.GetPoint (ntri[0]));
- nbox.Add (tams.GetPoint (ntri[1]));
- nbox.Add (tams.GetPoint (ntri[2]));
- nbox.Increase (1e-6);
- nbox.CalcDiamCenter();
-
- Solid * nsol = locsol -> GetReducedSolid (nbox);
-
- if (nsol)
- {
- RefineTriangleApprox (nsol, surfind, nbox,
- detail, ntri, tams);
+ for (int i = 0; i < 4; i++)
+ {
+ TATriangle ntri(surfind,
+ pinds[trias[i][0]],
+ pinds[trias[i][1]],
+ pinds[trias[i][2]]);
+
+ // check triangle
+ BoxSphere<3> nbox;
+ nbox.Set (tams.GetPoint (ntri[0]));
+ nbox.Add (tams.GetPoint (ntri[1]));
+ nbox.Add (tams.GetPoint (ntri[2]));
+ nbox.Increase (1e-6);
+ nbox.CalcDiamCenter();
+
+ Solid * nsol = locsol -> GetReducedSolid (nbox);
+
+ if (nsol)
+ {
+ RefineTriangleApprox (nsol, surfind, nbox,
+ detail, ntri, tams);
- delete nsol;
- }
- }
-}
-
-
-
-
-
-class ClearVisitedIt : public SolidIterator
-{
-public:
- ClearVisitedIt ();
- ~ClearVisitedIt ();
- virtual void Do (Solid * sol);
-};
-
-ClearVisitedIt :: ClearVisitedIt ()
-{
- ;
-}
-ClearVisitedIt :: ~ClearVisitedIt ()
-{
- ;
-}
+ delete nsol;
+ }
+ }
+ }
-void ClearVisitedIt :: Do (Solid * sol)
-{
- sol -> visited = 0;
-}
-void CSGeometry ::
-IterateAllSolids (SolidIterator & it, int only_once)
-{
- int i;
+ class ClearVisitedIt : public SolidIterator
+ {
+ public:
+ ClearVisitedIt () { ; }
+ virtual ~ClearVisitedIt () { ; }
- if (only_once)
- {
- ClearVisitedIt clit;
- for (i = 0; i < solids.Size(); i++)
- solids[i] -> IterateSolid (clit, 0);
-
+ virtual void Do (Solid * sol)
+ {
+ sol -> visited = 0;
}
-
- for (i = 0; i < solids.Size(); i++)
- solids[i] -> IterateSolid (it, only_once);
-}
-
+ };
-/*
-const Box<3> & CSGeometry :: BoundingBox () const
-{
- return boundingbox;
-}
-*/
-
-void CSGeometry :: SetBoundingBox (const Box<3> & abox)
-{
- boundingbox = abox;
-}
+ void CSGeometry ::
+ IterateAllSolids (SolidIterator & it, int only_once)
+ {
+ if (only_once)
+ {
+ ClearVisitedIt clit;
+ for (int i = 0; i < solids.Size(); i++)
+ solids[i] -> IterateSolid (clit, 0);
+ }
-double CSGeometry :: MaxSize () const
-{
- double maxs, mins;
- maxs = max3 (boundingbox.PMax()(0),
- boundingbox.PMax()(1),
- boundingbox.PMax()(2));
- mins = min3 (boundingbox.PMin()(0),
- boundingbox.PMin()(1),
- boundingbox.PMin()(2));
- return max2 (maxs, -mins) * 1.1;
-}
+ for (int i = 0; i < solids.Size(); i++)
+ solids[i] -> IterateSolid (it, only_once);
+ }
+
+
+ double CSGeometry :: MaxSize () const
+ {
+ double maxs, mins;
+ maxs = max3 (boundingbox.PMax()(0),
+ boundingbox.PMax()(1),
+ boundingbox.PMax()(2));
+ mins = min3 (boundingbox.PMin()(0),
+ boundingbox.PMin()(1),
+ boundingbox.PMin()(2));
+ return max2 (maxs, -mins) * 1.1;
+ }
}
diff --git a/Netgen/libsrc/csg/csgeom.hpp b/Netgen/libsrc/csg/csgeom.hpp
index 4a8e32b28f..6e29a8163b 100644
--- a/Netgen/libsrc/csg/csgeom.hpp
+++ b/Netgen/libsrc/csg/csgeom.hpp
@@ -104,6 +104,9 @@ private:
/// bounding box of geometry
Box<3> boundingbox;
+ /// bounding box, if not set by input file
+ static Box<3> default_boundingbox;
+
/// identic surfaces are stored by pair of indizes, val = inverse
INDEX_2_HASHTABLE<int> identicsurfaces;
ARRAY<int> isidenticto;
@@ -130,10 +133,12 @@ public:
void AddSurface (Surface * surf);
void AddSurface (char * name, Surface * surf);
+ void AddSurfaces (Primitive * prim);
int GetNSurf () const { return surfaces.Size(); }
const Surface * GetSurface (const char * name) const;
- const Surface * GetSurface (int i) const;
+ const Surface * GetSurface (int i) const
+ { return surfaces[i]; }
void SetSolid (const char * name, Solid * sol);
const Solid * GetSolid (const char * name) const;
@@ -145,22 +150,21 @@ public:
void SetFlags (const char * solidname, const Flags & flags);
- /*
- ///
- void FindMainSolids ();
- ///
- int GetNMainSolids () const
- { return mainsolids.Size(); }
- ///
- const Solid* MainSolid(int i) const
- { return mainsolids.Get(i); }
- */
-
- int GetNTopLevelObjects () const { return toplevelobjects.Size(); }
+ int GetNTopLevelObjects () const
+ { return toplevelobjects.Size(); }
int SetTopLevelObject (Solid * sol, Surface * surf = NULL);
- void GetTopLevelObject (int nr, Solid *& sol, Surface *& surf);
- void GetTopLevelObject (int nr, const Solid *& sol, const Surface *& surf) const;
+ void GetTopLevelObject (int nr, Solid *& sol, Surface *& surf)
+ {
+ sol = toplevelobjects[nr]->GetSolid();
+ surf = toplevelobjects[nr]->GetSurface();
+ }
+ void GetTopLevelObject (int nr, const Solid *& sol, const Surface *& surf) const
+ {
+ sol = toplevelobjects[nr]->GetSolid();
+ surf = toplevelobjects[nr]->GetSurface();
+ }
+
TopLevelObject * GetTopLevelObject (const Solid * sol, const Surface * surf = NULL);
TopLevelObject * GetTopLevelObject (int nr)
{ return toplevelobjects[nr]; }
@@ -178,6 +182,7 @@ public:
// quick implementations:
+ ARRAY<SingularFace*> singfaces;
ARRAY<SingularEdge*> singedges;
ARRAY<SingularPoint*> singpoints;
ARRAY<Identification*> identifications;
@@ -203,6 +208,7 @@ public:
///
int GetSurfaceClassRepresentant (int si) const
{ return isidenticto[si]; }
+
///
const TriangleApproximation * GetTriApprox (int msnr)
{
@@ -222,7 +228,17 @@ public:
TriangleApproximation & tams);
const Box<3> & BoundingBox () const { return boundingbox; }
- void SetBoundingBox (const Box<3> & abox);
+
+ void SetBoundingBox (const Box<3> & abox)
+ {
+ boundingbox = abox;
+ }
+
+
+ static void SetDefaultBoundingBox (const Box<3> & abox)
+ {
+ default_boundingbox = abox;
+ }
double MaxSize () const;
diff --git a/Netgen/libsrc/csg/csgparser.cpp b/Netgen/libsrc/csg/csgparser.cpp
index 9372d5675d..b6d4878399 100644
--- a/Netgen/libsrc/csg/csgparser.cpp
+++ b/Netgen/libsrc/csg/csgparser.cpp
@@ -16,7 +16,7 @@ namespace netgen
TOK_EQU = '=', TOK_COMMA = ',', TOK_SEMICOLON = ';',
TOK_NUM = 100, TOK_STRING, TOK_NAMED_SOLID, TOK_PRIMITIVE,
TOK_OR, TOK_AND, TOK_NOT,
- TOK_SINGULAR, TOK_EDGE, TOK_POINT, TOK_IDENTIFY, TOK_CLOSESURFACES,
+ TOK_SINGULAR, TOK_EDGE, TOK_POINT, TOK_FACE, TOK_IDENTIFY, TOK_CLOSESURFACES,
TOK_CLOSEEDGES, TOK_PERIODIC,
TOK_SOLID, TOK_RECO, TOK_TLO, TOK_BOUNDINGBOX, TOK_BOUNDARYCONDITION,
TOK_END };
@@ -38,6 +38,7 @@ namespace netgen
{ TOK_NOT, "not" },
{ TOK_SINGULAR, "singular" },
{ TOK_EDGE, "edge" },
+ { TOK_FACE, "face" },
{ TOK_POINT, "point" },
{ TOK_IDENTIFY, "identify" },
{ TOK_CLOSESURFACES, "closesurfaces" },
@@ -48,10 +49,13 @@ namespace netgen
};
enum PRIMITIVE_TYPE
- { TOK_SPHERE = 1, TOK_CYLINDER, TOK_PLANE, TOK_ELLIPTICCYLINDER,
- TOK_ELLIPSOID,
- TOK_CONE, TOK_TUBE,
- TOK_GENCYL, TOK_ORTHOBRICK, TOK_POLYHEDRON, TOK_EXTRUSION, TOK_REVOLUTION,
+ {
+ TOK_SPHERE = 1, TOK_CYLINDER, TOK_PLANE, TOK_ELLIPTICCYLINDER,
+ TOK_ELLIPSOID, TOK_CONE,
+ TOK_ORTHOBRICK, TOK_POLYHEDRON,
+
+ TOK_TUBE, TOK_GENCYL, TOK_EXTRUSION, TOK_REVOLUTION, // currently, out of order
+
TOK_TRANSLATE, TOK_MULTITRANSLATE, TOK_ROTATE, TOK_MULTIROTATE
};
@@ -69,10 +73,11 @@ namespace netgen
{ TOK_CONE, "cone" },
{ TOK_ELLIPTICCYLINDER, "ellipticcylinder" },
{ TOK_ELLIPSOID, "ellipsoid" },
- { TOK_TUBE, "tube" },
- { TOK_GENCYL, "gencyl" },
{ TOK_ORTHOBRICK, "orthobrick" },
{ TOK_POLYHEDRON, "polyhedron" },
+
+ { TOK_TUBE, "tube" },
+ { TOK_GENCYL, "gencyl" },
{ TOK_EXTRUSION, "extrusion" },
{ TOK_REVOLUTION, "revolution" },
@@ -83,24 +88,8 @@ namespace netgen
{ PRIMITIVE_TYPE(0) }
};
-
-
static CSGeometry * geom;
- /*
-%token <solidtype> TOK_SPHERE TOK_CYLINDER TOK_CONE TOK_PLAIN TOK_TUBE TOK_GENCYL TOK_ORTHOBRICK TOK_POLYHEDRON TOK_REVOLUTION
-%left <solidtype> TOK_OR TOK_AND TOK_NOT
-%token <solidtype> TOK_TRANSLATE TOK_MULTITRANSLATE TOK_ROTATE TOK_MULTIROTATE
-%type <solidtype> solid solidprimitive
-%type <void> splinesegmentlist splinesegment readbspline bsplinepointlist
-%type <chptr> anyident
-%token TOK_SINGULAR TOK_EDGE TOK_POINT
-%token TOK_IDENTIFY TOK_CLOSESURFACES TOK_CLOSEEDGES TOK_PERIODIC
-%token TOK_BOUNDARYCONDITION
-%type <void> polyhedronpoints polyhedronfaces polyhedronpoint polyhedronface
-%type <void> revolutionpoints revolutionpoint
- */
-
class CSGScanner
@@ -133,6 +122,14 @@ namespace netgen
{ return prim_token; }
void ReadNext();
+
+ /*
+ CSGScanner & Parse (char ch);
+ CSGScanner & Parse (int & i);
+ CSGScanner & Parse (double & d);
+ CSGScanner & Parse (Point<3> & p);
+ CSGScanner & Parse (Vec<3> & p);
+ */
void Error (const string & err);
};
@@ -151,7 +148,7 @@ namespace netgen
char ch;
- // whitespaces ueberspringen
+ // scan whitespaces
do
{
scanin->get(ch);
@@ -208,17 +205,14 @@ namespace netgen
{
string_value = string (1, ch);
scanin->get(ch);
- while (isalnum(ch))
+ while (isalnum(ch) || ch == '_')
{
string_value += ch;
scanin->get(ch);
}
scanin->putback (ch);
}
- /*
- (*scanin).putback (ch);
- (*scanin) >> string_value;
- */
+
int nr = 0;
while (defkw[nr].kw)
{
@@ -259,15 +253,12 @@ namespace netgen
Solid = Term { OR Term }
Term = Primary { AND Primary }
Primary = PRIM | IDENT | ( Solid ) | NOT Primary
- */
+ */
void ParseChar (CSGScanner & scan, char ch)
{
- char str[2];
- str[0] = ch;
- str[1] = 0;
if (scan.GetToken() != TOKEN_TYPE(ch))
- scan.Error (string ("token '") + string(str) + string("' expected"));
+ scan.Error (string ("token '") + string(1, ch) + string("' expected"));
scan.ReadNext();
}
@@ -284,6 +275,50 @@ namespace netgen
return val;
}
+ Vec<3> ParseVector (CSGScanner & scan)
+ {
+ Vec<3> v;
+ v(0) = ParseNumber (scan);
+ ParseChar (scan, ',');
+ v(1) = ParseNumber (scan);
+ ParseChar (scan, ',');
+ v(2) = ParseNumber (scan);
+ return v;
+ }
+
+
+ CSGScanner & operator>> (CSGScanner & scan, char ch)
+ {
+ if (scan.GetToken() != TOKEN_TYPE(ch))
+ scan.Error (string ("token '") + string(1, ch) + string("' expected"));
+ scan.ReadNext();
+ return scan;
+ }
+
+ CSGScanner & operator>> (CSGScanner & scan, double & d)
+ {
+ d = ParseNumber (scan);
+ return scan;
+ }
+
+ CSGScanner & operator>> (CSGScanner & scan, int & i)
+ {
+ i = int (ParseNumber (scan));
+ return scan;
+ }
+
+ CSGScanner & operator>> (CSGScanner & scan, Point<3> & p)
+ {
+ scan >> p(0) >> ',' >> p(1) >> ',' >> p(2);
+ return scan;
+ }
+
+ CSGScanner & operator>> (CSGScanner & scan, Vec<3> & v)
+ {
+ scan >> v(0) >> ',' >> v(1) >> ',' >> v(2);
+ return scan;
+ }
+
Solid * ParseSolid (CSGScanner & scan);
Solid * ParseTerm (CSGScanner & scan);
@@ -294,7 +329,6 @@ namespace netgen
{
if (scan.GetToken() == TOK_PRIMITIVE)
{
- // cout << "prim token = " << int (scan.GetPrimitiveToken()) << endl;
switch (scan.GetPrimitiveToken())
{
case TOK_PLANE:
@@ -303,57 +337,23 @@ namespace netgen
Vec<3> v;
scan.ReadNext();
-
- ParseChar (scan, '(');
- p(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- v(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(2) = ParseNumber (scan);
- ParseChar (scan, ')');
+ scan >> '(' >> p >> ';' >> v >> ')';
- // cout << "define plane, p = " << p << "; v = " << v << endl;
OneSurfacePrimitive * surf = new Plane ( p, v );
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
-
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
+
case TOK_CYLINDER:
{
Point<3> pa, pb;
double r;
scan.ReadNext();
-
- ParseChar (scan, '(');
- pa(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- pb(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- r = ParseNumber (scan);
- ParseChar (scan, ')');
-
- OneSurfacePrimitive * surf = new Cylinder ( pa, pb, r );
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
+ scan >> '(' >> pa >> ';' >> pb >> ';' >> r >> ')';
+ OneSurfacePrimitive * surf = new Cylinder ( pa, pb, r );
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
@@ -363,34 +363,10 @@ namespace netgen
Vec<3> vl, vs;
scan.ReadNext();
-
- ParseChar (scan, '(');
- pa(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(2) = ParseNumber (scan);
- ParseChar (scan, ';');
-
- vl(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- vl(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- vl(2) = ParseNumber (scan);
- ParseChar (scan, ';');
+ scan >> '(' >> pa >> ';' >> vl >> ';' >> vs >> ')';
- vs(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- vs(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- vs(2) = ParseNumber (scan);
- ParseChar (scan, ')');
-
OneSurfacePrimitive * surf = new EllipticCylinder ( pa, vl, vs);
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
-
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
@@ -401,41 +377,10 @@ namespace netgen
Vec<3> v1, v2, v3;
scan.ReadNext();
-
- ParseChar (scan, '(');
- pa(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(2) = ParseNumber (scan);
- ParseChar (scan, ';');
-
- v1(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v1(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v1(2) = ParseNumber (scan);
- ParseChar (scan, ';');
-
- v2(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v2(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v2(2) = ParseNumber (scan);
- ParseChar (scan, ';');
+ scan >> '(' >> pa >> ';' >> v1 >> ';' >> v2 >> ';' >> v3 >> ')';
- v3(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v3(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v3(2) = ParseNumber (scan);
- ParseChar (scan, ')');
-
OneSurfacePrimitive * surf = new Ellipsoid ( pa, v1, v2, v3);
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
-
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
@@ -446,59 +391,25 @@ namespace netgen
double ra, rb;
scan.ReadNext();
-
- ParseChar (scan, '(');
- pa(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- ra = ParseNumber (scan);
- ParseChar (scan, ';');
- pb(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- rb = ParseNumber (scan);
- ParseChar (scan, ')');
-
- OneSurfacePrimitive * surf = new Cone ( pa, pb, ra, rb);
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
+ scan >> '(' >> pa >> ';' >> ra >> ';' >> pb >> ';' >> rb >> ')';
+ OneSurfacePrimitive * surf = new Cone ( pa, pb, ra, rb );
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
-
case TOK_SPHERE:
{
Point<3> p;
double r;
scan.ReadNext();
-
- ParseChar (scan, '(');
- p(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- r = ParseNumber (scan);
- ParseChar (scan, ')');
-
- // cout << "define sphere, c = " << p << ", rad = " << r << endl;
- OneSurfacePrimitive * surf = new Sphere ( p, r );
-
- geom->AddSurface (surf);
- surf->SetSurfaceId (0, geom->GetNSurf()-1);
+ scan >> '(' >> p >> ';' >> r >> ')';
+ OneSurfacePrimitive * surf = new Sphere ( p, r );
+ geom->AddSurfaces (surf);
return new Solid (surf);
}
@@ -507,36 +418,13 @@ namespace netgen
Point<3> pa, pb;
scan.ReadNext();
+ scan >> '(' >> pa >> ';' >> pb >> ')';
- ParseChar (scan, '(');
- pa(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pa(2) = ParseNumber (scan);
- ParseChar (scan, ';');
- pb(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- pb(2) = ParseNumber (scan);
- ParseChar (scan, ')');
-
- // cout << "define orthobrick, p1 = " << pa << "; p2 = " << pb << endl;
-
Primitive * nprim = new OrthoBrick (pa, pb);
-
- for (int j = 0; j < nprim->GetNSurfaces(); j++)
- {
- geom->AddSurface (&nprim->GetSurface(j));
- nprim->SetSurfaceId (j, geom->GetNSurf()-1);
- }
+ geom->AddSurfaces (nprim);
return new Solid (nprim);
}
-
-
-
case TOK_POLYHEDRON:
{
// Added by Dalibor Lukas, October 15, 2003
@@ -552,15 +440,9 @@ namespace netgen
// scanning the points
while (1)
{
- p(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(2) = ParseNumber (scan);
+ p = Point<3> (ParseVector (scan));
ParseChar (scan, ';');
- // cout << "point = " << p << endl;
-
polyhedron->AddPoint(p);
if (scan.GetToken() == ';')
@@ -595,19 +477,14 @@ namespace netgen
}
scan.ReadNext();
}
-
- for (int j = 0; j < polyhedron->GetNSurfaces(); j++)
- {
- geom->AddSurface (&polyhedron->GetSurface(j));
- polyhedron->SetSurfaceId (j, geom->GetNSurf()-1);
- }
+ geom->AddSurfaces (polyhedron);
return new Solid (polyhedron);
}
- case TOK_EXTRUSION:
- {
+ case TOK_EXTRUSION: // not functional
+ {
Point<3> p0;
Vec<3> ex, ey;
ARRAY<Point<2> > points;
@@ -638,8 +515,8 @@ namespace netgen
cout << "p0 = " << p0 << endl;
- int npseg = 0;
- int nseg = 0;
+ // int npseg = 0;
+ // int nseg = 0;
while (1)
{
Point<2> p1, p2, p3;
@@ -658,45 +535,45 @@ namespace netgen
/*
- while (1)
+ while (1)
{
- Point<2> p1, p2, p3;
+ Point<2> p1, p2, p3;
- p3 = p2;
- p2 = p1;
- p1(0) = ParseNumber(scan);
- ParseChar (scan, ',');
- p1(1) = ParseNumber(scan);
- npseg++;
+ p3 = p2;
+ p2 = p1;
+ p1(0) = ParseNumber(scan);
+ ParseChar (scan, ',');
+ p1(1) = ParseNumber(scan);
+ npseg++;
- cout << "p1 = " << p1 << endl;
+ cout << "p1 = " << p1 << endl;
- if (scan.GetToken() == ';' || scan.GetToken() == ')')
- {
- if (npseg == 2)
- {
- p3 = p2;
- p2 = Center (p1, p3);
- }
- if (nseg == 0)
- points.Append (p3);
- points.Append (p2);
- points.Append (p1);
- npseg = 1;
- nseg++;
-
- cout << "p1, = " << p1 << ", p2 = " << p2 << ", p3 = " << p3 << endl;
- }
+ if (scan.GetToken() == ';' || scan.GetToken() == ')')
+ {
+ if (npseg == 2)
+ {
+ p3 = p2;
+ p2 = Center (p1, p3);
+ }
+ if (nseg == 0)
+ points.Append (p3);
+ points.Append (p2);
+ points.Append (p1);
+ npseg = 1;
+ nseg++;
+
+ cout << "p1, = " << p1 << ", p2 = " << p2 << ", p3 = " << p3 << endl;
+ }
- if (scan.GetToken() == ')')
- {
- scan.ReadNext();
- break;
- }
- if (scan.GetToken() == ';' || scan.GetToken() == ',')
- {
- scan.ReadNext();
- }
+ if (scan.GetToken() == ')')
+ {
+ scan.ReadNext();
+ break;
+ }
+ if (scan.GetToken() == ';' || scan.GetToken() == ',')
+ {
+ scan.ReadNext();
+ }
}
*/
cout << "p0 = " << p0 << endl;
@@ -705,13 +582,9 @@ namespace netgen
Extrusion * extrusion = new Extrusion (p0, ex, ey, points);
- for (int i = 0; i < extrusion->GetNSurfaces(); i++)
- {
- geom->AddSurface (&extrusion->GetSurface(i));
- extrusion->SetSurfaceId(i, geom->GetNSurf()-1);
- }
+ geom->AddSurfaces (extrusion);
return new Solid (extrusion);
-
+
/*
// cout << "define cylinder, pa = " << pa << "; pb = " << pb
// << ", rad = " << r << endl;
@@ -732,12 +605,9 @@ namespace netgen
{
Vec<3> v;
scan.ReadNext();
+
ParseChar (scan, '(');
- v(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(2) = ParseNumber (scan);
+ v = ParseVector (scan);
ParseChar (scan, ';');
Solid * sol1 = ParseSolid (scan);
@@ -757,24 +627,15 @@ namespace netgen
int n;
scan.ReadNext();
- ParseChar (scan, '(');
- v(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- v(2) = ParseNumber (scan);
- ParseChar (scan, ';');
-
- n = int (ParseNumber (scan));
- ParseChar (scan, ';');
-
+
+ scan >> '(' >> v >> ';' >> n >> ';';
+
Solid * sol1 = ParseSolid (scan);
- ParseChar (scan, ')');
+ scan >> ')';
- int i;
Solid * hsol = sol1;
- for (i = 1; i <= n; i++)
+ for (int i = 1; i <= n; i++)
{
Solid * nsol = sol1 -> Copy(*geom);
Transformation<3> trans(double(i) * v);
@@ -786,6 +647,37 @@ namespace netgen
}
+ case TOK_MULTIROTATE:
+ {
+ Point<3> c;
+ Vec<3> v;
+ int n;
+
+ scan.ReadNext();
+
+ scan >> '(' >> c >> ';' >> v >> ';' >> n >> ';';
+ Solid * sol1 = ParseSolid (scan);
+ scan >> ')';
+
+ Transformation<3> trans(c, v(0), v(1), v(2));
+ Transformation<3> multi(Vec<3>(0,0,0));
+ Transformation<3> ht;
+
+ Solid * hsol = sol1;
+ for (int i = 1; i <= n; i++)
+ {
+ Solid * nsol = sol1 -> Copy(*geom);
+
+ nsol -> Transform (multi);
+ hsol = new Solid (Solid::UNION, hsol, nsol);
+
+ ht=multi;
+ multi.Combine (trans, ht);
+ }
+ return hsol;
+ }
+
+
default:
{
scan.Error (string ("unknown primary ") + scan.GetStringValue());
@@ -826,6 +718,7 @@ namespace netgen
}
+
Solid * ParseTerm (CSGScanner & scan)
{
Solid * sol = ParsePrimary(scan);
@@ -838,6 +731,7 @@ namespace netgen
return sol;
}
+
Solid * ParseSolid (CSGScanner & scan)
{
Solid * sol = ParseTerm(scan);
@@ -896,7 +790,7 @@ namespace netgen
/*
Main parsing function for CSG geometry
- */
+ */
CSGeometry * ParseCSG (istream & istr)
{
CSGScanner scan(istr);
@@ -905,9 +799,8 @@ namespace netgen
scan.ReadNext();
if (scan.GetToken() != TOK_RECO) // keyword 'algebraic3d'
- {
- return 0;
- }
+ return 0;
+
scan.ReadNext();
try
@@ -956,10 +849,13 @@ namespace netgen
ParseFlags (scan, flags);
ParseChar (scan, ';');
+ if (!geom->GetSolid (name))
+ scan.Error ("Top-Level-Object "+name+" not defined");
int tlonr =
geom->SetTopLevelObject ((Solid*)geom->GetSolid(name));
TopLevelObject * tlo = geom->GetTopLevelObject (tlonr);
+
if (flags.NumListFlagDefined ("col"))
{
const ARRAY<double> & col =
@@ -1025,7 +921,7 @@ namespace netgen
string name2 = scan.GetStringValue();
scan.ReadNext();
-
+
Flags flags;
ParseFlags (scan, flags);
@@ -1035,12 +931,17 @@ namespace netgen
ARRAY<int> si1, si2;
geom->GetSolid(name1)->GetSurfaceIndices(si1);
geom->GetSolid(name2)->GetSurfaceIndices(si2);
-
+
+ const TopLevelObject * domain =
+ geom->GetTopLevelObject (geom->GetSolid(flags.GetStringFlag ("tlo","")));
+
geom->AddIdentification
(new CloseSurfaceIdentification
(geom->GetNIdentifications()+1, *geom,
geom->GetSurface (si1[0]), geom->GetSurface (si2[0]),
+ domain,
flags));
+
break;
}
@@ -1075,6 +976,86 @@ namespace netgen
}
}
+
+ else if (scan.GetToken() == TOK_SINGULAR)
+
+ {
+
+ scan.ReadNext();
+ switch (scan.GetToken())
+ {
+ case TOK_FACE:
+ {
+ scan.ReadNext();
+
+ string name1 = scan.GetStringValue(); // tlo
+ scan.ReadNext();
+
+ string name2 = scan.GetStringValue();
+ scan.ReadNext();
+
+ Flags flags;
+ ParseFlags (scan, flags);
+
+ ParseChar (scan, ';');
+
+ const Solid * sol = geom->GetSolid(name2);
+
+ for (int i = 0; i < geom->GetNTopLevelObjects(); i++)
+ if (name1 == geom->GetTopLevelObject (i)->GetSolid()->Name())
+ geom->singfaces.Append (new SingularFace (i+1, sol));
+
+ break;
+ }
+
+ case TOK_EDGE:
+ {
+ scan.ReadNext();
+
+ string name1 = scan.GetStringValue();
+ scan.ReadNext();
+
+ string name2 = scan.GetStringValue();
+ scan.ReadNext();
+
+ Flags flags;
+ ParseFlags (scan, flags);
+
+ ParseChar (scan, ';');
+
+ const Solid * s1 = geom->GetSolid(name1);
+ const Solid * s2 = geom->GetSolid(name2);
+ geom->singedges.Append (new SingularEdge (1, s1, s2));
+ break;
+ }
+
+ case TOK_POINT:
+ {
+ scan.ReadNext();
+
+ string name1 = scan.GetStringValue();
+ scan.ReadNext();
+ string name2 = scan.GetStringValue();
+ scan.ReadNext();
+ string name3 = scan.GetStringValue();
+ scan.ReadNext();
+
+ Flags flags;
+ ParseFlags (scan, flags);
+
+ ParseChar (scan, ';');
+
+ const Solid * s1 = geom->GetSolid(name1);
+ const Solid * s2 = geom->GetSolid(name2);
+ const Solid * s3 = geom->GetSolid(name3);
+ geom->singpoints.Append (new SingularPoint (1, s1, s2, s3));
+ break;
+ }
+ default:
+ scan.Error ("keyword 'face' or 'edge' or 'point' expected");
+ }
+ }
+
else if (scan.GetToken() == TOK_POINT)
{
@@ -1082,11 +1063,7 @@ namespace netgen
scan.ReadNext();
ParseChar (scan, '(');
- p(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p(2) = ParseNumber (scan);
+ p = Point<3> (ParseVector (scan));
ParseChar (scan, ')');
ParseChar (scan, ';');
@@ -1099,17 +1076,9 @@ namespace netgen
scan.ReadNext();
ParseChar (scan, '(');
- p1(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p1(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p1(2) = ParseNumber (scan);
+ p1 = Point<3> (ParseVector (scan));
ParseChar (scan, ';');
- p2(0) = ParseNumber (scan);
- ParseChar (scan, ',');
- p2(1) = ParseNumber (scan);
- ParseChar (scan, ',');
- p2(2) = ParseNumber (scan);
+ p2 = Point<3> (ParseVector (scan));
ParseChar (scan, ')');
ParseChar (scan, ';');
@@ -1164,20 +1133,21 @@ namespace netgen
catch (string errstr)
{
cout << "caught error " << errstr << endl;
+ throw NgException (errstr);
}
return geom;
/*
- do
+ do
{
- scan.ReadNext();
- if (scan.GetToken() == TOK_STRING)
- cout << "found string " << scan.GetStringValue() << endl;
- else
- cout << "token = " << int(scan.GetToken()) << endl;
+ scan.ReadNext();
+ if (scan.GetToken() == TOK_STRING)
+ cout << "found string " << scan.GetStringValue() << endl;
+ else
+ cout << "token = " << int(scan.GetToken()) << endl;
}
- while (scan.GetToken() != TOK_END);
+ while (scan.GetToken() != TOK_END);
*/
}
diff --git a/Netgen/libsrc/csg/edgeflw.cpp b/Netgen/libsrc/csg/edgeflw.cpp
index 0e5418ad69..50b425f84f 100644
--- a/Netgen/libsrc/csg/edgeflw.cpp
+++ b/Netgen/libsrc/csg/edgeflw.cpp
@@ -9,17 +9,33 @@ namespace netgen
EdgeCalculation ::
EdgeCalculation (const CSGeometry & ageometry,
- const ARRAY<SpecialPoint> & aspecpoints)
+ ARRAY<SpecialPoint> & aspecpoints)
: geometry(ageometry), specpoints(aspecpoints)
{
- ;
+ Box<3> bbox;
+ if (specpoints.Size() >= 1)
+ bbox.Set (specpoints[0].p);
+ else
+ { bbox.Set (Point<3> (0,0,0)); bbox.Add (Point<3> (1,1,1)); }
+ for (int i = 1; i < specpoints.Size(); i++)
+ bbox.Add (specpoints[i].p);
+
+ searchtree = new Point3dTree (bbox.PMin(), bbox.PMax());
+ meshpoint_tree = new Point3dTree (bbox.PMin(), bbox.PMax());
+
+ for (int i = 0; i < specpoints.Size(); i++)
+ searchtree->Insert (specpoints[i].p, i);
}
+ EdgeCalculation :: ~EdgeCalculation()
+ {
+ delete searchtree;
+ delete meshpoint_tree;
+ }
void EdgeCalculation :: Calc(double h, Mesh & mesh)
{
- (*testout) << "Find edges" << endl;
PrintMessage (1, "Find edges");
PushStatus ("Find edges");
@@ -27,6 +43,7 @@ namespace netgen
SplitEqualOneSegEdges (mesh);
FindClosedSurfaces (h, mesh);
PrintMessage (3, cntedge, " edges found");
+
PopStatus ();
}
@@ -36,44 +53,43 @@ namespace netgen
void EdgeCalculation :: CalcEdges1 (double h, Mesh & mesh)
{
- ARRAY<SpecialPoint> hsp(specpoints.Size());
- ARRAY<SpecialPoint> startpoints, endpoints;
+ ARRAY<int> hsp(specpoints.Size());
+ ARRAY<int> glob2hsp(specpoints.Size());
+ ARRAY<int> startpoints, endpoints;
- int i, j, k, l, hi, pos, ep, ne;
+ int pos, ep;
int layer;
- Vec<3> a1, a2, t, n, m;
- Point<3> p, np, pnp, hp;
-
- Segment seg;
+ Point<3> p, np;
int pi1, s1, s2;
- int lastpi, thispi;
ARRAY<Point<3> > edgepoints;
ARRAY<double> curvelength;
- int copyedge, copyfromedge, copyedgeidentification;
+ int copyedge, copyfromedge = -1, copyedgeidentification = -1;
- ARRAY<int> locsurfind;
+ ARRAY<int> locsurfind, locind;
- double len, corr, lam;
- double steplen, cursteplen, loch, hd;
+ // double len, corr, lam;
+ // double steplen, cursteplen, loch,
+ double hd;
int checkedcopy = 0;
- double size = geometry.MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
- double epspointdist2 = size * 1e-6; // globflags.GetNumFlag ("epspointdist", size * 1e-6);
- epspointdist2 = sqr (epspointdist2);
-
-
- Solid * locsol;
-
+ // double size = geometry.MaxSize();
+ // double epspointdist2 = sqr (size) * 1e-12;
+
// copy special points to work with
- for (i = 0; i < specpoints.Size(); i++)
- hsp[i] = specpoints[i];
+ for (int i = 0; i < specpoints.Size(); i++)
+ {
+ hsp[i] = i;
+ glob2hsp[i] = i;
+ }
cntedge = 0;
+ INDEX_2_HASHTABLE<int> identification_used(100); // identification i already used for startpoint j
+
while (hsp.Size())
{
@@ -89,73 +105,46 @@ namespace netgen
// (*testout) << endl;
- for (i = 1; i <= geometry.identifications.Size() && !pi1; i++)
- {
- for (j = checkedcopy+1; j <= startpoints.Size() && !pi1; j++)
- {
+ for (int i = 0; i < geometry.identifications.Size() && !pi1; i++)
+ for (int j = checkedcopy; j < startpoints.Size() && !pi1; j++)
- if (geometry.identifications.Get(i)->IdentifyableCandidate (startpoints.Get(j)))
+ if (geometry.identifications[i]->IdentifyableCandidate (specpoints[startpoints[j]]))
+
+ {
+ int pi1cand = 0;
+ double mindist = 1e10;
+ for (int k = 0; k < hsp.Size() && !pi1; k++)
{
- int pi1cand = 0;
- double mindist = 1e10;
-
- for (k = 1; k <= hsp.Size() && !pi1; k++)
+ if (identification_used.Used (INDEX_2(i, startpoints[j])) ||
+ identification_used.Used (INDEX_2(i, hsp[k]))) continue;
+
+ if (geometry.identifications[i]
+ ->Identifyable(specpoints[startpoints[j]], specpoints[hsp[k]]) ||
+ geometry.identifications[i]
+ ->Identifyable(specpoints[hsp[k]], specpoints[startpoints[j]]))
{
-#ifdef DEVELOP
- (*testout) << "check kand = " << hsp.Get(k).p
- << ", v = " << hsp.Get(k).v
- << endl;
-#endif
- if (geometry.identifications.Get(i)
- ->Identifyable(startpoints.Get(j), hsp.Get(k)) ||
- geometry.identifications.Get(i)
- ->Identifyable(hsp.Get(k), startpoints.Get(j)))
+ if (Dist (specpoints[startpoints[j]].p, specpoints[hsp[k]].p) < mindist)
{
-
-#ifdef DEVELOP
- (*testout) << "identifiable, dist = "
- << Dist (startpoints.Get(j).p, hsp.Get(k).p) << endl;
-#endif
-
- if (Dist (startpoints.Get(j).p, hsp.Get(k).p) < mindist)
- {
- mindist = Dist (startpoints.Get(j).p, hsp.Get(k).p);
- pi1cand = k;
- }
- /*
- pi1 = k;
- copyedge = 1;
- copyfromedge = j;
- copyedgeidentification = i;
-
- (*testout) << "copy edge startpoint from "
- << startpoints.Get(j).p << " - "
- << startpoints.Get(j).v
- << " to "
- << hsp.Get(k).p << " - " << hsp.Get(k).v << endl;
- */
+ mindist = Dist (specpoints[startpoints[j]].p, specpoints[hsp[k]].p);
+ pi1cand = k+1;
}
}
-
- if (pi1cand)
- {
- pi1 = pi1cand;
- copyedge = 1;
- copyfromedge = j;
- copyedgeidentification = i;
-#ifdef DEVELOP
- (*testout) << "copy edge startpoint from "
- << startpoints.Get(j).p << " - "
- << startpoints.Get(j).v
- << " to "
- << hsp.Get(pi1).p << " - " << hsp.Get(pi1).v << endl;
-#endif
- }
+ }
+
+
+ if (pi1cand)
+ {
+ pi1 = pi1cand;
+ copyedge = 1;
+ copyfromedge = j+1;
+ copyedgeidentification = i+1;
+
+ identification_used.Set (INDEX_2(i, startpoints[j]), 1);
+ identification_used.Set (INDEX_2(i, hsp.Get(pi1)), 1);
}
}
- }
-
+
// cannot copy from other ege ?
if (!pi1)
@@ -163,9 +152,12 @@ namespace netgen
// unconditional special point available ?
if (!pi1)
- for (i = 1; i <= hsp.Size() && pi1 == 0; i++)
- if (hsp.Get(i).unconditional == 1)
- pi1 = i;
+ for (int i = 1; i <= hsp.Size(); i++)
+ if (specpoints[hsp.Get(i)].unconditional == 1)
+ {
+ pi1 = i;
+ break;
+ }
if (!pi1)
@@ -174,18 +166,19 @@ namespace netgen
pi1 = 1;
}
- layer = hsp.Get(pi1).GetLayer();
+ layer = specpoints[hsp.Get(pi1)].GetLayer();
- if (!hsp.Get(pi1).unconditional)
+ if (!specpoints[hsp.Get(pi1)].unconditional)
{
- hsp.Elem(pi1).unconditional = 1;
- for (i = 1; i <= hsp.Size(); i++)
- if (i != pi1 && Dist (hsp.Get(pi1).p, hsp.Get(i).p) < 1e-8 &&
- (hsp.Get(pi1).v + hsp.Get(i).v).Length() < 1e-4)
+ specpoints[hsp.Elem(pi1)].unconditional = 1;
+ for (int i = 1; i <= hsp.Size(); i++)
+ if (i != pi1 &&
+ Dist (specpoints[hsp.Get(pi1)].p, specpoints[hsp.Get(i)].p) < 1e-8 &&
+ (specpoints[hsp.Get(pi1)].v + specpoints[hsp.Get(i)].v).Length() < 1e-4)
{
// opposite direction
- hsp.Elem(i).unconditional = 1;
+ specpoints[hsp.Elem(i)].unconditional = 1;
}
}
@@ -194,7 +187,8 @@ namespace netgen
#ifdef DEVELOP
(*testout) << "edge nr " << cntedge << endl;
- (*testout) << "start followedge: p1 = " << hsp.Get(pi1).p << ", v = " << hsp.Get(pi1).v << endl;
+ (*testout) << "start followedge: p1 = " << specpoints[hsp.Get(pi1)].p
+ << ", v = " << specpoints[hsp.Get(pi1)].v << endl;
#endif
FollowEdge (pi1, ep, pos, hsp, h, mesh,
@@ -208,6 +202,7 @@ namespace netgen
{
// ignore starting point
hsp.DeleteElement (pi1);
+ cout << "yes, this happens" << endl;
continue;
}
@@ -217,81 +212,121 @@ namespace netgen
double elen = 0;
- for (i = 1; i <= edgepoints.Size()-1; i++)
+ for (int i = 1; i <= edgepoints.Size()-1; i++)
elen += Dist (edgepoints.Get(i), edgepoints.Get(i+1));
int shortedge = 0;
- for (i = 1; i <= geometry.identifications.Size(); i++)
- if (geometry.identifications.Get(i)->ShortEdge(hsp.Get(pi1), hsp.Get(ep)))
+ for (int i = 1; i <= geometry.identifications.Size(); i++)
+ if (geometry.identifications.Get(i)->ShortEdge(specpoints[hsp.Get(pi1)], specpoints[hsp.Get(ep)]))
shortedge = 1;
- (*testout) << "shortedge = " << shortedge << endl;
+ // (*testout) << "shortedge = " << shortedge << endl;
if (!shortedge)
{
- mesh.RestrictLocalHLine (Point3d (hsp.Get(pi1).p),
- Point3d (hsp.Get(ep).p),
+ mesh.RestrictLocalHLine (Point3d (specpoints[hsp.Get(pi1)].p),
+ Point3d (specpoints[hsp.Get(ep)].p),
elen / mparam.segmentsperedge);
}
- s1 = hsp.Get(pi1).s1;
- s2 = hsp.Get(pi1).s2;
+ s1 = specpoints[hsp.Get(pi1)].s1;
+ s2 = specpoints[hsp.Get(pi1)].s2;
// delete initial, terminal and conditional points
#ifdef DEVELOP
- (*testout) << "terminal point: p = " << hsp.Get(ep).p << ", v = " << hsp.Get(ep).v << endl;
+ (*testout) << "terminal point: p = " << specpoints[hsp.Get(ep)].p
+ << ", v = " << specpoints[hsp.Get(ep)].v << endl;
#endif
+
+ searchtree -> DeleteElement (hsp.Get(ep));
+ searchtree -> DeleteElement (hsp.Get(pi1));
+
if (ep > pi1)
{
+ glob2hsp[hsp[ep-1]] = -1;
+ glob2hsp[hsp.Last()] = ep-1;
hsp.DeleteElement (ep);
+
+ glob2hsp[hsp[pi1-1]] = -1;
+ glob2hsp[hsp.Last()] = pi1-1;
hsp.DeleteElement (pi1);
}
else
{
+ glob2hsp[hsp[pi1-1]] = -1;
+ glob2hsp[hsp.Last()] = pi1-1;
hsp.DeleteElement (pi1);
+
+ glob2hsp[hsp[ep-1]] = -1;
+ glob2hsp[hsp.Last()] = ep-1;
hsp.DeleteElement (ep);
}
- for (j = 1; j <= edgepoints.Size()-1; j++)
+ for (int j = 1; j <= edgepoints.Size()-1; j++)
{
p = edgepoints.Get(j);
np = Center (p, edgepoints.Get(j+1));
- hd = Dist2 (p, np);
+ hd = Dist (p, np);
- for (i = 1; i <= hsp.Size(); i++)
- if ( hsp.Get(i).HasSurfaces (s1, s2) &&
- hsp.Get(i).unconditional == 0 &&
- Dist2 (np, hsp.Get(i).p) < 1.2 * hd)
+
+ Box<3> boxp (np - (1.2 * hd) * Vec<3> (1, 1, 1),
+ np + (1.2 * hd) * Vec<3> (1, 1, 1));
+ searchtree -> GetIntersecting (boxp.PMin(), boxp.PMax(), locind);
+
+ for (int i = 0; i < locind.Size(); i++)
+ {
+ if ( specpoints[locind[i]].HasSurfaces (s1, s2) &&
+ specpoints[locind[i]].unconditional == 0)
+ {
+ searchtree -> DeleteElement (locind[i]);
+
+ int li = glob2hsp[locind[i]];
+ glob2hsp[locind[i]] = -1;
+ glob2hsp[hsp.Last()] = li;
+ hsp.Delete (li);
+ }
+ }
+
+
+ /*
+ for (int i = 1; i <= hsp.Size(); i++)
+ if ( specpoints[hsp.Get(i)].HasSurfaces (s1, s2) &&
+ specpoints[hsp.Get(i)].unconditional == 0 &&
+ Dist2 (np, specpoints[hsp.Get(i)].p) < 1.2 * hd)
{
+ searchtree -> DeleteElement (hsp.Get(i)+1);
hsp.DeleteElement (i);
i--;
}
+ */
}
ARRAY<Segment> refedges;
- ARRAY<int> refedgesinv;
+ ARRAY<bool> refedgesinv;
AnalyzeEdge (s1, s2, pos, layer,
edgepoints,
refedges, refedgesinv);
- for (i = 1; i <= refedges.Size(); i++)
- refedges.Elem(i).edgenr = cntedge;
+ for (int i = 0; i < refedges.Size(); i++)
+ refedges[i].edgenr = cntedge;
+
+
#ifdef DEVELOP
(*testout) << "edge " << cntedge << endl
- << "startp: " << startpoints.Last().p
- << ", v = " << startpoints.Last().v << endl
- << "copy = " << copyedge << endl
+ << "startp: " << specpoints[startpoints.Last()].p
+ << ", v = " << specpoints[startpoints.Last()].v << endl
+ // << "copy = " << copyedge << endl
<< refedges.Size() << " refedges: ";
- for (i = 1; i <= refedges.Size(); i++)
+ for (int i = 1; i <= refedges.Size(); i++)
(*testout) << " " << refedges.Get(i).si;
(*testout) << endl;
(*testout) << "inv[1] = " << refedgesinv.Get(1) << endl;
@@ -299,7 +334,7 @@ namespace netgen
if (!copyedge)
{
- int oldnseg = mesh.GetNSeg();
+ // int oldnseg = mesh.GetNSeg();
if (!shortedge)
StoreEdge (refedges, refedgesinv,
@@ -310,8 +345,8 @@ namespace netgen
/*
- for (i = oldnseg+1; i <= mesh.GetNSeg(); i++)
- for (j = 1; j <= oldnseg; j++)
+ for (int i = oldnseg+1; i <= mesh.GetNSeg(); i++)
+ for (int j = 1; j <= oldnseg; j++)
{
const Point<3> & l1p1 = mesh.Point (mesh.LineSegment(i).p1);
const Point<3> & l1p2 = mesh.Point (mesh.LineSegment(i).p2);
@@ -332,8 +367,8 @@ namespace netgen
{
CopyEdge (refedges, refedgesinv,
copyfromedge,
- startpoints.Get(copyfromedge).p,
- endpoints.Get(copyfromedge).p,
+ specpoints[startpoints.Get(copyfromedge)].p,
+ specpoints[endpoints.Get(copyfromedge)].p,
edgepoints.Get(1), edgepoints.Last(),
copyedgeidentification,
layer,
@@ -345,6 +380,8 @@ namespace netgen
+
+
/*
If two or more edges share the same initial and end-points,
then they need at least two segments
@@ -352,7 +389,7 @@ namespace netgen
void EdgeCalculation ::
SplitEqualOneSegEdges (Mesh & mesh)
{
- int i, j, k;
+ // int i, j;
SegmentIndex si;
PointIndex pi;
@@ -369,10 +406,13 @@ namespace netgen
osedges.Elem(seg.edgenr)--;
}
+ // (*testout) << "osedges = " << osedges << endl;
+
// flag one segment edges
- for (i = 0; i < cntedge; i++)
+ for (int i = 0; i < cntedge; i++)
osedges[i] = (osedges[i] > 0) ? 1 : 0;
+ // (*testout) << "osedges, now = " << osedges << endl;
for (si = 0; si < mesh.GetNSeg(); si++)
{
@@ -394,9 +434,9 @@ namespace netgen
// one edge 1 segment, other 2 segments
// yes, it happens !
-
- for (i = 1; i <= osedgesht.GetNBags(); i++)
- for (j = 1; j <= osedgesht.GetBagSize(i); j++)
+ point_on_edge_problem = 0;
+ for (int i = 1; i <= osedgesht.GetNBags(); i++)
+ for (int j = 1; j <= osedgesht.GetBagSize(i); j++)
{
INDEX_2 i2;
int val;
@@ -420,9 +460,10 @@ namespace netgen
Point<3> hp = p1 + lam * v;
if (Dist (p, hp) < 1e-4 * vlen)
{
- PrintSysError ("Point on edge !!!");
- cout << "seg: " << i2 << ", p = " << k << endl;
+ PrintWarning ("Point on edge !!!");
+ cout << "seg: " << i2 << ", p = " << pi << endl;
osedgesht.Set (i2, 2);
+ point_on_edge_problem = 1;
}
}
}
@@ -453,12 +494,13 @@ namespace netgen
osedges.Elem(seg.edgenr) =
mesh.AddPoint (newp, mesh[PointIndex(seg.p1)].GetLayer());
+ meshpoint_tree -> Insert (newp, osedges.Elem(seg.edgenr));
}
}
}
- for (i = 1; i <= nseg; i++)
+ for (int i = 1; i <= nseg; i++)
{
Segment & seg = mesh.LineSegment (i);
if (seg.edgenr >= 1 && seg.edgenr <= cntedge)
@@ -479,35 +521,35 @@ namespace netgen
void EdgeCalculation ::
FollowEdge (int pi1, int & ep, int & pos,
- const ARRAY<SpecialPoint> & hsp,
+ const ARRAY<int> & hsp,
double h, const Mesh & mesh,
ARRAY<Point<3> > & edgepoints,
ARRAY<double> & curvelength)
{
- int i, j, s1, s2;
+ int s1, s2;
double len, steplen, cursteplen, loch;
Point<3> p, np, pnp;
Vec<3> a1, a2, t;
+ ARRAY<int> locind;
- double size = geometry.MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
- double epspointdist2 = size * 1e-6; // globflags.GetNumFlag ("epspointdist", size * 1e-6);
+ double size = geometry.MaxSize();
+ double epspointdist2 = size * 1e-6;
epspointdist2 = sqr (epspointdist2);
int uselocalh = mparam.uselocalh;
-
- s1 = hsp.Get(pi1).s1;
- s2 = hsp.Get(pi1).s2;
+ s1 = specpoints[hsp.Get(pi1)].s1;
+ s2 = specpoints[hsp.Get(pi1)].s2;
- p = hsp.Get(pi1).p;
+ p = specpoints[hsp.Get(pi1)].p;
geometry.GetSurface(s1) -> CalcGradient (p, a1);
geometry.GetSurface(s2) -> CalcGradient (p, a2);
t = Cross (a1, a2);
t.Normalize();
- pos = (hsp.Get(pi1).v * t) > 0;
+ pos = (specpoints[hsp.Get(pi1)].v * t) > 0;
if (!pos) t *= -1;
@@ -534,7 +576,7 @@ namespace netgen
if (multithread.terminate)
return;
- if (fabs (p(0)) + fabs (p(1)) + fabs (p(2)) > 10000)
+ if (fabs (p(0)) + fabs (p(1)) + fabs (p(2)) > 100000)
{
ep = 0;
PrintWarning ("Give up line");
@@ -559,15 +601,6 @@ namespace netgen
np = pnp;
-
-#ifdef MYGRAPH
- if (silentflag <= 2)
- {
- MyLine3D (p, np, rot);
- MyDraw ();
- }
-#endif
-
ep = 0;
double hvtmin = 1.5 * cursteplen;
@@ -575,19 +608,68 @@ namespace netgen
Box<3> boxp (p - (2 * cursteplen) * Vec<3> (1, 1, 1),
p + (2 * cursteplen) * Vec<3> (1, 1, 1));
- for (i = 1; i <= hsp.Size(); i++)
- // if ( i != pi1 && hsp[i].HasSurfaces (s1, s2) )
+ searchtree -> GetIntersecting (boxp.PMin(), boxp.PMax(), locind);
+
+ for (int i = 0; i < locind.Size(); i++)
{
- if (!boxp.IsIn (hsp.Get(i).p))
+ Vec<3> hv = specpoints[locind[i]].p - p;
+ if (hv.Length2() > 9 * cursteplen * cursteplen)
continue;
+
+ double hvt = hv * t;
+ hv -= hvt * t;
- Vec<3> hv = hsp.Get(i).p - p;
+ if (hv.Length() < 0.2 * cursteplen &&
+ hvt > 0 &&
+ // hvt < 1.5 * cursteplen &&
+ hvt < hvtmin &&
+ specpoints[locind[i]].unconditional == 1 &&
+ (specpoints[locind[i]].v + t).Length() < 0.4 )
+ {
+ Point<3> hep = specpoints[locind[i]].p;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), hep);
+
+
+ if (Dist2 (hep, specpoints[locind[i]].p) < epspointdist2 )
+ {
+ geometry.GetSurface(s1) -> CalcGradient (hep, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hep, a2);
+ Vec<3> ept = Cross (a1, a2);
+ ept /= ept.Length();
+ if (!pos) ept *= -1;
+
+ if ( (specpoints[locind[i]].v + ept).Length() < 1e-4 )
+ {
+ np = specpoints[locind[i]].p;
+
+ for (int jj = 0; jj < hsp.Size(); jj++)
+ if (hsp[jj] == locind[i])
+ ep = jj+1;
+
+ if (!ep)
+ cerr << "endpoint not found" << endl;
+ // ep = i;
+ hvtmin = hvt;
+ // break;
+ }
+ }
+ }
+ }
+
+
+
+
+ /*
+ for (int i = 1; i <= hsp.Size(); i++)
+ {
+ if (!boxp.IsIn (specpoints[hsp.Get(i)].p))
+ continue;
+
+ Vec<3> hv = specpoints[hsp.Get(i)].p - p;
if (hv.Length2() > 9 * cursteplen * cursteplen)
continue;
- /*
- if (!hsp.Get(i).HasSurfaces (s1, s2))
- continue; // test for dalibor-problem
- */
+
double hvt = hv * t;
hv -= hvt * t;
@@ -595,15 +677,15 @@ namespace netgen
hvt > 0 &&
// hvt < 1.5 * cursteplen &&
hvt < hvtmin &&
- hsp.Get(i).unconditional == 1 &&
- (hsp.Get(i).v + t).Length() < 0.4 )
+ specpoints[hsp.Get(i)].unconditional == 1 &&
+ (specpoints[hsp.Get(i)].v + t).Length() < 0.4 )
{
- Point<3> hep = hsp.Get(i).p;
+ Point<3> hep = specpoints[hsp.Get(i)].p;
ProjectToEdge (geometry.GetSurface(s1),
geometry.GetSurface(s2), hep);
- if (Dist2 (hep, hsp.Get(i).p) < epspointdist2 )
+ if (Dist2 (hep, specpoints[hsp.Get(i)].p) < epspointdist2 )
{
geometry.GetSurface(s1) -> CalcGradient (hep, a1);
geometry.GetSurface(s2) -> CalcGradient (hep, a2);
@@ -611,9 +693,9 @@ namespace netgen
ept /= ept.Length();
if (!pos) ept *= -1;
- if ( (hsp.Get(i).v + ept).Length() < 1e-4 )
+ if ( (specpoints[hsp.Get(i)].v + ept).Length() < 1e-4 )
{
- np = hsp.Get(i).p;
+ np = specpoints[hsp.Get(i)].p;
ep = i;
hvtmin = hvt;
// break;
@@ -621,6 +703,7 @@ namespace netgen
}
}
}
+ */
loch = min2 (geometry.GetSurface(s1) -> LocH (np, 3, 1, h),
geometry.GetSurface(s2) -> LocH (np, 3, 1, h));
@@ -658,7 +741,7 @@ namespace netgen
AnalyzeEdge (int s1, int s2, int pos, int layer,
const ARRAY<Point<3> > & edgepoints,
ARRAY<Segment> & refedges,
- ARRAY<int> & refedgesinv)
+ ARRAY<bool> & refedgesinv)
{
int i, j, k, l;
int hi;
@@ -681,21 +764,24 @@ namespace netgen
(*testout) << "Analyze edge: " << pi1 << " - " << pi2 << ", pts = " << edgepoints.Size() << endl;
(*testout) << "p1 = " << edgepoints.Get(1) << " pl = " << edgepoints.Last() << endl;
*/
- int debug = 0;
+ bool debug = 0;
/*
- Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Get(1)) < 1e-6 ||
- Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Last()) < 1e-6;
+ Dist2 (Point<3> (1.824, -0.104, -0.95), edgepoints.Get(1)) < 1e-6 ||
+ Dist2 (Point<3> (1.824, -0.104, -0.95), edgepoints.Last()) < 1e-6 ||
+ Dist2 (Point<3> (1.72149, -0.26069, -0.95), edgepoints.Get(1)) < 1e-6 ||
+ Dist2 (Point<3> (1.72149, -0.26069, -0.95), edgepoints.Last()) < 1e-6;
*/
if (debug)
{
- // (*testout) << "tubious edge !!!" << endl;
+ (*testout) << "tubious edge !!!" << endl;
+ (*testout) << "edgepoints = " << edgepoints << endl;
(*testout) << "s1, s2 = " << s1 << " - " << s2 << endl;
}
refedges.SetSize(0);
refedgesinv.SetSize(0);
- hp = Center (edgepoints.Get(1), edgepoints.Get(2));
+ hp = Center (edgepoints[0], edgepoints[1]);
ProjectToEdge (geometry.GetSurface(s1), geometry.GetSurface(s2), hp);
geometry.GetSurface(s1) -> CalcGradient (hp, a1);
@@ -704,12 +790,8 @@ namespace netgen
t.Normalize();
if (!pos) t *= -1;
- (*testout) << "t = " << t << endl;
-
for (i = 0; i < geometry.GetNTopLevelObjects(); i++)
{
- (*testout) << "layer = " << layer
- << ", tlo-layer = " << geometry.GetTopLevelObject(i)->GetLayer() << endl;
if (geometry.GetTopLevelObject(i)->GetLayer() != layer)
continue;
@@ -717,6 +799,7 @@ namespace netgen
const Surface * surf = geometry.GetTopLevelObject(i)->GetSurface();
sol -> TangentialSolid (hp, locsol);
+
if (!locsol) continue;
BoxSphere<3> boxp (hp, hp);
@@ -730,7 +813,6 @@ namespace netgen
locsol -> CalcSurfaceInverse ();
-
if (!surf)
{
locsol -> GetSurfaceIndices (locsurfind);
@@ -762,7 +844,7 @@ namespace netgen
for (j = locsurfind.Size()-1; j >= 0; j--)
if (fabs (geometry.GetSurface(locsurfind[j])
->CalcFunctionValue (hp) ) > 1e-6)
- locsurfind.DeleteElement(j+1);
+ locsurfind.Delete(j);
if (debug)
(*testout) << locsurfind.Size() << " faces on hp" << endl;
@@ -775,7 +857,7 @@ namespace netgen
Vec<3> rn;
// n is outer normal to solid
- geometry.GetSurface(lsi) -> GetNormalVector (hp, n);
+ n = geometry.GetSurface(lsi) -> GetNormalVector (hp);
if (geometry.GetSurface (lsi)->Inverse())
n *= -1;
@@ -788,13 +870,15 @@ namespace netgen
}
// rn is normal to class representant
- geometry.GetSurface(rlsi) -> GetNormalVector (hp, rn);
-
+ rn = geometry.GetSurface(rlsi) -> GetNormalVector (hp);
+
int sameasref = ((n * rn) > 0);
m = Cross (t, rn);
m.Normalize();
+ if (debug)
+ (*testout) << "m = " << m << endl;
for (k = 1; k <= 2; k ++)
{
@@ -802,8 +886,8 @@ namespace netgen
if (debug)
{
- (*testout) << "onface(" << hp << ", " << m << ")= "
- << locsol->OnFace (hp, m);
+ (*testout) << "onface(" << hp << ", " << m << ")= " << flush;
+ (*testout) << locsol->OnFace (hp, m) << flush;
(*testout) << " vec2in = "
<< locsol -> VectorIn2 (hp, m, n) << " and "
<< locsol -> VectorIn2 (hp, m, -1 * n) << endl;
@@ -813,6 +897,8 @@ namespace netgen
if (locsol -> VectorIn2 (hp, m, n) == 0 &&
locsol -> VectorIn2 (hp, m, -1 * n) == 1)
{
+ if (debug)
+ (*testout) << "is true" << endl;
hi = 0;
for (l = 1; l <= refedges.Size(); l++)
{
@@ -854,6 +940,11 @@ namespace netgen
<< ", refedgenr = " << hi
<< endl;
}
+ else
+ {
+ if (debug)
+ (*testout) << "is false" << endl;
+ }
m *= -1;
}
}
@@ -865,7 +956,7 @@ namespace netgen
void EdgeCalculation ::
StoreEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
const ARRAY<Point<3> > & edgepoints,
const ARRAY<double> & curvelength,
int layer,
@@ -897,6 +988,8 @@ namespace netgen
// generate initial point
p = edgepoints.Get(1);
lastpi = -1;
+
+ /*
for (pi = PointIndex::BASE;
pi < mesh.GetNP()+PointIndex::BASE; pi++)
if (Dist (mesh[pi], p) < 1e-6)
@@ -904,10 +997,20 @@ namespace netgen
lastpi = pi;
break;
}
+ */
+ ARRAY<int> locsearch;
+ meshpoint_tree -> GetIntersecting (p-Vec<3> (1e-6, 1e-6, 1e-6),
+ p+Vec<3> (1e-6, 1e-6, 1e-6), locsearch);
+ if (locsearch.Size())
+ lastpi = locsearch[0];
+
- if (lastpi == -1)
- lastpi = mesh.AddPoint (p, layer);
+ if (lastpi == -1)
+ {
+ lastpi = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, lastpi);
+ }
j = 1;
for (i = 1; i <= ne; i++)
@@ -924,15 +1027,25 @@ namespace netgen
thispi = -1;
if (i == ne)
+ {
+ /*
for (pi = PointIndex::BASE;
pi < mesh.GetNP()+PointIndex::BASE; pi++)
if (Dist(mesh[pi], np) < 1e-6)
thispi = pi;
-
+ */
+
+ meshpoint_tree -> GetIntersecting (np-Vec<3> (1e-6, 1e-6, 1e-6),
+ np+Vec<3> (1e-6, 1e-6, 1e-6), locsearch);
+ if (locsearch.Size())
+ thispi = locsearch[0];
+ }
+
if (thispi == -1)
{
ProjectToEdge (surf1, surf2, np);
thispi = mesh.AddPoint (np, layer);
+ meshpoint_tree -> Insert (np, thispi);
}
for (k = 1; k <= refedges.Size(); k++)
@@ -1005,7 +1118,7 @@ namespace netgen
void EdgeCalculation ::
StoreShortEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
const ARRAY<Point<3> > & edgepoints,
const ARRAY<double> & curvelength,
int layer,
@@ -1013,9 +1126,8 @@ namespace netgen
{
// Calculate optimal element-length
- int i, j, k;
PointIndex pi;
- int ne;
+ // int ne;
Segment seg;
/*
@@ -1048,7 +1160,11 @@ namespace netgen
break;
}
- if (pi1 == -1) pi1 = mesh.AddPoint (p, layer);
+ if (pi1 == -1)
+ {
+ pi1 = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, pi1);
+ }
p = edgepoints.Last();
PointIndex pi2 = -1;
@@ -1060,7 +1176,11 @@ namespace netgen
pi2 = pi;
break;
}
- if (pi2==-1) pi2 = mesh.AddPoint (p, layer);
+ if (pi2==-1)
+ {
+ pi2 = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, pi2);
+ }
/*
@@ -1090,7 +1210,7 @@ namespace netgen
}
*/
- for (k = 1; k <= refedges.Size(); k++)
+ for (int k = 1; k <= refedges.Size(); k++)
{
if (refedgesinv.Get(k))
{
@@ -1125,7 +1245,7 @@ namespace netgen
void EdgeCalculation ::
CopyEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
int copyfromedge,
const Point<3> & fromstart, const Point<3> & fromend,
const Point<3> & tostart, const Point<3> & toend,
@@ -1133,11 +1253,11 @@ namespace netgen
int layer,
Mesh & mesh)
{
- int i, j, k;
+ int k;
PointIndex pi;
// copy start and end points
- for (i = 1; i <= 2; i++)
+ for (int i = 1; i <= 2; i++)
{
Point<3> fromp =
(i == 1) ? fromstart : fromend;
@@ -1156,7 +1276,10 @@ namespace netgen
}
if (topi == -1)
- topi = mesh.AddPoint (top, layer);
+ {
+ topi = mesh.AddPoint (top, layer);
+ meshpoint_tree -> Insert (top, topi);
+ }
const Identification & csi =
(*geometry.identifications.Get(copyedgeidentification));
@@ -1180,7 +1303,7 @@ namespace netgen
}
int oldns = mesh.GetNSeg();
- for (i = 1; i <= oldns; i++)
+ for (int i = 1; i <= oldns; i++)
{
// real copy, since array might be reallocated !!
const Segment oldseg = mesh.LineSegment(i);
@@ -1201,7 +1324,7 @@ namespace netgen
for (k = 1; k <= refedges.Size(); k++)
{
- int inv = refedgesinv.Get(k);
+ bool inv = refedgesinv.Get(k);
// other edge is inverse
if (oldseg.seginfo == 1)
@@ -1305,7 +1428,7 @@ namespace netgen
{
const Surface * s = geometry.GetSurface(i);
p1 = s -> GetSurfacePoint();
- s -> GetNormalVector (p1, nv);
+ nv = s -> GetNormalVector (p1);
double hloc =
min2 (s->LocH (p1, 3, 1, h), mesh.GetH(p1));
@@ -1328,6 +1451,8 @@ namespace netgen
seg1.surfnr1 = i;
seg2.surfnr1 = i;
+ seg1.surfnr2 = i;
+ seg2.surfnr2 = i;
for (j = 0; j < nsol; j++)
{
diff --git a/Netgen/libsrc/csg/edgeflw.hpp b/Netgen/libsrc/csg/edgeflw.hpp
index 175d2f164d..beb1f690a9 100644
--- a/Netgen/libsrc/csg/edgeflw.hpp
+++ b/Netgen/libsrc/csg/edgeflw.hpp
@@ -31,21 +31,26 @@ extern void CalcEdges (const CSGeometry & geometry,
class EdgeCalculation
{
const CSGeometry & geometry;
- const ARRAY<SpecialPoint> & specpoints;
+ ARRAY<SpecialPoint> & specpoints;
+ Point3dTree * searchtree;
+ Point3dTree * meshpoint_tree;
int cntedge;
public:
EdgeCalculation (const CSGeometry & ageometry,
- const ARRAY<SpecialPoint> & aspecpoints);
+ ARRAY<SpecialPoint> & aspecpoints);
+
+ ~EdgeCalculation();
void Calc(double h, Mesh & mesh);
private:
void CalcEdges1 (double h, Mesh & mesh);
-
+
void FollowEdge (int pi1, int & ep, int & pos,
- const ARRAY<SpecialPoint> & hsp,
+ // const ARRAY<SpecialPoint> & hsp,
+ const ARRAY<int> & hsp,
double h, const Mesh & mesh,
ARRAY<Point<3> > & edgepoints,
ARRAY<double> & curvelength);
@@ -54,24 +59,24 @@ private:
void AnalyzeEdge (int s1, int s2, int pos, int layer,
const ARRAY<Point<3> > & edgepoints,
ARRAY<Segment> & refedges,
- ARRAY<int> & refedgesinv);
+ ARRAY<bool> & refedgesinv);
void StoreEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
const ARRAY<Point<3> > & edgepoints,
const ARRAY<double> & curvelength,
int layer,
Mesh & mesh);
void StoreShortEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
const ARRAY<Point<3> > & edgepoints,
const ARRAY<double> & curvelength,
int layer,
Mesh & mesh);
void CopyEdge (const ARRAY<Segment> & refedges,
- const ARRAY<int> & refedgesinv,
+ const ARRAY<bool> & refedgesinv,
int copyfromedge,
const Point<3> & fromstart, const Point<3> & fromend,
const Point<3> & tostart, const Point<3> & toend,
@@ -83,6 +88,10 @@ private:
void SplitEqualOneSegEdges (Mesh & mesh);
void FindClosedSurfaces (double h, Mesh & mesh);
+
+public:
+ bool point_on_edge_problem;
+
};
diff --git a/Netgen/libsrc/csg/edgeflw2.cpp b/Netgen/libsrc/csg/edgeflw2.cpp
new file mode 100644
index 0000000000..87239c05bb
--- /dev/null
+++ b/Netgen/libsrc/csg/edgeflw2.cpp
@@ -0,0 +1,1404 @@
+#include <mystdlib.h>
+#include <meshing.hpp>
+#include <csg.hpp>
+
+#undef DEVELOP
+
+namespace netgen
+{
+
+ EdgeCalculation ::
+ EdgeCalculation (const CSGeometry & ageometry,
+ const ARRAY<SpecialPoint> & aspecpoints)
+ : geometry(ageometry), specpoints(aspecpoints)
+ {
+ ;
+ }
+
+
+
+ void EdgeCalculation :: Calc(double h, Mesh & mesh)
+ {
+ PrintMessage (1, "Find edges");
+ PushStatus ("Find edges");
+
+ CalcEdges1 (h, mesh);
+ SplitEqualOneSegEdges (mesh);
+ FindClosedSurfaces (h, mesh);
+ PrintMessage (3, cntedge, " edges found");
+
+ PopStatus ();
+ }
+
+
+
+
+ void EdgeCalculation :: CalcEdges1 (double h, Mesh & mesh)
+ {
+ ARRAY<SpecialPoint> hsp(specpoints.Size());
+ ARRAY<SpecialPoint> startpoints, endpoints;
+
+ int i, j, k, l, hi, pos, ep, ne;
+ int layer;
+
+ Vec<3> a1, a2, t, n, m;
+ Point<3> p, np, pnp, hp;
+
+ Segment seg;
+ int pi1, s1, s2;
+ int lastpi, thispi;
+
+ ARRAY<Point<3> > edgepoints;
+ ARRAY<double> curvelength;
+ int copyedge, copyfromedge, copyedgeidentification;
+
+ ARRAY<int> locsurfind;
+
+ double len, corr, lam;
+ double steplen, cursteplen, loch, hd;
+
+ int checkedcopy = 0;
+
+ double size = geometry.MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
+ double epspointdist2 = size * 1e-6; // globflags.GetNumFlag ("epspointdist", size * 1e-6);
+ epspointdist2 = sqr (epspointdist2);
+
+
+ Solid * locsol;
+
+
+ // copy special points to work with
+ for (i = 0; i < specpoints.Size(); i++)
+ hsp[i] = specpoints[i];
+
+
+ cntedge = 0;
+
+ while (hsp.Size())
+ {
+ SetThreadPercent(100 - 100 * double (hsp.Size()) / specpoints.Size());
+
+ edgepoints.SetSize (0);
+ curvelength.SetSize (0);
+
+
+ pi1 = 0;
+ copyedge = 0;
+ // identifyable point available ?
+
+ // (*testout) << endl;
+
+ for (i = 1; i <= geometry.identifications.Size() && !pi1; i++)
+ {
+ for (j = checkedcopy+1; j <= startpoints.Size() && !pi1; j++)
+ {
+
+ if (geometry.identifications.Get(i)->IdentifyableCandidate (startpoints.Get(j)))
+
+ {
+ int pi1cand = 0;
+ double mindist = 1e10;
+
+ for (k = 1; k <= hsp.Size() && !pi1; k++)
+ {
+#ifdef DEVELOP
+ (*testout) << "check kand = " << hsp.Get(k).p
+ << ", v = " << hsp.Get(k).v
+ << endl;
+#endif
+ if (geometry.identifications.Get(i)
+ ->Identifyable(startpoints.Get(j), hsp.Get(k)) ||
+ geometry.identifications.Get(i)
+ ->Identifyable(hsp.Get(k), startpoints.Get(j)))
+ {
+
+#ifdef DEVELOP
+ (*testout) << "identifiable, dist = "
+ << Dist (startpoints.Get(j).p, hsp.Get(k).p) << endl;
+#endif
+
+ if (Dist (startpoints.Get(j).p, hsp.Get(k).p) < mindist)
+ {
+ mindist = Dist (startpoints.Get(j).p, hsp.Get(k).p);
+ pi1cand = k;
+ }
+ /*
+ pi1 = k;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << hsp.Get(k).p << " - " << hsp.Get(k).v << endl;
+ */
+ }
+ }
+
+ if (pi1cand)
+ {
+ pi1 = pi1cand;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+#ifdef DEVELOP
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << hsp.Get(pi1).p << " - " << hsp.Get(pi1).v << endl;
+#endif
+ }
+ }
+ }
+ }
+
+
+ // cannot copy from other ege ?
+ if (!pi1)
+ checkedcopy = startpoints.Size();
+
+ // unconditional special point available ?
+ if (!pi1)
+ for (i = 1; i <= hsp.Size() && pi1 == 0; i++)
+ if (hsp.Get(i).unconditional == 1)
+ pi1 = i;
+
+
+ if (!pi1)
+ {
+ // only unconditional points available, choose first
+ pi1 = 1;
+ }
+
+ layer = hsp.Get(pi1).GetLayer();
+
+
+ if (!hsp.Get(pi1).unconditional)
+ {
+ hsp.Elem(pi1).unconditional = 1;
+ for (i = 1; i <= hsp.Size(); i++)
+ if (i != pi1 && Dist (hsp.Get(pi1).p, hsp.Get(i).p) < 1e-8 &&
+ (hsp.Get(pi1).v + hsp.Get(i).v).Length() < 1e-4)
+ {
+ // opposite direction
+ hsp.Elem(i).unconditional = 1;
+ }
+ }
+
+ cntedge++;
+ startpoints.Append (hsp.Get(pi1));
+
+#ifdef DEVELOP
+ (*testout) << "edge nr " << cntedge << endl;
+ (*testout) << "start followedge: p1 = " << hsp.Get(pi1).p << ", v = " << hsp.Get(pi1).v << endl;
+#endif
+
+ FollowEdge (pi1, ep, pos, hsp, h, mesh,
+ edgepoints, curvelength);
+
+
+ if (multithread.terminate)
+ return;
+
+ if (!ep)
+ {
+ // ignore starting point
+ hsp.DeleteElement (pi1);
+ continue;
+ }
+
+
+
+ endpoints.Append (hsp.Get(ep));
+
+
+ double elen = 0;
+ for (i = 1; i <= edgepoints.Size()-1; i++)
+ elen += Dist (edgepoints.Get(i), edgepoints.Get(i+1));
+
+
+ int shortedge = 0;
+ for (i = 1; i <= geometry.identifications.Size(); i++)
+ if (geometry.identifications.Get(i)->ShortEdge(hsp.Get(pi1), hsp.Get(ep)))
+ shortedge = 1;
+ (*testout) << "shortedge = " << shortedge << endl;
+
+
+ if (!shortedge)
+ {
+ mesh.RestrictLocalHLine (Point3d (hsp.Get(pi1).p),
+ Point3d (hsp.Get(ep).p),
+ elen / mparam.segmentsperedge);
+ }
+
+ s1 = hsp.Get(pi1).s1;
+ s2 = hsp.Get(pi1).s2;
+
+
+ // delete initial, terminal and conditional points
+
+#ifdef DEVELOP
+ (*testout) << "terminal point: p = " << hsp.Get(ep).p << ", v = " << hsp.Get(ep).v << endl;
+#endif
+ if (ep > pi1)
+ {
+ hsp.DeleteElement (ep);
+ hsp.DeleteElement (pi1);
+ }
+ else
+ {
+ hsp.DeleteElement (pi1);
+ hsp.DeleteElement (ep);
+ }
+
+
+ for (j = 1; j <= edgepoints.Size()-1; j++)
+ {
+ p = edgepoints.Get(j);
+ np = Center (p, edgepoints.Get(j+1));
+ hd = Dist2 (p, np);
+
+ for (i = 1; i <= hsp.Size(); i++)
+ if ( hsp.Get(i).HasSurfaces (s1, s2) &&
+ hsp.Get(i).unconditional == 0 &&
+ Dist2 (np, hsp.Get(i).p) < 1.2 * hd)
+ {
+ hsp.DeleteElement (i);
+ i--;
+ }
+ }
+
+
+ ARRAY<Segment> refedges;
+ ARRAY<int> refedgesinv;
+
+
+ AnalyzeEdge (s1, s2, pos, layer,
+ edgepoints,
+ refedges, refedgesinv);
+
+ for (i = 1; i <= refedges.Size(); i++)
+ refedges.Elem(i).edgenr = cntedge;
+
+
+#ifdef DEVELOP
+ (*testout) << "edge " << cntedge << endl
+ << "startp: " << startpoints.Last().p
+ << ", v = " << startpoints.Last().v << endl
+ << "copy = " << copyedge << endl
+ << refedges.Size() << " refedges: ";
+ for (i = 1; i <= refedges.Size(); i++)
+ (*testout) << " " << refedges.Get(i).si;
+ (*testout) << endl;
+ (*testout) << "inv[1] = " << refedgesinv.Get(1) << endl;
+#endif
+
+ if (!copyedge)
+ {
+ int oldnseg = mesh.GetNSeg();
+
+ if (!shortedge)
+ StoreEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+ else
+ StoreShortEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+
+
+ /*
+ for (i = oldnseg+1; i <= mesh.GetNSeg(); i++)
+ for (j = 1; j <= oldnseg; j++)
+ {
+ const Point<3> & l1p1 = mesh.Point (mesh.LineSegment(i).p1);
+ const Point<3> & l1p2 = mesh.Point (mesh.LineSegment(i).p2);
+ const Point<3> & l2p1 = mesh.Point (mesh.LineSegment(j).p1);
+ const Point<3> & l2p2 = mesh.Point (mesh.LineSegment(j).p2);
+ Vec<3> vl1(l1p1, l1p2);
+ for (double lamk = 0; lamk <= 1; lamk += 0.1)
+ {
+ Point<3> l2p = l1p1 + lamk * vl1;
+ double dist = sqrt (MinDistLP2 (l2p1, l2p2, l2p));
+ if (dist > 1e-12)
+ mesh.RestrictLocalH (l2p, 3*dist);
+ }
+ }
+ */
+ }
+ else
+ {
+ CopyEdge (refedges, refedgesinv,
+ copyfromedge,
+ startpoints.Get(copyfromedge).p,
+ endpoints.Get(copyfromedge).p,
+ edgepoints.Get(1), edgepoints.Last(),
+ copyedgeidentification,
+ layer,
+ mesh);
+ }
+
+ }
+ }
+
+
+
+ /*
+ If two or more edges share the same initial and end-points,
+ then they need at least two segments
+ */
+ void EdgeCalculation ::
+ SplitEqualOneSegEdges (Mesh & mesh)
+ {
+ int i, j;
+ SegmentIndex si;
+ PointIndex pi;
+
+ ARRAY<int> osedges(cntedge);
+ INDEX_2_HASHTABLE<int> osedgesht (cntedge+1);
+
+ osedges = 2;
+
+ // count segments on edges
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ osedges.Elem(seg.edgenr)--;
+ }
+
+ (*testout) << "osedges = " << osedges << endl;
+
+ // flag one segment edges
+ for (i = 0; i < cntedge; i++)
+ osedges[i] = (osedges[i] > 0) ? 1 : 0;
+
+ (*testout) << "osedges, now = " << osedges << endl;
+
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr))
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2))
+ osedgesht.Set (i2, 2);
+ else
+ osedgesht.Set (i2, 1);
+ }
+ }
+ }
+
+
+ // one edge 1 segment, other 2 segments
+ // yes, it happens !
+
+ for (i = 1; i <= osedgesht.GetNBags(); i++)
+ for (j = 1; j <= osedgesht.GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int val;
+ osedgesht.GetData (i, j, i2, val);
+
+ const Point<3> & p1 = mesh[PointIndex(i2.I1())];
+ const Point<3> & p2 = mesh[PointIndex(i2.I2())];
+ Vec<3> v = p2 - p1;
+ double vlen = v.Length();
+ v /= vlen;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (pi != i2.I1() && pi != i2.I2())
+ {
+ const Point<3> & p = mesh[pi];
+ Vec<3> v2 = p - p1;
+ double lam = (v2 * v);
+ if (lam > 0 && lam < vlen)
+ {
+ Point<3> hp = p1 + lam * v;
+ if (Dist (p, hp) < 1e-4 * vlen)
+ {
+ PrintSysError ("Point on edge !!!");
+ cout << "seg: " << i2 << ", p = " << pi << endl;
+ osedgesht.Set (i2, 2);
+ }
+ }
+ }
+ }
+
+
+ // insert new points
+ osedges = -1;
+
+ int nseg = mesh.GetNSeg();
+ for (si = 0; si < nseg; si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2) &&
+ osedgesht.Get (i2) == 2 &&
+ osedges.Elem(seg.edgenr) == -1)
+ {
+ Point<3> newp = Center (mesh[PointIndex(seg.p1)],
+ mesh[PointIndex(seg.p2)]);
+
+ ProjectToEdge (geometry.GetSurface(seg.surfnr1),
+ geometry.GetSurface(seg.surfnr2),
+ newp);
+
+ osedges.Elem(seg.edgenr) =
+ mesh.AddPoint (newp, mesh[PointIndex(seg.p1)].GetLayer());
+ }
+ }
+ }
+
+
+ for (i = 1; i <= nseg; i++)
+ {
+ Segment & seg = mesh.LineSegment (i);
+ if (seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr) != -1)
+ {
+ Segment newseg = seg;
+ newseg.p1 = osedges.Get(seg.edgenr);
+ seg.p2 = osedges.Get(seg.edgenr);
+ mesh.AddSegment (newseg);
+ }
+ }
+ }
+
+ }
+
+
+
+ void EdgeCalculation ::
+ FollowEdge (int pi1, int & ep, int & pos,
+ const ARRAY<SpecialPoint> & hsp,
+ double h, const Mesh & mesh,
+ ARRAY<Point<3> > & edgepoints,
+ ARRAY<double> & curvelength)
+ {
+ int i, j, s1, s2;
+ double len, steplen, cursteplen, loch;
+ Point<3> p, np, pnp;
+ Vec<3> a1, a2, t;
+
+
+ double size = geometry.MaxSize();
+ double epspointdist2 = size * 1e-6;
+ epspointdist2 = sqr (epspointdist2);
+ int uselocalh = mparam.uselocalh;
+
+
+ s1 = hsp.Get(pi1).s1;
+ s2 = hsp.Get(pi1).s2;
+
+ p = hsp.Get(pi1).p;
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+
+ t = Cross (a1, a2);
+ t.Normalize();
+
+ pos = (hsp.Get(pi1).v * t) > 0;
+ if (!pos) t *= -1;
+
+
+ edgepoints.Append (p);
+ curvelength.Append (0);
+ len = 0;
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (p, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (p, 3, 1, h));
+
+
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(p);
+ if (lh < loch)
+ loch = lh;
+ }
+
+ steplen = 0.1 * loch;
+
+ do
+ {
+ if (multithread.terminate)
+ return;
+
+ if (fabs (p(0)) + fabs (p(1)) + fabs (p(2)) > 10000)
+ {
+ ep = 0;
+ PrintWarning ("Give up line");
+ break;
+ }
+
+ if (steplen > 0.1 * loch) steplen = 0.1 * loch;
+
+ steplen *= 2;
+ do
+ {
+ steplen *= 0.5;
+ np = p + steplen * t;
+ pnp = np;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), pnp);
+ }
+ while (Dist (np, pnp) > 0.1 * steplen);
+
+ cursteplen = steplen;
+ if (Dist (np, pnp) < 0.01 * steplen) steplen *= 2;
+
+
+ np = pnp;
+
+#ifdef MYGRAPH
+ if (silentflag <= 2)
+ {
+ MyLine3D (p, np, rot);
+ MyDraw ();
+ }
+#endif
+
+ ep = 0;
+
+ double hvtmin = 1.5 * cursteplen;
+
+ Box<3> boxp (p - (2 * cursteplen) * Vec<3> (1, 1, 1),
+ p + (2 * cursteplen) * Vec<3> (1, 1, 1));
+
+ for (i = 1; i <= hsp.Size(); i++)
+ // if ( i != pi1 && hsp.Get(i).HasSurfaces (s1, s2) )
+ {
+ if (!boxp.IsIn (hsp.Get(i).p))
+ continue;
+
+ Vec<3> hv = hsp.Get(i).p - p;
+ if (hv.Length2() > 9 * cursteplen * cursteplen)
+ continue;
+
+ /*
+ if (!hsp.Get(i).HasSurfaces (s1, s2))
+ continue; // test for dalibor-problem
+ */
+
+ double hvt = hv * t;
+ hv -= hvt * t;
+
+ if (hv.Length() < 0.2 * cursteplen &&
+ hvt > 0 &&
+ // hvt < 1.5 * cursteplen &&
+ hvt < hvtmin &&
+ hsp.Get(i).unconditional == 1 &&
+ (hsp.Get(i).v + t).Length() < 0.4 )
+ {
+ Point<3> hep = hsp.Get(i).p;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), hep);
+
+
+ if (Dist2 (hep, hsp.Get(i).p) < epspointdist2 )
+ {
+ geometry.GetSurface(s1) -> CalcGradient (hep, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hep, a2);
+ Vec<3> ept = Cross (a1, a2);
+ ept /= ept.Length();
+ if (!pos) ept *= -1;
+
+ if ( (hsp.Get(i).v + ept).Length() < 1e-4 )
+ {
+ np = hsp.Get(i).p;
+ ep = i;
+ hvtmin = hvt;
+ // break;
+ }
+ }
+ }
+ }
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (np, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (np, 3, 1, h));
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(np);
+ if (lh < loch)
+ loch = lh;
+ }
+
+
+ len += Dist (p, np) / loch;
+ edgepoints.Append (np);
+ curvelength.Append (len);
+
+ p = np;
+
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+ }
+ while (! ep);
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ AnalyzeEdge (int s1, int s2, int pos, int layer,
+ const ARRAY<Point<3> > & edgepoints,
+ ARRAY<Segment> & refedges,
+ ARRAY<int> & refedgesinv)
+ {
+ int i, j, k, l;
+ int hi;
+ Point<3> hp;
+ Vec<3> t, a1, a2, m, n;
+ Segment seg;
+ Solid * locsol;
+ ARRAY<int> locsurfind;
+
+ /*
+ int pi1 = 0, pi2 = 0;
+ extern Mesh * mesh;
+ for (i = 1; i <= mesh->GetNP(); i++)
+ {
+ if (Dist2 (edgepoints.Get(1), mesh->Point(i)) < 1e-12)
+ pi1 = i;
+ if (Dist2 (edgepoints.Last(), mesh->Point(i)) < 1e-12)
+ pi2 = i;
+ }
+ (*testout) << "Analyze edge: " << pi1 << " - " << pi2 << ", pts = " << edgepoints.Size() << endl;
+ (*testout) << "p1 = " << edgepoints.Get(1) << " pl = " << edgepoints.Last() << endl;
+ */
+ int debug = 0;
+ /*
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Get(1)) < 1e-6 ||
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Last()) < 1e-6;
+ */
+
+ if (debug)
+ {
+ // (*testout) << "tubious edge !!!" << endl;
+ (*testout) << "s1, s2 = " << s1 << " - " << s2 << endl;
+ }
+
+ refedges.SetSize(0);
+ refedgesinv.SetSize(0);
+ hp = Center (edgepoints.Get(1), edgepoints.Get(2));
+ ProjectToEdge (geometry.GetSurface(s1), geometry.GetSurface(s2), hp);
+
+ geometry.GetSurface(s1) -> CalcGradient (hp, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hp, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+
+ (*testout) << "t = " << t << endl;
+
+ for (i = 0; i < geometry.GetNTopLevelObjects(); i++)
+ {
+ (*testout) << "layer = " << layer
+ << ", tlo-layer = " << geometry.GetTopLevelObject(i)->GetLayer() << endl;
+ if (geometry.GetTopLevelObject(i)->GetLayer() != layer)
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(i)->GetSolid();
+ const Surface * surf = geometry.GetTopLevelObject(i)->GetSurface();
+
+ sol -> TangentialSolid (hp, locsol);
+ if (!locsol) continue;
+
+ BoxSphere<3> boxp (hp, hp);
+ boxp.Increase (1e-5);
+ boxp.CalcDiamCenter();
+
+ ReducePrimitiveIterator rpi(boxp);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)locsol) -> IterateSolid (rpi);
+
+ locsol -> CalcSurfaceInverse ();
+
+
+ if (!surf)
+ {
+ locsol -> GetSurfaceIndices (locsurfind);
+ }
+ else
+ {
+ /*
+ if (fabs (surf->CalcFunctionValue (hp)) < 1e-6)
+ continue;
+ */
+ locsurfind.SetSize(1);
+ locsurfind[0] = -1;
+ for (j = 0; j < geometry.GetNSurf(); j++)
+ if (geometry.GetSurface(j) == surf)
+ {
+ locsurfind[0] = j;
+ // geometry.GetSurfaceClassRepresentant(j);
+ break;
+ }
+ }
+
+ ((Solid*)locsol) -> IterateSolid (urpi);
+
+
+ if (debug)
+ (*testout) << "edge of tlo " << i << ", has " << locsurfind.Size() << " faces." << endl;
+
+
+ for (j = locsurfind.Size()-1; j >= 0; j--)
+ if (fabs (geometry.GetSurface(locsurfind[j])
+ ->CalcFunctionValue (hp) ) > 1e-6)
+ locsurfind.DeleteElement(j+1);
+
+ if (debug)
+ (*testout) << locsurfind.Size() << " faces on hp" << endl;
+
+ for (j = 0; j < locsurfind.Size(); j++)
+ {
+ int lsi = locsurfind[j];
+ int rlsi = geometry.GetSurfaceClassRepresentant(lsi);
+
+ Vec<3> rn;
+
+ // n is outer normal to solid
+ geometry.GetSurface(lsi) -> GetNormalVector (hp, n);
+ if (geometry.GetSurface (lsi)->Inverse())
+ n *= -1;
+
+ if (fabs (t * n) > 1e-4) continue;
+ if (debug)
+ {
+ (*testout) << "face " << locsurfind.Get(j) << ", rep = " << rlsi
+ << " has (t*n) = " << (t*n) << endl;
+ (*testout) << "n = " << n << endl;
+ }
+
+ // rn is normal to class representant
+ geometry.GetSurface(rlsi) -> GetNormalVector (hp, rn);
+
+ int sameasref = ((n * rn) > 0);
+
+ m = Cross (t, rn);
+ m.Normalize();
+
+
+ for (k = 1; k <= 2; k ++)
+ {
+ bool edgeinv = (k == 2);
+
+ if (debug)
+ {
+ (*testout) << "onface(" << hp << ", " << m << ")= "
+ << locsol->OnFace (hp, m);
+ (*testout) << " vec2in = "
+ << locsol -> VectorIn2 (hp, m, n) << " and "
+ << locsol -> VectorIn2 (hp, m, -1 * n) << endl;
+ }
+
+ // if (locsol -> OnFace (hp, m))
+ if (locsol -> VectorIn2 (hp, m, n) == 0 &&
+ locsol -> VectorIn2 (hp, m, -1 * n) == 1)
+ {
+ hi = 0;
+ for (l = 1; l <= refedges.Size(); l++)
+ {
+ if (refedges.Get(l).si == rlsi &&
+ refedgesinv.Get(l) == edgeinv)
+ hi = l;
+ }
+
+ if (!hi)
+ {
+ seg.si = rlsi;
+ seg.domin = -1;
+ seg.domout = -1;
+ seg.tlosurf = -1;
+ seg.surfnr1 = s1;
+ seg.surfnr2 = s2;
+ hi = refedges.Append (seg);
+ refedgesinv.Append (edgeinv);
+ }
+
+ if (!surf)
+ {
+ if (sameasref)
+ refedges.Elem(hi).domin = i;
+ else
+ refedges.Elem(hi).domout = i;
+ }
+ else
+ refedges.Elem(hi).tlosurf = i;
+
+ if (debug)
+ (*testout) << "add ref seg:"
+ << "si = " << refedges.Get(hi).si
+ << ", domin = " << refedges.Get(hi).domin
+ << ", domout = " << refedges.Get(hi).domout
+ << ", surfnr1/2 = " << refedges.Get(hi).surfnr1
+ << ", " << refedges.Get(hi).surfnr2
+ << ", inv = " << refedgesinv.Get(hi)
+ << ", refedgenr = " << hi
+ << endl;
+ }
+ m *= -1;
+ }
+ }
+ delete locsol;
+ }
+ }
+
+
+
+ void EdgeCalculation ::
+ StoreEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+
+ double len, corr, lam;
+ PointIndex thispi, lastpi;
+ Point<3> p, np;
+ Segment seg;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints.Get(1), edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+
+ // generate initial point
+ p = edgepoints.Get(1);
+ lastpi = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ lastpi = pi;
+ break;
+ }
+
+ if (lastpi == -1)
+ lastpi = mesh.AddPoint (p, layer);
+
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength.Get(j) < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength.Get(j-1)) /
+ (curvelength.Get(j) - curvelength.Get(j-1));
+
+ np(0) = (1-lam) * edgepoints.Get(j-1)(0) + lam * edgepoints.Get(j)(0);
+ np(1) = (1-lam) * edgepoints.Get(j-1)(1) + lam * edgepoints.Get(j)(1);
+ np(2) = (1-lam) * edgepoints.Get(j-1)(2) + lam * edgepoints.Get(j)(2);
+
+
+ thispi = -1;
+ if (i == ne)
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist(mesh[pi], np) < 1e-6)
+ thispi = pi;
+
+ if (thispi == -1)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np, layer);
+ }
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = lastpi;
+ seg.p2 = thispi;
+ }
+ else
+ {
+ seg.p1 = thispi;
+ seg.p2 = lastpi;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+
+ double maxh = min2 (geometry.GetSurface(seg.surfnr1)->GetMaxH(),
+ geometry.GetSurface(seg.surfnr2)->GetMaxH());
+
+ if (seg.domin != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domin) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domin)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.domout != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domout) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domout)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.tlosurf != -1)
+ {
+ double hi = geometry.GetTopLevelObject(seg.tlosurf) -> GetMaxH();
+ maxh = min2 (maxh, hi);
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ }
+
+ p = np;
+ lastpi = thispi;
+ }
+
+#ifdef DEVELOP
+ (*testout) << " eplast = " << lastpi << " = " << p << endl;
+#endif
+ }
+
+
+
+
+
+
+ void EdgeCalculation ::
+ StoreShortEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+ Segment seg;
+
+ /*
+ double len, corr, lam;
+ int thispi, lastpi;
+ Point<3> p, np;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints[1], edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+ */
+
+ // generate initial point
+ Point<3> p = edgepoints[0];
+ PointIndex pi1 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi1 = pi;
+ break;
+ }
+
+ if (pi1 == -1) pi1 = mesh.AddPoint (p, layer);
+
+ p = edgepoints.Last();
+ PointIndex pi2 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi2 = pi;
+ break;
+ }
+ if (pi2==-1) pi2 = mesh.AddPoint (p, layer);
+
+ /*
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength[j] < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength[j-1]) /
+ (curvelength[j] - curvelength[j-1]);
+
+ np(0) = (1-lam) * edgepoints[j-1](0) + lam * edgepoints[j](0);
+ np(1) = (1-lam) * edgepoints[j-1](1) + lam * edgepoints[j](1);
+ np(2) = (1-lam) * edgepoints[j-1](2) + lam * edgepoints[j](2);
+
+
+ thispi = 0;
+ if (i == ne)
+ for (j = 1; j <= mesh.GetNP(); j++)
+ if (Dist(mesh.Point(j), np) < 1e-6)
+ thispi = j;
+
+ if (!thispi)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np);
+ }
+ */
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = pi1;
+ seg.p2 = pi2;
+ }
+ else
+ {
+ seg.p1 = pi2;
+ seg.p2 = pi1;
+ }
+
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ CopyEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ int copyfromedge,
+ const Point<3> & fromstart, const Point<3> & fromend,
+ const Point<3> & tostart, const Point<3> & toend,
+ int copyedgeidentification,
+ int layer,
+ Mesh & mesh)
+ {
+ int i, j, k;
+ PointIndex pi;
+
+ // copy start and end points
+ for (i = 1; i <= 2; i++)
+ {
+ Point<3> fromp =
+ (i == 1) ? fromstart : fromend;
+ Point<3> top =
+ (i == 1) ? tostart : toend;
+
+ PointIndex frompi = -1;
+ PointIndex topi = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ {
+ if (Dist2 (mesh[pi], fromp) <= 1e-16)
+ frompi = pi;
+ if (Dist2 (mesh[pi], top) <= 1e-16)
+ topi = pi;
+ }
+
+ if (topi == -1)
+ topi = mesh.AddPoint (top, layer);
+
+ const Identification & csi =
+ (*geometry.identifications.Get(copyedgeidentification));
+
+ if (csi.Identifyable (mesh[frompi], mesh[topi]))
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ else if (csi.Identifyable (mesh[topi], mesh[frompi]))
+ mesh.GetIdentifications().Add(topi, frompi, copyedgeidentification);
+ else
+ {
+ cerr << "edgeflw.cpp: should identify, but cannot";
+ exit(1);
+ }
+ /*
+ (*testout) << "Add Identification from CopyEdge, p1 = "
+ << mesh[PointIndex(frompi)] << ", p2 = "
+ << mesh[PointIndex(topi)] << endl;
+
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ */
+ }
+
+ int oldns = mesh.GetNSeg();
+ for (i = 1; i <= oldns; i++)
+ {
+ // real copy, since array might be reallocated !!
+ const Segment oldseg = mesh.LineSegment(i);
+ if (oldseg.edgenr != copyfromedge)
+ continue;
+ if (oldseg.seginfo == 0)
+ continue;
+
+ int pi1 = oldseg.p1;
+ int pi2 = oldseg.p2;
+
+ int npi1 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi1);
+ int npi2 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi2);
+
+ Segment seg;
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ int inv = refedgesinv.Get(k);
+
+ // other edge is inverse
+ if (oldseg.seginfo == 1)
+ inv = !inv;
+
+ // (*testout) << "inv, now = " << inv << endl;
+
+ if (inv)
+ {
+ seg.p1 = npi1;
+ seg.p2 = npi2;
+ }
+ else
+ {
+ seg.p1 = npi2;
+ seg.p2 = npi1;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = refedgesinv.Get(k) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "copy seg " << seg.p1 << "-" << seg.p2 << endl;
+#ifdef DEVELOP
+
+ (*testout) << "copy seg, face = " << seg.si << ": "
+ << " inv = " << inv << ", refinv = " << refedgesinv.Get(k)
+ << mesh.Point(seg.p1) << ", " << mesh.Point(seg.p2) << endl;
+#endif
+
+ }
+
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ FindClosedSurfaces (double h, Mesh & mesh)
+ {
+ // if there is no special point at a sphere, one has to add a segment pair
+
+ int i, j;
+ int nsol;
+ int nsurf = geometry.GetNSurf();
+ int layer;
+
+ BitArray pointatsurface (nsurf);
+ Point<3> p1, p2;
+ Vec<3> nv, tv;
+ Solid * tansol;
+ ARRAY<int> tansurfind;
+ // const Solid * sol;
+
+ nsol = geometry.GetNTopLevelObjects();
+
+
+ pointatsurface.Clear();
+
+ /*
+ for (i = 1; i <= specpoints.Size(); i++)
+ {
+ int classrep;
+
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s1);
+ pointatsurface.Set (classrep);
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s2);
+ pointatsurface.Set (classrep);
+ // pointatsurface.Set (specpoints[i].s1);
+ // pointatsurface.Set (specpoints[i].s2);
+ }
+ */
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ const Segment & seg = mesh.LineSegment(i);
+ int classrep;
+
+#ifdef DEVELOP
+ (*testout) << seg.surfnr1 << ", " << seg.surfnr2 << ", si = " << seg.si << endl;
+#endif
+ classrep = geometry.GetSurfaceClassRepresentant (seg.si);
+
+ pointatsurface.Set (classrep);
+ }
+
+
+ for (i = 0; i < nsurf; i++)
+ {
+ int classrep = geometry.GetSurfaceClassRepresentant (i);
+
+ if (!pointatsurface.Test(classrep))
+ {
+ const Surface * s = geometry.GetSurface(i);
+ p1 = s -> GetSurfacePoint();
+ s -> GetNormalVector (p1, nv);
+
+ double hloc =
+ min2 (s->LocH (p1, 3, 1, h), mesh.GetH(p1));
+
+ tv = nv.GetNormal ();
+ tv *= (hloc / tv.Length());
+ p2 = p1 + tv;
+ s->Project (p2);
+
+
+ Segment seg1;
+ seg1.si = i;
+ seg1.domin = -1;
+ seg1.domout = -1;
+
+ Segment seg2;
+ seg2.si = i;
+ seg2.domin = -1;
+ seg2.domout = -1;
+
+ seg1.surfnr1 = i;
+ seg2.surfnr1 = i;
+ seg1.surfnr2 = i;
+ seg2.surfnr2 = i;
+
+ for (j = 0; j < nsol; j++)
+ {
+ if (geometry.GetTopLevelObject(j)->GetSurface())
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(j)->GetSolid();
+ sol -> TangentialSolid (p1, tansol);
+ layer = geometry.GetTopLevelObject(j)->GetLayer();
+
+ if (tansol)
+ {
+ tansol -> GetSurfaceIndices (tansurfind);
+
+ if (tansurfind.Size() == 1 && tansurfind.Get(1) == i)
+ {
+ if (!tansol->VectorIn(p1, nv))
+ {
+ seg1.domin = j;
+ seg2.domin = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ else
+ {
+ seg1.domout = j;
+ seg2.domout = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ // seg.s2 = i;
+ // seg.invs1 = surfaces[i] -> Inverse();
+ // seg.invs2 = ! (surfaces[i] -> Inverse());
+ }
+ delete tansol;
+ }
+ }
+
+
+ if (seg1.domin != -1 || seg1.domout != -1)
+ {
+ mesh.AddPoint (p1, layer);
+ mesh.AddPoint (p2, layer);
+ seg1.p1 = mesh.GetNP()-1;
+ seg1.p2 = mesh.GetNP();
+ seg2.p2 = mesh.GetNP()-1;
+ seg2.p1 = mesh.GetNP();
+ seg1.geominfo[0].trignum = 1;
+ seg1.geominfo[1].trignum = 1;
+ seg2.geominfo[0].trignum = 1;
+ seg2.geominfo[1].trignum = 1;
+ mesh.AddSegment (seg1);
+ mesh.AddSegment (seg2);
+
+ PrintMessage (5, "Add line segment to smooth surface");
+
+#ifdef DEVELOP
+ (*testout) << "Add segment at smooth surface " << i;
+ if (i != classrep) (*testout) << ", classrep = " << classrep;
+ (*testout) << ": "
+ << mesh.Point (mesh.GetNP()-1) << " - "
+ << mesh.Point (mesh.GetNP()) << endl;
+#endif
+ }
+ }
+ }
+ }
+
+}
diff --git a/Netgen/libsrc/csg/edgeflw_new.cpp b/Netgen/libsrc/csg/edgeflw_new.cpp
new file mode 100644
index 0000000000..8aa9f0263b
--- /dev/null
+++ b/Netgen/libsrc/csg/edgeflw_new.cpp
@@ -0,0 +1,1553 @@
+#include <mystdlib.h>
+#include <meshing.hpp>
+#include <csg.hpp>
+
+#undef DEVELOP
+
+namespace netgen
+{
+
+ EdgeCalculation ::
+ EdgeCalculation (const CSGeometry & ageometry,
+ ARRAY<SpecialPoint> & aspecpoints)
+ : geometry(ageometry), specpoints(aspecpoints)
+ {
+ Box<3> bbox;
+ if (specpoints.Size() >= 1)
+ bbox.Set (specpoints[0].p);
+ for (int i = 1; i < specpoints.Size(); i++)
+ bbox.Add (specpoints[i].p);
+
+ searchtree = new Point3dTree (bbox.PMin(), bbox.PMax());
+ meshpoint_tree = new Point3dTree (bbox.PMin(), bbox.PMax());
+
+ for (int i = 0; i < specpoints.Size(); i++)
+ searchtree->Insert (specpoints[i].p, i);
+ }
+
+ EdgeCalculation :: ~EdgeCalculation()
+ {
+ delete searchtree;
+ delete meshpoint_tree;
+ }
+
+
+ void EdgeCalculation :: Calc(double h, Mesh & mesh)
+ {
+ (*testout) << "Find edges" << endl;
+ PrintMessage (1, "Find edges");
+ PushStatus ("Find edges");
+
+ CalcEdges1 (h, mesh);
+ SplitEqualOneSegEdges (mesh);
+ FindClosedSurfaces (h, mesh);
+ PrintMessage (3, cntedge, " edges found");
+
+ for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
+ (*testout) << "seg " << si << " = " << mesh[si] << endl;
+ PopStatus ();
+ }
+
+
+
+
+
+ void EdgeCalculation :: CalcEdges1 (double h, Mesh & mesh)
+ {
+ ARRAY<int> hsp(specpoints.Size());
+ ARRAY<int> glob2hsp(specpoints.Size());
+ ARRAY<int> startpoints, endpoints;
+
+ int i, j, k, l, hi, pos, ep, ne;
+ int layer;
+
+ Vec<3> a1, a2, t, n, m;
+ Point<3> p, np, pnp, hp;
+
+ Segment seg;
+ int pi1, s1, s2;
+ int lastpi, thispi;
+
+ ARRAY<Point<3> > edgepoints;
+ ARRAY<double> curvelength;
+ int copyedge, copyfromedge, copyedgeidentification;
+
+ ARRAY<int> locsurfind, locind;
+
+ double len, corr, lam;
+ double steplen, cursteplen, loch, hd;
+
+ int checkedcopy = 0;
+
+ double size = geometry.MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
+ double epspointdist2 = size * 1e-6; // globflags.GetNumFlag ("epspointdist", size * 1e-6);
+ epspointdist2 = sqr (epspointdist2);
+
+
+
+ Solid * locsol;
+
+
+ // copy special points to work with
+ for (i = 0; i < specpoints.Size(); i++)
+ {
+ hsp[i] = i;
+ glob2hsp[i] = i;
+ }
+
+
+ cntedge = 0;
+
+ while (hsp.Size())
+ {
+ SetThreadPercent(100 - 100 * double (hsp.Size()) / specpoints.Size());
+
+ edgepoints.SetSize (0);
+ curvelength.SetSize (0);
+
+
+ pi1 = 0;
+ copyedge = 0;
+ // identifyable point available ?
+
+ // (*testout) << endl;
+
+ for (i = 1; i <= geometry.identifications.Size() && !pi1; i++)
+ {
+ for (j = checkedcopy+1; j <= startpoints.Size() && !pi1; j++)
+ {
+
+ if (geometry.identifications.Get(i)->IdentifyableCandidate (specpoints[startpoints.Get(j)]))
+
+ {
+ int pi1cand = 0;
+ double mindist = 1e10;
+
+ for (k = 1; k <= hsp.Size() && !pi1; k++)
+ {
+#ifdef DEVELOP
+ (*testout) << "check kand = " << hsp.Get(k).p
+ << ", v = " << hsp.Get(k).v
+ << endl;
+#endif
+ if (geometry.identifications.Get(i)
+ ->Identifyable(specpoints[startpoints.Get(j)], specpoints[hsp.Get(k)]) ||
+ geometry.identifications.Get(i)
+ ->Identifyable(specpoints[hsp.Get(k)], specpoints[startpoints.Get(j)]))
+ {
+
+#ifdef DEVELOP
+ (*testout) << "identifiable, dist = "
+ << Dist (startpoints.Get(j).p, hsp.Get(k).p) << endl;
+#endif
+
+ if (Dist (specpoints[startpoints.Get(j)].p, specpoints[hsp.Get(k)].p) < mindist)
+ {
+ mindist = Dist (specpoints[startpoints.Get(j)].p, specpoints[hsp.Get(k)].p);
+ pi1cand = k;
+ }
+ /*
+ pi1 = k;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << hsp.Get(k).p << " - " << hsp.Get(k).v << endl;
+ */
+ }
+ }
+
+ if (pi1cand)
+ {
+ pi1 = pi1cand;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+#ifdef DEVELOP
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << specpoints[hsp.Get(pi1)].p << " - " << hsp.Get(pi1).v << endl;
+#endif
+ }
+ }
+ }
+ }
+
+
+ // cannot copy from other ege ?
+ if (!pi1)
+ checkedcopy = startpoints.Size();
+
+ // unconditional special point available ?
+ if (!pi1)
+ for (i = 1; i <= hsp.Size(); i++)
+ if (specpoints[hsp.Get(i)].unconditional == 1)
+ {
+ pi1 = i;
+ break;
+ }
+
+
+ if (!pi1)
+ {
+ // only unconditional points available, choose first
+ pi1 = 1;
+ }
+
+ layer = specpoints[hsp.Get(pi1)].GetLayer();
+
+
+ if (!specpoints[hsp.Get(pi1)].unconditional)
+ {
+ specpoints[hsp.Elem(pi1)].unconditional = 1;
+ for (i = 1; i <= hsp.Size(); i++)
+ if (i != pi1 &&
+ Dist (specpoints[hsp.Get(pi1)].p, specpoints[hsp.Get(i)].p) < 1e-8 &&
+ (specpoints[hsp.Get(pi1)].v + specpoints[hsp.Get(i)].v).Length() < 1e-4)
+ {
+ // opposite direction
+ specpoints[hsp.Elem(i)].unconditional = 1;
+ }
+ }
+
+ cntedge++;
+ startpoints.Append (hsp.Get(pi1));
+
+#ifdef DEVELOP
+ (*testout) << "edge nr " << cntedge << endl;
+ (*testout) << "start followedge: p1 = " << hsp.Get(pi1).p << ", v = " << hsp.Get(pi1).v << endl;
+#endif
+
+ FollowEdge (pi1, ep, pos, hsp, h, mesh,
+ edgepoints, curvelength);
+
+
+ if (multithread.terminate)
+ return;
+
+ if (!ep)
+ {
+ // ignore starting point
+ hsp.DeleteElement (pi1);
+ cout << "yes, this happens" << endl;
+ continue;
+ }
+
+
+
+ endpoints.Append (hsp.Get(ep));
+
+
+ double elen = 0;
+ for (i = 1; i <= edgepoints.Size()-1; i++)
+ elen += Dist (edgepoints.Get(i), edgepoints.Get(i+1));
+
+
+ int shortedge = 0;
+ for (i = 1; i <= geometry.identifications.Size(); i++)
+ if (geometry.identifications.Get(i)->ShortEdge(specpoints[hsp.Get(pi1)], specpoints[hsp.Get(ep)]))
+ shortedge = 1;
+ // (*testout) << "shortedge = " << shortedge << endl;
+
+
+ if (!shortedge)
+ {
+ mesh.RestrictLocalHLine (Point3d (specpoints[hsp.Get(pi1)].p),
+ Point3d (specpoints[hsp.Get(ep)].p),
+ elen / mparam.segmentsperedge);
+ }
+
+ s1 = specpoints[hsp.Get(pi1)].s1;
+ s2 = specpoints[hsp.Get(pi1)].s2;
+
+
+ // delete initial, terminal and conditional points
+
+#ifdef DEVELOP
+ (*testout) << "terminal point: p = " << hsp.Get(ep).p << ", v = " << hsp.Get(ep).v << endl;
+#endif
+
+ searchtree -> DeleteElement (hsp.Get(ep));
+ searchtree -> DeleteElement (hsp.Get(pi1));
+
+ if (ep > pi1)
+ {
+ glob2hsp[hsp[ep-1]] = -1;
+ glob2hsp[hsp.Last()] = ep-1;
+ hsp.DeleteElement (ep);
+
+ glob2hsp[hsp[pi1-1]] = -1;
+ glob2hsp[hsp.Last()] = pi1-1;
+ hsp.DeleteElement (pi1);
+ }
+ else
+ {
+ glob2hsp[hsp[pi1-1]] = -1;
+ glob2hsp[hsp.Last()] = pi1-1;
+ hsp.DeleteElement (pi1);
+
+ glob2hsp[hsp[ep-1]] = -1;
+ glob2hsp[hsp.Last()] = ep-1;
+ hsp.DeleteElement (ep);
+ }
+
+
+ for (j = 1; j <= edgepoints.Size()-1; j++)
+ {
+ p = edgepoints.Get(j);
+ np = Center (p, edgepoints.Get(j+1));
+ hd = Dist (p, np);
+
+
+ Box<3> boxp (np - (1.2 * hd) * Vec<3> (1, 1, 1),
+ np + (1.2 * hd) * Vec<3> (1, 1, 1));
+ searchtree -> GetIntersecting (boxp.PMin(), boxp.PMax(), locind);
+
+ for (i = 0; i < locind.Size(); i++)
+ {
+ if ( specpoints[locind[i]].HasSurfaces (s1, s2) &&
+ specpoints[locind[i]].unconditional == 0)
+ {
+ searchtree -> DeleteElement (locind[i]);
+
+ int li = glob2hsp[locind[i]];
+ glob2hsp[locind[i]] = -1;
+ glob2hsp[hsp.Last()] = li;
+ hsp.Delete (li);
+ }
+ }
+
+
+ /*
+ for (i = 1; i <= hsp.Size(); i++)
+ if ( specpoints[hsp.Get(i)].HasSurfaces (s1, s2) &&
+ specpoints[hsp.Get(i)].unconditional == 0 &&
+ Dist2 (np, specpoints[hsp.Get(i)].p) < 1.2 * hd)
+ {
+ searchtree -> DeleteElement (hsp.Get(i)+1);
+ hsp.DeleteElement (i);
+ i--;
+ }
+ */
+ }
+
+
+ ARRAY<Segment> refedges;
+ ARRAY<int> refedgesinv;
+
+
+ AnalyzeEdge (s1, s2, pos, layer,
+ edgepoints,
+ refedges, refedgesinv);
+
+ for (i = 1; i <= refedges.Size(); i++)
+ refedges.Elem(i).edgenr = cntedge;
+
+
+#ifdef DEVELOP
+ (*testout) << "edge " << cntedge << endl
+ << "startp: " << startpoints.Last().p
+ << ", v = " << startpoints.Last().v << endl
+ << "copy = " << copyedge << endl
+ << refedges.Size() << " refedges: ";
+ for (i = 1; i <= refedges.Size(); i++)
+ (*testout) << " " << refedges.Get(i).si;
+ (*testout) << endl;
+ (*testout) << "inv[1] = " << refedgesinv.Get(1) << endl;
+#endif
+
+ if (!copyedge)
+ {
+ int oldnseg = mesh.GetNSeg();
+
+ if (!shortedge)
+ StoreEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+ else
+ StoreShortEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+
+
+ /*
+ for (i = oldnseg+1; i <= mesh.GetNSeg(); i++)
+ for (j = 1; j <= oldnseg; j++)
+ {
+ const Point<3> & l1p1 = mesh.Point (mesh.LineSegment(i).p1);
+ const Point<3> & l1p2 = mesh.Point (mesh.LineSegment(i).p2);
+ const Point<3> & l2p1 = mesh.Point (mesh.LineSegment(j).p1);
+ const Point<3> & l2p2 = mesh.Point (mesh.LineSegment(j).p2);
+ Vec<3> vl1(l1p1, l1p2);
+ for (double lamk = 0; lamk <= 1; lamk += 0.1)
+ {
+ Point<3> l2p = l1p1 + lamk * vl1;
+ double dist = sqrt (MinDistLP2 (l2p1, l2p2, l2p));
+ if (dist > 1e-12)
+ mesh.RestrictLocalH (l2p, 3*dist);
+ }
+ }
+ */
+ }
+ else
+ {
+ CopyEdge (refedges, refedgesinv,
+ copyfromedge,
+ specpoints[startpoints.Get(copyfromedge)].p,
+ specpoints[endpoints.Get(copyfromedge)].p,
+ edgepoints.Get(1), edgepoints.Last(),
+ copyedgeidentification,
+ layer,
+ mesh);
+ }
+
+ }
+ }
+
+
+
+ /*
+ If two or more edges share the same initial and end-points,
+ then they need at least two segments
+ */
+ void EdgeCalculation ::
+ SplitEqualOneSegEdges (Mesh & mesh)
+ {
+ int i, j;
+ SegmentIndex si;
+ PointIndex pi;
+
+ ARRAY<int> osedges(cntedge);
+ INDEX_2_HASHTABLE<int> osedgesht (cntedge+1);
+
+ osedges = 2;
+
+ // count segments on edges
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ osedges.Elem(seg.edgenr)--;
+ }
+
+ (*testout) << "osedges = " << osedges << endl;
+
+ // flag one segment edges
+ for (i = 0; i < cntedge; i++)
+ osedges[i] = (osedges[i] > 0) ? 1 : 0;
+
+ (*testout) << "osedges, now = " << osedges << endl;
+
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr))
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2))
+ osedgesht.Set (i2, 2);
+ else
+ osedgesht.Set (i2, 1);
+ }
+ }
+ }
+
+
+ // one edge 1 segment, other 2 segments
+ // yes, it happens !
+
+ for (i = 1; i <= osedgesht.GetNBags(); i++)
+ for (j = 1; j <= osedgesht.GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int val;
+ osedgesht.GetData (i, j, i2, val);
+
+ const Point<3> & p1 = mesh[PointIndex(i2.I1())];
+ const Point<3> & p2 = mesh[PointIndex(i2.I2())];
+ Vec<3> v = p2 - p1;
+ double vlen = v.Length();
+ v /= vlen;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (pi != i2.I1() && pi != i2.I2())
+ {
+ const Point<3> & p = mesh[pi];
+ Vec<3> v2 = p - p1;
+ double lam = (v2 * v);
+ if (lam > 0 && lam < vlen)
+ {
+ Point<3> hp = p1 + lam * v;
+ if (Dist (p, hp) < 1e-4 * vlen)
+ {
+ PrintSysError ("Point on edge !!!");
+ cout << "seg: " << i2 << ", p = " << pi << endl;
+ osedgesht.Set (i2, 2);
+ }
+ }
+ }
+ }
+
+
+ // insert new points
+ osedges = -1;
+
+ int nseg = mesh.GetNSeg();
+ for (si = 0; si < nseg; si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2) &&
+ osedgesht.Get (i2) == 2 &&
+ osedges.Elem(seg.edgenr) == -1)
+ {
+ Point<3> newp = Center (mesh[PointIndex(seg.p1)],
+ mesh[PointIndex(seg.p2)]);
+
+ ProjectToEdge (geometry.GetSurface(seg.surfnr1),
+ geometry.GetSurface(seg.surfnr2),
+ newp);
+
+ osedges.Elem(seg.edgenr) =
+ mesh.AddPoint (newp, mesh[PointIndex(seg.p1)].GetLayer());
+ meshpoint_tree -> Insert (newp, osedges.Elem(seg.edgenr));
+ }
+ }
+ }
+
+
+ for (i = 1; i <= nseg; i++)
+ {
+ Segment & seg = mesh.LineSegment (i);
+ if (seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr) != -1)
+ {
+ Segment newseg = seg;
+ newseg.p1 = osedges.Get(seg.edgenr);
+ seg.p2 = osedges.Get(seg.edgenr);
+ mesh.AddSegment (newseg);
+ }
+ }
+ }
+
+ }
+
+
+
+ void EdgeCalculation ::
+ FollowEdge (int pi1, int & ep, int & pos,
+ const ARRAY<int> & hsp,
+ double h, const Mesh & mesh,
+ ARRAY<Point<3> > & edgepoints,
+ ARRAY<double> & curvelength)
+ {
+ int i, j, s1, s2;
+ double len, steplen, cursteplen, loch;
+ Point<3> p, np, pnp;
+ Vec<3> a1, a2, t;
+
+ ARRAY<int> locind;
+
+ double size = geometry.MaxSize();
+ double epspointdist2 = size * 1e-6;
+ epspointdist2 = sqr (epspointdist2);
+ int uselocalh = mparam.uselocalh;
+
+
+ s1 = specpoints[hsp.Get(pi1)].s1;
+ s2 = specpoints[hsp.Get(pi1)].s2;
+
+ p = specpoints[hsp.Get(pi1)].p;
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+
+ t = Cross (a1, a2);
+ t.Normalize();
+
+ pos = (specpoints[hsp.Get(pi1)].v * t) > 0;
+ if (!pos) t *= -1;
+
+
+ edgepoints.Append (p);
+ curvelength.Append (0);
+ len = 0;
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (p, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (p, 3, 1, h));
+
+
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(p);
+ if (lh < loch)
+ loch = lh;
+ }
+
+ steplen = 0.1 * loch;
+
+ do
+ {
+ if (multithread.terminate)
+ return;
+
+ if (fabs (p(0)) + fabs (p(1)) + fabs (p(2)) > 10000)
+ {
+ ep = 0;
+ PrintWarning ("Give up line");
+ break;
+ }
+
+ if (steplen > 0.1 * loch) steplen = 0.1 * loch;
+
+ steplen *= 2;
+ do
+ {
+ steplen *= 0.5;
+ np = p + steplen * t;
+ pnp = np;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), pnp);
+ }
+ while (Dist (np, pnp) > 0.1 * steplen);
+
+ cursteplen = steplen;
+ if (Dist (np, pnp) < 0.01 * steplen) steplen *= 2;
+
+
+ np = pnp;
+
+#ifdef MYGRAPH
+ if (silentflag <= 2)
+ {
+ MyLine3D (p, np, rot);
+ MyDraw ();
+ }
+#endif
+
+ ep = 0;
+
+ double hvtmin = 1.5 * cursteplen;
+
+ Box<3> boxp (p - (2 * cursteplen) * Vec<3> (1, 1, 1),
+ p + (2 * cursteplen) * Vec<3> (1, 1, 1));
+
+ searchtree -> GetIntersecting (boxp.PMin(), boxp.PMax(), locind);
+
+ for (i = 0; i < locind.Size(); i++)
+ {
+ Vec<3> hv = specpoints[locind[i]].p - p;
+ if (hv.Length2() > 9 * cursteplen * cursteplen)
+ continue;
+
+ double hvt = hv * t;
+ hv -= hvt * t;
+
+ if (hv.Length() < 0.2 * cursteplen &&
+ hvt > 0 &&
+ // hvt < 1.5 * cursteplen &&
+ hvt < hvtmin &&
+ specpoints[locind[i]].unconditional == 1 &&
+ (specpoints[locind[i]].v + t).Length() < 0.4 )
+ {
+ Point<3> hep = specpoints[locind[i]].p;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), hep);
+
+
+ if (Dist2 (hep, specpoints[locind[i]].p) < epspointdist2 )
+ {
+ geometry.GetSurface(s1) -> CalcGradient (hep, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hep, a2);
+ Vec<3> ept = Cross (a1, a2);
+ ept /= ept.Length();
+ if (!pos) ept *= -1;
+
+ if ( (specpoints[locind[i]].v + ept).Length() < 1e-4 )
+ {
+ np = specpoints[locind[i]].p;
+
+ for (int jj = 0; jj < hsp.Size(); jj++)
+ if (hsp[jj] == locind[i])
+ ep = jj+1;
+
+ if (!ep)
+ cerr << "endpoint not found" << endl;
+ // ep = i;
+ hvtmin = hvt;
+ // break;
+ }
+ }
+ }
+ }
+
+
+
+
+ /*
+ for (i = 1; i <= hsp.Size(); i++)
+ {
+ if (!boxp.IsIn (specpoints[hsp.Get(i)].p))
+ continue;
+
+ Vec<3> hv = specpoints[hsp.Get(i)].p - p;
+ if (hv.Length2() > 9 * cursteplen * cursteplen)
+ continue;
+
+ double hvt = hv * t;
+ hv -= hvt * t;
+
+ if (hv.Length() < 0.2 * cursteplen &&
+ hvt > 0 &&
+ // hvt < 1.5 * cursteplen &&
+ hvt < hvtmin &&
+ specpoints[hsp.Get(i)].unconditional == 1 &&
+ (specpoints[hsp.Get(i)].v + t).Length() < 0.4 )
+ {
+ Point<3> hep = specpoints[hsp.Get(i)].p;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), hep);
+
+
+ if (Dist2 (hep, specpoints[hsp.Get(i)].p) < epspointdist2 )
+ {
+ geometry.GetSurface(s1) -> CalcGradient (hep, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hep, a2);
+ Vec<3> ept = Cross (a1, a2);
+ ept /= ept.Length();
+ if (!pos) ept *= -1;
+
+ if ( (specpoints[hsp.Get(i)].v + ept).Length() < 1e-4 )
+ {
+ np = specpoints[hsp.Get(i)].p;
+ ep = i;
+ hvtmin = hvt;
+ // break;
+ }
+ }
+ }
+ }
+ */
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (np, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (np, 3, 1, h));
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(np);
+ if (lh < loch)
+ loch = lh;
+ }
+
+
+ len += Dist (p, np) / loch;
+ edgepoints.Append (np);
+ curvelength.Append (len);
+
+ p = np;
+
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+ }
+ while (! ep);
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ AnalyzeEdge (int s1, int s2, int pos, int layer,
+ const ARRAY<Point<3> > & edgepoints,
+ ARRAY<Segment> & refedges,
+ ARRAY<int> & refedgesinv)
+ {
+ int i, j, k, l;
+ int hi;
+ Point<3> hp;
+ Vec<3> t, a1, a2, m, n;
+ Segment seg;
+ Solid * locsol;
+ ARRAY<int> locsurfind;
+
+ /*
+ int pi1 = 0, pi2 = 0;
+ extern Mesh * mesh;
+ for (i = 1; i <= mesh->GetNP(); i++)
+ {
+ if (Dist2 (edgepoints.Get(1), mesh->Point(i)) < 1e-12)
+ pi1 = i;
+ if (Dist2 (edgepoints.Last(), mesh->Point(i)) < 1e-12)
+ pi2 = i;
+ }
+ (*testout) << "Analyze edge: " << pi1 << " - " << pi2 << ", pts = " << edgepoints.Size() << endl;
+ (*testout) << "p1 = " << edgepoints.Get(1) << " pl = " << edgepoints.Last() << endl;
+ */
+ int debug = 0;
+ /*
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Get(1)) < 1e-6 ||
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Last()) < 1e-6;
+ */
+
+ if (debug)
+ {
+ // (*testout) << "tubious edge !!!" << endl;
+ (*testout) << "s1, s2 = " << s1 << " - " << s2 << endl;
+ }
+
+ refedges.SetSize(0);
+ refedgesinv.SetSize(0);
+ hp = Center (edgepoints.Get(1), edgepoints.Get(2));
+ ProjectToEdge (geometry.GetSurface(s1), geometry.GetSurface(s2), hp);
+
+ geometry.GetSurface(s1) -> CalcGradient (hp, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hp, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+
+ (*testout) << "t = " << t << endl;
+
+ for (i = 0; i < geometry.GetNTopLevelObjects(); i++)
+ {
+ (*testout) << "layer = " << layer
+ << ", tlo-layer = " << geometry.GetTopLevelObject(i)->GetLayer() << endl;
+ if (geometry.GetTopLevelObject(i)->GetLayer() != layer)
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(i)->GetSolid();
+ const Surface * surf = geometry.GetTopLevelObject(i)->GetSurface();
+
+ sol -> TangentialSolid (hp, locsol);
+ if (!locsol) continue;
+
+ BoxSphere<3> boxp (hp, hp);
+ boxp.Increase (1e-5);
+ boxp.CalcDiamCenter();
+
+ ReducePrimitiveIterator rpi(boxp);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)locsol) -> IterateSolid (rpi);
+
+ locsol -> CalcSurfaceInverse ();
+
+
+ if (!surf)
+ {
+ locsol -> GetSurfaceIndices (locsurfind);
+ }
+ else
+ {
+ /*
+ if (fabs (surf->CalcFunctionValue (hp)) < 1e-6)
+ continue;
+ */
+ locsurfind.SetSize(1);
+ locsurfind[0] = -1;
+ for (j = 0; j < geometry.GetNSurf(); j++)
+ if (geometry.GetSurface(j) == surf)
+ {
+ locsurfind[0] = j;
+ // geometry.GetSurfaceClassRepresentant(j);
+ break;
+ }
+ }
+
+ ((Solid*)locsol) -> IterateSolid (urpi);
+
+
+ if (debug)
+ (*testout) << "edge of tlo " << i << ", has " << locsurfind.Size() << " faces." << endl;
+
+
+ for (j = locsurfind.Size()-1; j >= 0; j--)
+ if (fabs (geometry.GetSurface(locsurfind[j])
+ ->CalcFunctionValue (hp) ) > 1e-6)
+ locsurfind.DeleteElement(j+1);
+
+ if (debug)
+ (*testout) << locsurfind.Size() << " faces on hp" << endl;
+
+ for (j = 0; j < locsurfind.Size(); j++)
+ {
+ int lsi = locsurfind[j];
+ int rlsi = geometry.GetSurfaceClassRepresentant(lsi);
+
+ Vec<3> rn;
+
+ // n is outer normal to solid
+ geometry.GetSurface(lsi) -> GetNormalVector (hp, n);
+ if (geometry.GetSurface (lsi)->Inverse())
+ n *= -1;
+
+ if (fabs (t * n) > 1e-4) continue;
+ if (debug)
+ {
+ (*testout) << "face " << locsurfind.Get(j) << ", rep = " << rlsi
+ << " has (t*n) = " << (t*n) << endl;
+ (*testout) << "n = " << n << endl;
+ }
+
+ // rn is normal to class representant
+ geometry.GetSurface(rlsi) -> GetNormalVector (hp, rn);
+
+ int sameasref = ((n * rn) > 0);
+
+ m = Cross (t, rn);
+ m.Normalize();
+
+
+ for (k = 1; k <= 2; k ++)
+ {
+ bool edgeinv = (k == 2);
+
+ if (debug)
+ {
+ (*testout) << "onface(" << hp << ", " << m << ")= "
+ << locsol->OnFace (hp, m);
+ (*testout) << " vec2in = "
+ << locsol -> VectorIn2 (hp, m, n) << " and "
+ << locsol -> VectorIn2 (hp, m, -1 * n) << endl;
+ }
+
+ // if (locsol -> OnFace (hp, m))
+ if (locsol -> VectorIn2 (hp, m, n) == 0 &&
+ locsol -> VectorIn2 (hp, m, -1 * n) == 1)
+ {
+ hi = 0;
+ for (l = 1; l <= refedges.Size(); l++)
+ {
+ if (refedges.Get(l).si == rlsi &&
+ refedgesinv.Get(l) == edgeinv)
+ hi = l;
+ }
+
+ if (!hi)
+ {
+ seg.si = rlsi;
+ seg.domin = -1;
+ seg.domout = -1;
+ seg.tlosurf = -1;
+ seg.surfnr1 = s1;
+ seg.surfnr2 = s2;
+ hi = refedges.Append (seg);
+ refedgesinv.Append (edgeinv);
+ }
+
+ if (!surf)
+ {
+ if (sameasref)
+ refedges.Elem(hi).domin = i;
+ else
+ refedges.Elem(hi).domout = i;
+ }
+ else
+ refedges.Elem(hi).tlosurf = i;
+
+ if (debug)
+ (*testout) << "add ref seg:"
+ << "si = " << refedges.Get(hi).si
+ << ", domin = " << refedges.Get(hi).domin
+ << ", domout = " << refedges.Get(hi).domout
+ << ", surfnr1/2 = " << refedges.Get(hi).surfnr1
+ << ", " << refedges.Get(hi).surfnr2
+ << ", inv = " << refedgesinv.Get(hi)
+ << ", refedgenr = " << hi
+ << endl;
+ }
+ m *= -1;
+ }
+ }
+ delete locsol;
+ }
+ }
+
+
+
+ void EdgeCalculation ::
+ StoreEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+
+ double len, corr, lam;
+ PointIndex thispi, lastpi;
+ Point<3> p, np;
+ Segment seg;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints.Get(1), edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+
+ // generate initial point
+ p = edgepoints.Get(1);
+ lastpi = -1;
+
+ /*
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ lastpi = pi;
+ break;
+ }
+ */
+ ARRAY<int> locsearch;
+ meshpoint_tree -> GetIntersecting (p-Vec<3> (1e-6, 1e-6, 1e-6),
+ p+Vec<3> (1e-6, 1e-6, 1e-6), locsearch);
+ if (locsearch.Size())
+ lastpi = locsearch[0];
+
+
+
+ if (lastpi == -1)
+ {
+ lastpi = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, lastpi);
+ }
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength.Get(j) < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength.Get(j-1)) /
+ (curvelength.Get(j) - curvelength.Get(j-1));
+
+ np(0) = (1-lam) * edgepoints.Get(j-1)(0) + lam * edgepoints.Get(j)(0);
+ np(1) = (1-lam) * edgepoints.Get(j-1)(1) + lam * edgepoints.Get(j)(1);
+ np(2) = (1-lam) * edgepoints.Get(j-1)(2) + lam * edgepoints.Get(j)(2);
+
+
+ thispi = -1;
+ if (i == ne)
+ {
+ /*
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist(mesh[pi], np) < 1e-6)
+ thispi = pi;
+ */
+
+ meshpoint_tree -> GetIntersecting (np-Vec<3> (1e-6, 1e-6, 1e-6),
+ np+Vec<3> (1e-6, 1e-6, 1e-6), locsearch);
+ if (locsearch.Size())
+ thispi = locsearch[0];
+ }
+
+ if (thispi == -1)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np, layer);
+ meshpoint_tree -> Insert (np, thispi);
+ }
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = lastpi;
+ seg.p2 = thispi;
+ }
+ else
+ {
+ seg.p1 = thispi;
+ seg.p2 = lastpi;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+
+ double maxh = min2 (geometry.GetSurface(seg.surfnr1)->GetMaxH(),
+ geometry.GetSurface(seg.surfnr2)->GetMaxH());
+
+ if (seg.domin != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domin) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domin)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.domout != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domout) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domout)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.tlosurf != -1)
+ {
+ double hi = geometry.GetTopLevelObject(seg.tlosurf) -> GetMaxH();
+ maxh = min2 (maxh, hi);
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ }
+
+ p = np;
+ lastpi = thispi;
+ }
+
+#ifdef DEVELOP
+ (*testout) << " eplast = " << lastpi << " = " << p << endl;
+#endif
+ }
+
+
+
+
+
+
+ void EdgeCalculation ::
+ StoreShortEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+ Segment seg;
+
+ /*
+ double len, corr, lam;
+ int thispi, lastpi;
+ Point<3> p, np;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints[1], edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+ */
+
+ // generate initial point
+ Point<3> p = edgepoints[0];
+ PointIndex pi1 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi1 = pi;
+ break;
+ }
+
+ if (pi1 == -1)
+ {
+ pi1 = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, pi1);
+ }
+
+ p = edgepoints.Last();
+ PointIndex pi2 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi2 = pi;
+ break;
+ }
+ if (pi2==-1)
+ {
+ pi2 = mesh.AddPoint (p, layer);
+ meshpoint_tree -> Insert (p, pi2);
+ }
+
+ /*
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength[j] < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength[j-1]) /
+ (curvelength[j] - curvelength[j-1]);
+
+ np(0) = (1-lam) * edgepoints[j-1](0) + lam * edgepoints[j](0);
+ np(1) = (1-lam) * edgepoints[j-1](1) + lam * edgepoints[j](1);
+ np(2) = (1-lam) * edgepoints[j-1](2) + lam * edgepoints[j](2);
+
+
+ thispi = 0;
+ if (i == ne)
+ for (j = 1; j <= mesh.GetNP(); j++)
+ if (Dist(mesh.Point(j), np) < 1e-6)
+ thispi = j;
+
+ if (!thispi)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np);
+ }
+ */
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = pi1;
+ seg.p2 = pi2;
+ }
+ else
+ {
+ seg.p1 = pi2;
+ seg.p2 = pi1;
+ }
+
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ CopyEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ int copyfromedge,
+ const Point<3> & fromstart, const Point<3> & fromend,
+ const Point<3> & tostart, const Point<3> & toend,
+ int copyedgeidentification,
+ int layer,
+ Mesh & mesh)
+ {
+ int i, j, k;
+ PointIndex pi;
+
+ // copy start and end points
+ for (i = 1; i <= 2; i++)
+ {
+ Point<3> fromp =
+ (i == 1) ? fromstart : fromend;
+ Point<3> top =
+ (i == 1) ? tostart : toend;
+
+ PointIndex frompi = -1;
+ PointIndex topi = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ {
+ if (Dist2 (mesh[pi], fromp) <= 1e-16)
+ frompi = pi;
+ if (Dist2 (mesh[pi], top) <= 1e-16)
+ topi = pi;
+ }
+
+ if (topi == -1)
+ {
+ topi = mesh.AddPoint (top, layer);
+ meshpoint_tree -> Insert (top, topi);
+ }
+
+ const Identification & csi =
+ (*geometry.identifications.Get(copyedgeidentification));
+
+ if (csi.Identifyable (mesh[frompi], mesh[topi]))
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ else if (csi.Identifyable (mesh[topi], mesh[frompi]))
+ mesh.GetIdentifications().Add(topi, frompi, copyedgeidentification);
+ else
+ {
+ cerr << "edgeflw.cpp: should identify, but cannot";
+ exit(1);
+ }
+ /*
+ (*testout) << "Add Identification from CopyEdge, p1 = "
+ << mesh[PointIndex(frompi)] << ", p2 = "
+ << mesh[PointIndex(topi)] << endl;
+
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ */
+ }
+
+ int oldns = mesh.GetNSeg();
+ for (i = 1; i <= oldns; i++)
+ {
+ // real copy, since array might be reallocated !!
+ const Segment oldseg = mesh.LineSegment(i);
+ if (oldseg.edgenr != copyfromedge)
+ continue;
+ if (oldseg.seginfo == 0)
+ continue;
+
+ int pi1 = oldseg.p1;
+ int pi2 = oldseg.p2;
+
+ int npi1 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi1);
+ int npi2 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi2);
+
+ Segment seg;
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ int inv = refedgesinv.Get(k);
+
+ // other edge is inverse
+ if (oldseg.seginfo == 1)
+ inv = !inv;
+
+ // (*testout) << "inv, now = " << inv << endl;
+
+ if (inv)
+ {
+ seg.p1 = npi1;
+ seg.p2 = npi2;
+ }
+ else
+ {
+ seg.p1 = npi2;
+ seg.p2 = npi1;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = refedgesinv.Get(k) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "copy seg " << seg.p1 << "-" << seg.p2 << endl;
+#ifdef DEVELOP
+
+ (*testout) << "copy seg, face = " << seg.si << ": "
+ << " inv = " << inv << ", refinv = " << refedgesinv.Get(k)
+ << mesh.Point(seg.p1) << ", " << mesh.Point(seg.p2) << endl;
+#endif
+
+ }
+
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ FindClosedSurfaces (double h, Mesh & mesh)
+ {
+ // if there is no special point at a sphere, one has to add a segment pair
+
+ int i, j;
+ int nsol;
+ int nsurf = geometry.GetNSurf();
+ int layer;
+
+ BitArray pointatsurface (nsurf);
+ Point<3> p1, p2;
+ Vec<3> nv, tv;
+ Solid * tansol;
+ ARRAY<int> tansurfind;
+ // const Solid * sol;
+
+ nsol = geometry.GetNTopLevelObjects();
+
+
+ pointatsurface.Clear();
+
+ /*
+ for (i = 1; i <= specpoints.Size(); i++)
+ {
+ int classrep;
+
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s1);
+ pointatsurface.Set (classrep);
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s2);
+ pointatsurface.Set (classrep);
+ // pointatsurface.Set (specpoints[i].s1);
+ // pointatsurface.Set (specpoints[i].s2);
+ }
+ */
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ const Segment & seg = mesh.LineSegment(i);
+ int classrep;
+
+#ifdef DEVELOP
+ (*testout) << seg.surfnr1 << ", " << seg.surfnr2 << ", si = " << seg.si << endl;
+#endif
+ classrep = geometry.GetSurfaceClassRepresentant (seg.si);
+
+ pointatsurface.Set (classrep);
+ }
+
+
+ for (i = 0; i < nsurf; i++)
+ {
+ int classrep = geometry.GetSurfaceClassRepresentant (i);
+
+ if (!pointatsurface.Test(classrep))
+ {
+ const Surface * s = geometry.GetSurface(i);
+ p1 = s -> GetSurfacePoint();
+ s -> GetNormalVector (p1, nv);
+
+ double hloc =
+ min2 (s->LocH (p1, 3, 1, h), mesh.GetH(p1));
+
+ tv = nv.GetNormal ();
+ tv *= (hloc / tv.Length());
+ p2 = p1 + tv;
+ s->Project (p2);
+
+
+ Segment seg1;
+ seg1.si = i;
+ seg1.domin = -1;
+ seg1.domout = -1;
+
+ Segment seg2;
+ seg2.si = i;
+ seg2.domin = -1;
+ seg2.domout = -1;
+
+ seg1.surfnr1 = i;
+ seg2.surfnr1 = i;
+ seg1.surfnr2 = i;
+ seg2.surfnr2 = i;
+
+ for (j = 0; j < nsol; j++)
+ {
+ if (geometry.GetTopLevelObject(j)->GetSurface())
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(j)->GetSolid();
+ sol -> TangentialSolid (p1, tansol);
+ layer = geometry.GetTopLevelObject(j)->GetLayer();
+
+ if (tansol)
+ {
+ tansol -> GetSurfaceIndices (tansurfind);
+
+ if (tansurfind.Size() == 1 && tansurfind.Get(1) == i)
+ {
+ if (!tansol->VectorIn(p1, nv))
+ {
+ seg1.domin = j;
+ seg2.domin = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ else
+ {
+ seg1.domout = j;
+ seg2.domout = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ // seg.s2 = i;
+ // seg.invs1 = surfaces[i] -> Inverse();
+ // seg.invs2 = ! (surfaces[i] -> Inverse());
+ }
+ delete tansol;
+ }
+ }
+
+
+ if (seg1.domin != -1 || seg1.domout != -1)
+ {
+ mesh.AddPoint (p1, layer);
+ mesh.AddPoint (p2, layer);
+ seg1.p1 = mesh.GetNP()-1;
+ seg1.p2 = mesh.GetNP();
+ seg2.p2 = mesh.GetNP()-1;
+ seg2.p1 = mesh.GetNP();
+ seg1.geominfo[0].trignum = 1;
+ seg1.geominfo[1].trignum = 1;
+ seg2.geominfo[0].trignum = 1;
+ seg2.geominfo[1].trignum = 1;
+ mesh.AddSegment (seg1);
+ mesh.AddSegment (seg2);
+
+ PrintMessage (5, "Add line segment to smooth surface");
+
+#ifdef DEVELOP
+ (*testout) << "Add segment at smooth surface " << i;
+ if (i != classrep) (*testout) << ", classrep = " << classrep;
+ (*testout) << ": "
+ << mesh.Point (mesh.GetNP()-1) << " - "
+ << mesh.Point (mesh.GetNP()) << endl;
+#endif
+ }
+ }
+ }
+ }
+
+}
diff --git a/Netgen/libsrc/csg/edgeflw_old.cpp b/Netgen/libsrc/csg/edgeflw_old.cpp
new file mode 100644
index 0000000000..5321dfd17d
--- /dev/null
+++ b/Netgen/libsrc/csg/edgeflw_old.cpp
@@ -0,0 +1,1405 @@
+#include <mystdlib.h>
+#include <meshing.hpp>
+#include <csg.hpp>
+
+#undef DEVELOP
+
+namespace netgen
+{
+
+ EdgeCalculation ::
+ EdgeCalculation (const CSGeometry & ageometry,
+ ARRAY<SpecialPoint> & aspecpoints)
+ : geometry(ageometry), specpoints(aspecpoints)
+ {
+ ;
+ }
+
+ EdgeCalculation :: ~EdgeCalculation ()
+ { ; }
+
+ void EdgeCalculation :: Calc(double h, Mesh & mesh)
+ {
+ PrintMessage (1, "Find edges");
+ PushStatus ("Find edges");
+
+ CalcEdges1 (h, mesh);
+ SplitEqualOneSegEdges (mesh);
+ FindClosedSurfaces (h, mesh);
+ PrintMessage (3, cntedge, " edges found");
+
+ PopStatus ();
+ }
+
+
+
+
+ void EdgeCalculation :: CalcEdges1 (double h, Mesh & mesh)
+ {
+ ARRAY<SpecialPoint> hsp(specpoints.Size());
+ ARRAY<SpecialPoint> startpoints, endpoints;
+
+ int i, j, k, l, hi, pos, ep, ne;
+ int layer;
+
+ Vec<3> a1, a2, t, n, m;
+ Point<3> p, np, pnp, hp;
+
+ Segment seg;
+ int pi1, s1, s2;
+ int lastpi, thispi;
+
+ ARRAY<Point<3> > edgepoints;
+ ARRAY<double> curvelength;
+ int copyedge, copyfromedge, copyedgeidentification;
+
+ ARRAY<int> locsurfind;
+
+ double len, corr, lam;
+ double steplen, cursteplen, loch, hd;
+
+ int checkedcopy = 0;
+
+ double size = geometry.MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
+ double epspointdist2 = size * 1e-6; // globflags.GetNumFlag ("epspointdist", size * 1e-6);
+ epspointdist2 = sqr (epspointdist2);
+
+
+ Solid * locsol;
+
+
+ // copy special points to work with
+ for (i = 0; i < specpoints.Size(); i++)
+ hsp[i] = specpoints[i];
+
+
+ cntedge = 0;
+
+ while (hsp.Size())
+ {
+ SetThreadPercent(100 - 100 * double (hsp.Size()) / specpoints.Size());
+
+ edgepoints.SetSize (0);
+ curvelength.SetSize (0);
+
+
+ pi1 = 0;
+ copyedge = 0;
+ // identifyable point available ?
+
+ // (*testout) << endl;
+
+ for (i = 1; i <= geometry.identifications.Size() && !pi1; i++)
+ {
+ for (j = checkedcopy+1; j <= startpoints.Size() && !pi1; j++)
+ {
+
+ if (geometry.identifications.Get(i)->IdentifyableCandidate (startpoints.Get(j)))
+
+ {
+ int pi1cand = 0;
+ double mindist = 1e10;
+
+ for (k = 1; k <= hsp.Size() && !pi1; k++)
+ {
+#ifdef DEVELOP
+ (*testout) << "check kand = " << hsp.Get(k).p
+ << ", v = " << hsp.Get(k).v
+ << endl;
+#endif
+ if (geometry.identifications.Get(i)
+ ->Identifyable(startpoints.Get(j), hsp.Get(k)) ||
+ geometry.identifications.Get(i)
+ ->Identifyable(hsp.Get(k), startpoints.Get(j)))
+ {
+
+#ifdef DEVELOP
+ (*testout) << "identifiable, dist = "
+ << Dist (startpoints.Get(j).p, hsp.Get(k).p) << endl;
+#endif
+
+ if (Dist (startpoints.Get(j).p, hsp.Get(k).p) < mindist)
+ {
+ mindist = Dist (startpoints.Get(j).p, hsp.Get(k).p);
+ pi1cand = k;
+ }
+ /*
+ pi1 = k;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << hsp.Get(k).p << " - " << hsp.Get(k).v << endl;
+ */
+ }
+ }
+
+ if (pi1cand)
+ {
+ pi1 = pi1cand;
+ copyedge = 1;
+ copyfromedge = j;
+ copyedgeidentification = i;
+#ifdef DEVELOP
+ (*testout) << "copy edge startpoint from "
+ << startpoints.Get(j).p << " - "
+ << startpoints.Get(j).v
+ << " to "
+ << hsp.Get(pi1).p << " - " << hsp.Get(pi1).v << endl;
+#endif
+ }
+ }
+ }
+ }
+
+
+ // cannot copy from other ege ?
+ if (!pi1)
+ checkedcopy = startpoints.Size();
+
+ // unconditional special point available ?
+ if (!pi1)
+ for (i = 1; i <= hsp.Size() && pi1 == 0; i++)
+ if (hsp.Get(i).unconditional == 1)
+ pi1 = i;
+
+
+ if (!pi1)
+ {
+ // only unconditional points available, choose first
+ pi1 = 1;
+ }
+
+ layer = hsp.Get(pi1).GetLayer();
+
+
+ if (!hsp.Get(pi1).unconditional)
+ {
+ hsp.Elem(pi1).unconditional = 1;
+ for (i = 1; i <= hsp.Size(); i++)
+ if (i != pi1 && Dist (hsp.Get(pi1).p, hsp.Get(i).p) < 1e-8 &&
+ (hsp.Get(pi1).v + hsp.Get(i).v).Length() < 1e-4)
+ {
+ // opposite direction
+ hsp.Elem(i).unconditional = 1;
+ }
+ }
+
+ cntedge++;
+ startpoints.Append (hsp.Get(pi1));
+
+#ifdef DEVELOP
+ (*testout) << "edge nr " << cntedge << endl;
+ (*testout) << "start followedge: p1 = " << hsp.Get(pi1).p << ", v = " << hsp.Get(pi1).v << endl;
+#endif
+
+ FollowEdge (pi1, ep, pos, hsp, h, mesh,
+ edgepoints, curvelength);
+
+
+ if (multithread.terminate)
+ return;
+
+ if (!ep)
+ {
+ // ignore starting point
+ hsp.DeleteElement (pi1);
+ continue;
+ }
+
+
+
+ endpoints.Append (hsp.Get(ep));
+
+
+ double elen = 0;
+ for (i = 1; i <= edgepoints.Size()-1; i++)
+ elen += Dist (edgepoints.Get(i), edgepoints.Get(i+1));
+
+
+ int shortedge = 0;
+ for (i = 1; i <= geometry.identifications.Size(); i++)
+ if (geometry.identifications.Get(i)->ShortEdge(hsp.Get(pi1), hsp.Get(ep)))
+ shortedge = 1;
+ (*testout) << "shortedge = " << shortedge << endl;
+
+
+ if (!shortedge)
+ {
+ mesh.RestrictLocalHLine (Point3d (hsp.Get(pi1).p),
+ Point3d (hsp.Get(ep).p),
+ elen / mparam.segmentsperedge);
+ }
+
+ s1 = hsp.Get(pi1).s1;
+ s2 = hsp.Get(pi1).s2;
+
+
+ // delete initial, terminal and conditional points
+
+#ifdef DEVELOP
+ (*testout) << "terminal point: p = " << hsp.Get(ep).p << ", v = " << hsp.Get(ep).v << endl;
+#endif
+ if (ep > pi1)
+ {
+ hsp.DeleteElement (ep);
+ hsp.DeleteElement (pi1);
+ }
+ else
+ {
+ hsp.DeleteElement (pi1);
+ hsp.DeleteElement (ep);
+ }
+
+
+ for (j = 1; j <= edgepoints.Size()-1; j++)
+ {
+ p = edgepoints.Get(j);
+ np = Center (p, edgepoints.Get(j+1));
+ hd = Dist2 (p, np);
+
+ for (i = 1; i <= hsp.Size(); i++)
+ if ( hsp.Get(i).HasSurfaces (s1, s2) &&
+ hsp.Get(i).unconditional == 0 &&
+ Dist2 (np, hsp.Get(i).p) < 1.2 * hd)
+ {
+ hsp.DeleteElement (i);
+ i--;
+ }
+ }
+
+
+ ARRAY<Segment> refedges;
+ ARRAY<int> refedgesinv;
+
+
+ AnalyzeEdge (s1, s2, pos, layer,
+ edgepoints,
+ refedges, refedgesinv);
+
+ for (i = 1; i <= refedges.Size(); i++)
+ refedges.Elem(i).edgenr = cntedge;
+
+
+#ifdef DEVELOP
+ (*testout) << "edge " << cntedge << endl
+ << "startp: " << startpoints.Last().p
+ << ", v = " << startpoints.Last().v << endl
+ << "copy = " << copyedge << endl
+ << refedges.Size() << " refedges: ";
+ for (i = 1; i <= refedges.Size(); i++)
+ (*testout) << " " << refedges.Get(i).si;
+ (*testout) << endl;
+ (*testout) << "inv[1] = " << refedgesinv.Get(1) << endl;
+#endif
+
+ if (!copyedge)
+ {
+ int oldnseg = mesh.GetNSeg();
+
+ if (!shortedge)
+ StoreEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+ else
+ StoreShortEdge (refedges, refedgesinv,
+ edgepoints, curvelength, layer, mesh);
+
+
+ /*
+ for (i = oldnseg+1; i <= mesh.GetNSeg(); i++)
+ for (j = 1; j <= oldnseg; j++)
+ {
+ const Point<3> & l1p1 = mesh.Point (mesh.LineSegment(i).p1);
+ const Point<3> & l1p2 = mesh.Point (mesh.LineSegment(i).p2);
+ const Point<3> & l2p1 = mesh.Point (mesh.LineSegment(j).p1);
+ const Point<3> & l2p2 = mesh.Point (mesh.LineSegment(j).p2);
+ Vec<3> vl1(l1p1, l1p2);
+ for (double lamk = 0; lamk <= 1; lamk += 0.1)
+ {
+ Point<3> l2p = l1p1 + lamk * vl1;
+ double dist = sqrt (MinDistLP2 (l2p1, l2p2, l2p));
+ if (dist > 1e-12)
+ mesh.RestrictLocalH (l2p, 3*dist);
+ }
+ }
+ */
+ }
+ else
+ {
+ CopyEdge (refedges, refedgesinv,
+ copyfromedge,
+ startpoints.Get(copyfromedge).p,
+ endpoints.Get(copyfromedge).p,
+ edgepoints.Get(1), edgepoints.Last(),
+ copyedgeidentification,
+ layer,
+ mesh);
+ }
+
+ }
+ }
+
+
+
+ /*
+ If two or more edges share the same initial and end-points,
+ then they need at least two segments
+ */
+ void EdgeCalculation ::
+ SplitEqualOneSegEdges (Mesh & mesh)
+ {
+ int i, j;
+ SegmentIndex si;
+ PointIndex pi;
+
+ ARRAY<int> osedges(cntedge);
+ INDEX_2_HASHTABLE<int> osedgesht (cntedge+1);
+
+ osedges = 2;
+
+ // count segments on edges
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ osedges.Elem(seg.edgenr)--;
+ }
+
+ (*testout) << "osedges = " << osedges << endl;
+
+ // flag one segment edges
+ for (i = 0; i < cntedge; i++)
+ osedges[i] = (osedges[i] > 0) ? 1 : 0;
+
+ (*testout) << "osedges, now = " << osedges << endl;
+
+ for (si = 0; si < mesh.GetNSeg(); si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr))
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2))
+ osedgesht.Set (i2, 2);
+ else
+ osedgesht.Set (i2, 1);
+ }
+ }
+ }
+
+
+ // one edge 1 segment, other 2 segments
+ // yes, it happens !
+
+ for (i = 1; i <= osedgesht.GetNBags(); i++)
+ for (j = 1; j <= osedgesht.GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int val;
+ osedgesht.GetData (i, j, i2, val);
+
+ const Point<3> & p1 = mesh[PointIndex(i2.I1())];
+ const Point<3> & p2 = mesh[PointIndex(i2.I2())];
+ Vec<3> v = p2 - p1;
+ double vlen = v.Length();
+ v /= vlen;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (pi != i2.I1() && pi != i2.I2())
+ {
+ const Point<3> & p = mesh[pi];
+ Vec<3> v2 = p - p1;
+ double lam = (v2 * v);
+ if (lam > 0 && lam < vlen)
+ {
+ Point<3> hp = p1 + lam * v;
+ if (Dist (p, hp) < 1e-4 * vlen)
+ {
+ PrintSysError ("Point on edge !!!");
+ cout << "seg: " << i2 << ", p = " << pi << endl;
+ osedgesht.Set (i2, 2);
+ }
+ }
+ }
+ }
+
+
+ // insert new points
+ osedges = -1;
+
+ int nseg = mesh.GetNSeg();
+ for (si = 0; si < nseg; si++)
+ {
+ const Segment & seg = mesh[si];
+ if (seg.seginfo && seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort ();
+ if (osedgesht.Used (i2) &&
+ osedgesht.Get (i2) == 2 &&
+ osedges.Elem(seg.edgenr) == -1)
+ {
+ Point<3> newp = Center (mesh[PointIndex(seg.p1)],
+ mesh[PointIndex(seg.p2)]);
+
+ ProjectToEdge (geometry.GetSurface(seg.surfnr1),
+ geometry.GetSurface(seg.surfnr2),
+ newp);
+
+ osedges.Elem(seg.edgenr) =
+ mesh.AddPoint (newp, mesh[PointIndex(seg.p1)].GetLayer());
+ }
+ }
+ }
+
+
+ for (i = 1; i <= nseg; i++)
+ {
+ Segment & seg = mesh.LineSegment (i);
+ if (seg.edgenr >= 1 && seg.edgenr <= cntedge)
+ {
+ if (osedges.Get(seg.edgenr) != -1)
+ {
+ Segment newseg = seg;
+ newseg.p1 = osedges.Get(seg.edgenr);
+ seg.p2 = osedges.Get(seg.edgenr);
+ mesh.AddSegment (newseg);
+ }
+ }
+ }
+
+ }
+
+
+
+ void EdgeCalculation ::
+ FollowEdge (int pi1, int & ep, int & pos,
+ const ARRAY<SpecialPoint> & hsp,
+ double h, const Mesh & mesh,
+ ARRAY<Point<3> > & edgepoints,
+ ARRAY<double> & curvelength)
+ {
+ int i, j, s1, s2;
+ double len, steplen, cursteplen, loch;
+ Point<3> p, np, pnp;
+ Vec<3> a1, a2, t;
+
+
+ double size = geometry.MaxSize();
+ double epspointdist2 = size * 1e-6;
+ epspointdist2 = sqr (epspointdist2);
+ int uselocalh = mparam.uselocalh;
+
+
+ s1 = hsp.Get(pi1).s1;
+ s2 = hsp.Get(pi1).s2;
+
+ p = hsp.Get(pi1).p;
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+
+ t = Cross (a1, a2);
+ t.Normalize();
+
+ pos = (hsp.Get(pi1).v * t) > 0;
+ if (!pos) t *= -1;
+
+
+ edgepoints.Append (p);
+ curvelength.Append (0);
+ len = 0;
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (p, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (p, 3, 1, h));
+
+
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(p);
+ if (lh < loch)
+ loch = lh;
+ }
+
+ steplen = 0.1 * loch;
+
+ do
+ {
+ if (multithread.terminate)
+ return;
+
+ if (fabs (p(0)) + fabs (p(1)) + fabs (p(2)) > 10000)
+ {
+ ep = 0;
+ PrintWarning ("Give up line");
+ break;
+ }
+
+ if (steplen > 0.1 * loch) steplen = 0.1 * loch;
+
+ steplen *= 2;
+ do
+ {
+ steplen *= 0.5;
+ np = p + steplen * t;
+ pnp = np;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), pnp);
+ }
+ while (Dist (np, pnp) > 0.1 * steplen);
+
+ cursteplen = steplen;
+ if (Dist (np, pnp) < 0.01 * steplen) steplen *= 2;
+
+
+ np = pnp;
+
+#ifdef MYGRAPH
+ if (silentflag <= 2)
+ {
+ MyLine3D (p, np, rot);
+ MyDraw ();
+ }
+#endif
+
+ ep = 0;
+
+ double hvtmin = 1.5 * cursteplen;
+
+ Box<3> boxp (p - (2 * cursteplen) * Vec<3> (1, 1, 1),
+ p + (2 * cursteplen) * Vec<3> (1, 1, 1));
+
+ for (i = 1; i <= hsp.Size(); i++)
+ // if ( i != pi1 && hsp.Get(i).HasSurfaces (s1, s2) )
+ {
+ if (!boxp.IsIn (hsp.Get(i).p))
+ continue;
+
+ Vec<3> hv = hsp.Get(i).p - p;
+ if (hv.Length2() > 9 * cursteplen * cursteplen)
+ continue;
+
+ /*
+ if (!hsp.Get(i).HasSurfaces (s1, s2))
+ continue; // test for dalibor-problem
+ */
+
+ double hvt = hv * t;
+ hv -= hvt * t;
+
+ if (hv.Length() < 0.2 * cursteplen &&
+ hvt > 0 &&
+ // hvt < 1.5 * cursteplen &&
+ hvt < hvtmin &&
+ hsp.Get(i).unconditional == 1 &&
+ (hsp.Get(i).v + t).Length() < 0.4 )
+ {
+ Point<3> hep = hsp.Get(i).p;
+ ProjectToEdge (geometry.GetSurface(s1),
+ geometry.GetSurface(s2), hep);
+
+
+ if (Dist2 (hep, hsp.Get(i).p) < epspointdist2 )
+ {
+ geometry.GetSurface(s1) -> CalcGradient (hep, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hep, a2);
+ Vec<3> ept = Cross (a1, a2);
+ ept /= ept.Length();
+ if (!pos) ept *= -1;
+
+ if ( (hsp.Get(i).v + ept).Length() < 1e-4 )
+ {
+ np = hsp.Get(i).p;
+ ep = i;
+ hvtmin = hvt;
+ // break;
+ }
+ }
+ }
+ }
+
+ loch = min2 (geometry.GetSurface(s1) -> LocH (np, 3, 1, h),
+ geometry.GetSurface(s2) -> LocH (np, 3, 1, h));
+
+ if (uselocalh)
+ {
+ double lh = mesh.GetH(np);
+ if (lh < loch)
+ loch = lh;
+ }
+
+
+ len += Dist (p, np) / loch;
+ edgepoints.Append (np);
+ curvelength.Append (len);
+
+ p = np;
+
+ geometry.GetSurface(s1) -> CalcGradient (p, a1);
+ geometry.GetSurface(s2) -> CalcGradient (p, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+ }
+ while (! ep);
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ AnalyzeEdge (int s1, int s2, int pos, int layer,
+ const ARRAY<Point<3> > & edgepoints,
+ ARRAY<Segment> & refedges,
+ ARRAY<int> & refedgesinv)
+ {
+ int i, j, k, l;
+ int hi;
+ Point<3> hp;
+ Vec<3> t, a1, a2, m, n;
+ Segment seg;
+ Solid * locsol;
+ ARRAY<int> locsurfind;
+
+ /*
+ int pi1 = 0, pi2 = 0;
+ extern Mesh * mesh;
+ for (i = 1; i <= mesh->GetNP(); i++)
+ {
+ if (Dist2 (edgepoints.Get(1), mesh->Point(i)) < 1e-12)
+ pi1 = i;
+ if (Dist2 (edgepoints.Last(), mesh->Point(i)) < 1e-12)
+ pi2 = i;
+ }
+ (*testout) << "Analyze edge: " << pi1 << " - " << pi2 << ", pts = " << edgepoints.Size() << endl;
+ (*testout) << "p1 = " << edgepoints.Get(1) << " pl = " << edgepoints.Last() << endl;
+ */
+ int debug = 0;
+ /*
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Get(1)) < 1e-6 ||
+ Dist2 (Point<3> (2.69642, 1.1866, 2.03), edgepoints.Last()) < 1e-6;
+ */
+
+ if (debug)
+ {
+ // (*testout) << "tubious edge !!!" << endl;
+ (*testout) << "s1, s2 = " << s1 << " - " << s2 << endl;
+ }
+
+ refedges.SetSize(0);
+ refedgesinv.SetSize(0);
+ hp = Center (edgepoints.Get(1), edgepoints.Get(2));
+ ProjectToEdge (geometry.GetSurface(s1), geometry.GetSurface(s2), hp);
+
+ geometry.GetSurface(s1) -> CalcGradient (hp, a1);
+ geometry.GetSurface(s2) -> CalcGradient (hp, a2);
+ t = Cross (a1, a2);
+ t.Normalize();
+ if (!pos) t *= -1;
+
+ (*testout) << "t = " << t << endl;
+
+ for (i = 0; i < geometry.GetNTopLevelObjects(); i++)
+ {
+ (*testout) << "layer = " << layer
+ << ", tlo-layer = " << geometry.GetTopLevelObject(i)->GetLayer() << endl;
+ if (geometry.GetTopLevelObject(i)->GetLayer() != layer)
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(i)->GetSolid();
+ const Surface * surf = geometry.GetTopLevelObject(i)->GetSurface();
+
+ sol -> TangentialSolid (hp, locsol);
+ if (!locsol) continue;
+
+ BoxSphere<3> boxp (hp, hp);
+ boxp.Increase (1e-5);
+ boxp.CalcDiamCenter();
+
+ ReducePrimitiveIterator rpi(boxp);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)locsol) -> IterateSolid (rpi);
+
+ locsol -> CalcSurfaceInverse ();
+
+
+ if (!surf)
+ {
+ locsol -> GetSurfaceIndices (locsurfind);
+ }
+ else
+ {
+ /*
+ if (fabs (surf->CalcFunctionValue (hp)) < 1e-6)
+ continue;
+ */
+ locsurfind.SetSize(1);
+ locsurfind[0] = -1;
+ for (j = 0; j < geometry.GetNSurf(); j++)
+ if (geometry.GetSurface(j) == surf)
+ {
+ locsurfind[0] = j;
+ // geometry.GetSurfaceClassRepresentant(j);
+ break;
+ }
+ }
+
+ ((Solid*)locsol) -> IterateSolid (urpi);
+
+
+ if (debug)
+ (*testout) << "edge of tlo " << i << ", has " << locsurfind.Size() << " faces." << endl;
+
+
+ for (j = locsurfind.Size()-1; j >= 0; j--)
+ if (fabs (geometry.GetSurface(locsurfind[j])
+ ->CalcFunctionValue (hp) ) > 1e-6)
+ locsurfind.DeleteElement(j+1);
+
+ if (debug)
+ (*testout) << locsurfind.Size() << " faces on hp" << endl;
+
+ for (j = 0; j < locsurfind.Size(); j++)
+ {
+ int lsi = locsurfind[j];
+ int rlsi = geometry.GetSurfaceClassRepresentant(lsi);
+
+ Vec<3> rn;
+
+ // n is outer normal to solid
+ geometry.GetSurface(lsi) -> GetNormalVector (hp, n);
+ if (geometry.GetSurface (lsi)->Inverse())
+ n *= -1;
+
+ if (fabs (t * n) > 1e-4) continue;
+ if (debug)
+ {
+ (*testout) << "face " << locsurfind.Get(j) << ", rep = " << rlsi
+ << " has (t*n) = " << (t*n) << endl;
+ (*testout) << "n = " << n << endl;
+ }
+
+ // rn is normal to class representant
+ geometry.GetSurface(rlsi) -> GetNormalVector (hp, rn);
+
+ int sameasref = ((n * rn) > 0);
+
+ m = Cross (t, rn);
+ m.Normalize();
+
+
+ for (k = 1; k <= 2; k ++)
+ {
+ bool edgeinv = (k == 2);
+
+ if (debug)
+ {
+ (*testout) << "onface(" << hp << ", " << m << ")= "
+ << locsol->OnFace (hp, m);
+ (*testout) << " vec2in = "
+ << locsol -> VectorIn2 (hp, m, n) << " and "
+ << locsol -> VectorIn2 (hp, m, -1 * n) << endl;
+ }
+
+ // if (locsol -> OnFace (hp, m))
+ if (locsol -> VectorIn2 (hp, m, n) == 0 &&
+ locsol -> VectorIn2 (hp, m, -1 * n) == 1)
+ {
+ hi = 0;
+ for (l = 1; l <= refedges.Size(); l++)
+ {
+ if (refedges.Get(l).si == rlsi &&
+ refedgesinv.Get(l) == edgeinv)
+ hi = l;
+ }
+
+ if (!hi)
+ {
+ seg.si = rlsi;
+ seg.domin = -1;
+ seg.domout = -1;
+ seg.tlosurf = -1;
+ seg.surfnr1 = s1;
+ seg.surfnr2 = s2;
+ hi = refedges.Append (seg);
+ refedgesinv.Append (edgeinv);
+ }
+
+ if (!surf)
+ {
+ if (sameasref)
+ refedges.Elem(hi).domin = i;
+ else
+ refedges.Elem(hi).domout = i;
+ }
+ else
+ refedges.Elem(hi).tlosurf = i;
+
+ if (debug)
+ (*testout) << "add ref seg:"
+ << "si = " << refedges.Get(hi).si
+ << ", domin = " << refedges.Get(hi).domin
+ << ", domout = " << refedges.Get(hi).domout
+ << ", surfnr1/2 = " << refedges.Get(hi).surfnr1
+ << ", " << refedges.Get(hi).surfnr2
+ << ", inv = " << refedgesinv.Get(hi)
+ << ", refedgenr = " << hi
+ << endl;
+ }
+ m *= -1;
+ }
+ }
+ delete locsol;
+ }
+ }
+
+
+
+ void EdgeCalculation ::
+ StoreEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+
+ double len, corr, lam;
+ PointIndex thispi, lastpi;
+ Point<3> p, np;
+ Segment seg;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints.Get(1), edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+
+ // generate initial point
+ p = edgepoints.Get(1);
+ lastpi = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ lastpi = pi;
+ break;
+ }
+
+ if (lastpi == -1)
+ lastpi = mesh.AddPoint (p, layer);
+
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength.Get(j) < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength.Get(j-1)) /
+ (curvelength.Get(j) - curvelength.Get(j-1));
+
+ np(0) = (1-lam) * edgepoints.Get(j-1)(0) + lam * edgepoints.Get(j)(0);
+ np(1) = (1-lam) * edgepoints.Get(j-1)(1) + lam * edgepoints.Get(j)(1);
+ np(2) = (1-lam) * edgepoints.Get(j-1)(2) + lam * edgepoints.Get(j)(2);
+
+
+ thispi = -1;
+ if (i == ne)
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ if (Dist(mesh[pi], np) < 1e-6)
+ thispi = pi;
+
+ if (thispi == -1)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np, layer);
+ }
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = lastpi;
+ seg.p2 = thispi;
+ }
+ else
+ {
+ seg.p1 = thispi;
+ seg.p2 = lastpi;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+
+ double maxh = min2 (geometry.GetSurface(seg.surfnr1)->GetMaxH(),
+ geometry.GetSurface(seg.surfnr2)->GetMaxH());
+
+ if (seg.domin != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domin) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domin)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.domout != -1)
+ {
+ const Solid * s1 =
+ geometry.GetTopLevelObject(seg.domout) -> GetSolid();
+ maxh = min2 (maxh, s1->GetMaxH());
+ maxh = min2 (maxh, geometry.GetTopLevelObject(seg.domout)->GetMaxH());
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ if (seg.tlosurf != -1)
+ {
+ double hi = geometry.GetTopLevelObject(seg.tlosurf) -> GetMaxH();
+ maxh = min2 (maxh, hi);
+ mesh.RestrictLocalH (p, maxh);
+ mesh.RestrictLocalH (np, maxh);
+ }
+ }
+
+ p = np;
+ lastpi = thispi;
+ }
+
+#ifdef DEVELOP
+ (*testout) << " eplast = " << lastpi << " = " << p << endl;
+#endif
+ }
+
+
+
+
+
+
+ void EdgeCalculation ::
+ StoreShortEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ const ARRAY<Point<3> > & edgepoints,
+ const ARRAY<double> & curvelength,
+ int layer,
+ Mesh & mesh)
+ {
+
+ // Calculate optimal element-length
+ int i, j, k;
+ PointIndex pi;
+ int ne;
+ Segment seg;
+
+ /*
+ double len, corr, lam;
+ int thispi, lastpi;
+ Point<3> p, np;
+
+
+ const Surface * surf1 = geometry.GetSurface (refedges.Get(1).surfnr1);
+ const Surface * surf2 = geometry.GetSurface (refedges.Get(1).surfnr2);
+
+ len = curvelength.Last();
+ ne = int (len + 0.5);
+ if (ne == 0) ne = 1;
+ if (Dist2 (edgepoints[1], edgepoints.Last()) < 1e-8 &&
+ ne <= 6)
+ ne = 6;
+ corr = len / ne;
+ */
+
+ // generate initial point
+ Point<3> p = edgepoints[0];
+ PointIndex pi1 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi1 = pi;
+ break;
+ }
+
+ if (pi1 == -1) pi1 = mesh.AddPoint (p, layer);
+
+ p = edgepoints.Last();
+ PointIndex pi2 = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (Dist (mesh[pi], p) < 1e-6)
+ {
+ pi2 = pi;
+ break;
+ }
+ if (pi2==-1) pi2 = mesh.AddPoint (p, layer);
+
+ /*
+
+ j = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ while (curvelength[j] < i * corr && j < curvelength.Size()) j++;
+
+ lam = (i * corr - curvelength[j-1]) /
+ (curvelength[j] - curvelength[j-1]);
+
+ np(0) = (1-lam) * edgepoints[j-1](0) + lam * edgepoints[j](0);
+ np(1) = (1-lam) * edgepoints[j-1](1) + lam * edgepoints[j](1);
+ np(2) = (1-lam) * edgepoints[j-1](2) + lam * edgepoints[j](2);
+
+
+ thispi = 0;
+ if (i == ne)
+ for (j = 1; j <= mesh.GetNP(); j++)
+ if (Dist(mesh.Point(j), np) < 1e-6)
+ thispi = j;
+
+ if (!thispi)
+ {
+ ProjectToEdge (surf1, surf2, np);
+ thispi = mesh.AddPoint (np);
+ }
+ */
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ if (refedgesinv.Get(k))
+ {
+ seg.p1 = pi1;
+ seg.p2 = pi2;
+ }
+ else
+ {
+ seg.p1 = pi2;
+ seg.p2 = pi1;
+ }
+
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = (refedgesinv.Get(k)) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "add seg " << seg.p1 << "-" << seg.p2 << endl;
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ CopyEdge (const ARRAY<Segment> & refedges,
+ const ARRAY<int> & refedgesinv,
+ int copyfromedge,
+ const Point<3> & fromstart, const Point<3> & fromend,
+ const Point<3> & tostart, const Point<3> & toend,
+ int copyedgeidentification,
+ int layer,
+ Mesh & mesh)
+ {
+ int i, j, k;
+ PointIndex pi;
+
+ // copy start and end points
+ for (i = 1; i <= 2; i++)
+ {
+ Point<3> fromp =
+ (i == 1) ? fromstart : fromend;
+ Point<3> top =
+ (i == 1) ? tostart : toend;
+
+ PointIndex frompi = -1;
+ PointIndex topi = -1;
+ for (pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+ {
+ if (Dist2 (mesh[pi], fromp) <= 1e-16)
+ frompi = pi;
+ if (Dist2 (mesh[pi], top) <= 1e-16)
+ topi = pi;
+ }
+
+ if (topi == -1)
+ topi = mesh.AddPoint (top, layer);
+
+ const Identification & csi =
+ (*geometry.identifications.Get(copyedgeidentification));
+
+ if (csi.Identifyable (mesh[frompi], mesh[topi]))
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ else if (csi.Identifyable (mesh[topi], mesh[frompi]))
+ mesh.GetIdentifications().Add(topi, frompi, copyedgeidentification);
+ else
+ {
+ cerr << "edgeflw.cpp: should identify, but cannot";
+ exit(1);
+ }
+ /*
+ (*testout) << "Add Identification from CopyEdge, p1 = "
+ << mesh[PointIndex(frompi)] << ", p2 = "
+ << mesh[PointIndex(topi)] << endl;
+
+ mesh.GetIdentifications().Add(frompi, topi, copyedgeidentification);
+ */
+ }
+
+ int oldns = mesh.GetNSeg();
+ for (i = 1; i <= oldns; i++)
+ {
+ // real copy, since array might be reallocated !!
+ const Segment oldseg = mesh.LineSegment(i);
+ if (oldseg.edgenr != copyfromedge)
+ continue;
+ if (oldseg.seginfo == 0)
+ continue;
+
+ int pi1 = oldseg.p1;
+ int pi2 = oldseg.p2;
+
+ int npi1 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi1);
+ int npi2 = geometry.identifications.Get(copyedgeidentification)
+ -> GetIdentifiedPoint (mesh, pi2);
+
+ Segment seg;
+
+ for (k = 1; k <= refedges.Size(); k++)
+ {
+ int inv = refedgesinv.Get(k);
+
+ // other edge is inverse
+ if (oldseg.seginfo == 1)
+ inv = !inv;
+
+ // (*testout) << "inv, now = " << inv << endl;
+
+ if (inv)
+ {
+ seg.p1 = npi1;
+ seg.p2 = npi2;
+ }
+ else
+ {
+ seg.p1 = npi2;
+ seg.p2 = npi1;
+ }
+ seg.si = refedges.Get(k).si;
+ seg.domin = refedges.Get(k).domin;
+ seg.domout = refedges.Get(k).domout;
+ seg.tlosurf = refedges.Get(k).tlosurf;
+ seg.edgenr = refedges.Get(k).edgenr;
+ seg.surfnr1 = refedges.Get(k).surfnr1;
+ seg.surfnr2 = refedges.Get(k).surfnr2;
+ seg.seginfo = 0;
+ if (k == 1) seg.seginfo = refedgesinv.Get(k) ? 2 : 1;
+ mesh.AddSegment (seg);
+ // (*testout) << "copy seg " << seg.p1 << "-" << seg.p2 << endl;
+#ifdef DEVELOP
+
+ (*testout) << "copy seg, face = " << seg.si << ": "
+ << " inv = " << inv << ", refinv = " << refedgesinv.Get(k)
+ << mesh.Point(seg.p1) << ", " << mesh.Point(seg.p2) << endl;
+#endif
+
+ }
+
+ }
+ }
+
+
+
+
+
+
+
+ void EdgeCalculation ::
+ FindClosedSurfaces (double h, Mesh & mesh)
+ {
+ // if there is no special point at a sphere, one has to add a segment pair
+
+ int i, j;
+ int nsol;
+ int nsurf = geometry.GetNSurf();
+ int layer;
+
+ BitArray pointatsurface (nsurf);
+ Point<3> p1, p2;
+ Vec<3> nv, tv;
+ Solid * tansol;
+ ARRAY<int> tansurfind;
+ // const Solid * sol;
+
+ nsol = geometry.GetNTopLevelObjects();
+
+
+ pointatsurface.Clear();
+
+ /*
+ for (i = 1; i <= specpoints.Size(); i++)
+ {
+ int classrep;
+
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s1);
+ pointatsurface.Set (classrep);
+ classrep = geometry.GetSurfaceClassRepresentant (specpoints[i].s2);
+ pointatsurface.Set (classrep);
+ // pointatsurface.Set (specpoints[i].s1);
+ // pointatsurface.Set (specpoints[i].s2);
+ }
+ */
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ const Segment & seg = mesh.LineSegment(i);
+ int classrep;
+
+#ifdef DEVELOP
+ (*testout) << seg.surfnr1 << ", " << seg.surfnr2 << ", si = " << seg.si << endl;
+#endif
+ classrep = geometry.GetSurfaceClassRepresentant (seg.si);
+
+ pointatsurface.Set (classrep);
+ }
+
+
+ for (i = 0; i < nsurf; i++)
+ {
+ int classrep = geometry.GetSurfaceClassRepresentant (i);
+
+ if (!pointatsurface.Test(classrep))
+ {
+ const Surface * s = geometry.GetSurface(i);
+ p1 = s -> GetSurfacePoint();
+ s -> GetNormalVector (p1, nv);
+
+ double hloc =
+ min2 (s->LocH (p1, 3, 1, h), mesh.GetH(p1));
+
+ tv = nv.GetNormal ();
+ tv *= (hloc / tv.Length());
+ p2 = p1 + tv;
+ s->Project (p2);
+
+
+ Segment seg1;
+ seg1.si = i;
+ seg1.domin = -1;
+ seg1.domout = -1;
+
+ Segment seg2;
+ seg2.si = i;
+ seg2.domin = -1;
+ seg2.domout = -1;
+
+ seg1.surfnr1 = i;
+ seg2.surfnr1 = i;
+ seg1.surfnr2 = i;
+ seg2.surfnr2 = i;
+
+ for (j = 0; j < nsol; j++)
+ {
+ if (geometry.GetTopLevelObject(j)->GetSurface())
+ continue;
+
+ const Solid * sol = geometry.GetTopLevelObject(j)->GetSolid();
+ sol -> TangentialSolid (p1, tansol);
+ layer = geometry.GetTopLevelObject(j)->GetLayer();
+
+ if (tansol)
+ {
+ tansol -> GetSurfaceIndices (tansurfind);
+
+ if (tansurfind.Size() == 1 && tansurfind.Get(1) == i)
+ {
+ if (!tansol->VectorIn(p1, nv))
+ {
+ seg1.domin = j;
+ seg2.domin = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ else
+ {
+ seg1.domout = j;
+ seg2.domout = j;
+ seg1.tlosurf = j;
+ seg2.tlosurf = j;
+ }
+ // seg.s2 = i;
+ // seg.invs1 = surfaces[i] -> Inverse();
+ // seg.invs2 = ! (surfaces[i] -> Inverse());
+ }
+ delete tansol;
+ }
+ }
+
+
+ if (seg1.domin != -1 || seg1.domout != -1)
+ {
+ mesh.AddPoint (p1, layer);
+ mesh.AddPoint (p2, layer);
+ seg1.p1 = mesh.GetNP()-1;
+ seg1.p2 = mesh.GetNP();
+ seg2.p2 = mesh.GetNP()-1;
+ seg2.p1 = mesh.GetNP();
+ seg1.geominfo[0].trignum = 1;
+ seg1.geominfo[1].trignum = 1;
+ seg2.geominfo[0].trignum = 1;
+ seg2.geominfo[1].trignum = 1;
+ mesh.AddSegment (seg1);
+ mesh.AddSegment (seg2);
+
+ PrintMessage (5, "Add line segment to smooth surface");
+
+#ifdef DEVELOP
+ (*testout) << "Add segment at smooth surface " << i;
+ if (i != classrep) (*testout) << ", classrep = " << classrep;
+ (*testout) << ": "
+ << mesh.Point (mesh.GetNP()-1) << " - "
+ << mesh.Point (mesh.GetNP()) << endl;
+#endif
+ }
+ }
+ }
+ }
+
+}
diff --git a/Netgen/libsrc/csg/genmesh.cpp b/Netgen/libsrc/csg/genmesh.cpp
index 62a336e260..c052624a42 100644
--- a/Netgen/libsrc/csg/genmesh.cpp
+++ b/Netgen/libsrc/csg/genmesh.cpp
@@ -1,709 +1,684 @@
#include <mystdlib.h>
-// #include <FlexLexer.h>
-
#include <myadt.hpp>
#include <linalg.hpp>
#include <csg.hpp>
-#include <stlgeom.hpp>
#include <meshing.hpp>
+
namespace netgen
{
-ARRAY<SpecialPoint> specpoints;
-static ARRAY<MeshPoint> spoints;
+ ARRAY<SpecialPoint> specpoints;
+ static ARRAY<MeshPoint> spoints;
#define TCL_OK 0
#define TCL_ERROR 1
-static void FindPoints (CSGeometry & geom, Mesh & mesh,
- const char * filename)
-{
- int i;
- PrintMessage (1, "Start Findpoints");
- char * savetask = multithread.task;
- multithread.task = "Find points";
+ static void FindPoints (CSGeometry & geom, Mesh & mesh)
+ {
+ PrintMessage (1, "Start Findpoints");
- for (i = 0; i < geom.GetNUserPoints(); i++)
- {
- mesh.AddPoint (geom.GetUserPoint (i));
- mesh.AddLockedPoint (PointIndex (i+1));
- }
+ char * savetask = multithread.task;
+ multithread.task = "Find points";
- SpecialPointCalculation spc;
+ for (int i = 0; i < geom.GetNUserPoints(); i++)
+ {
+ mesh.AddPoint (geom.GetUserPoint (i));
+ mesh.AddLockedPoint (PointIndex (i+1));
+ }
- if (spoints.Size() == 0)
- spc.CalcSpecialPoints (geom, spoints);
+ SpecialPointCalculation spc;
- PrintMessage (2, "Analyze spec points");
- spc.AnalyzeSpecialPoints (geom, spoints, specpoints);
+ if (spoints.Size() == 0)
+ spc.CalcSpecialPoints (geom, spoints);
+
+ PrintMessage (2, "Analyze spec points");
+ spc.AnalyzeSpecialPoints (geom, spoints, specpoints);
- PrintMessage (5, "done");
+ PrintMessage (5, "done");
+
+ (*testout) << specpoints.Size() << " special points:" << endl;
+ for (int i = 0; i < specpoints.Size(); i++)
+ specpoints[i].Print (*testout);
+
+ /*
+ for (int i = 1; i <= geom.identifications.Size(); i++)
+ geom.identifications.Elem(i)->IdentifySpecialPoints (specpoints);
+ */
+ multithread.task = savetask;
+ }
+
+
+
+
+
+
+ static void FindEdges (CSGeometry & geom, Mesh & mesh)
+ {
+ EdgeCalculation ec (geom, specpoints);
+ ec.Calc (mparam.maxh, mesh);
+
+ for (int i = 0; i < geom.singedges.Size(); i++)
+ geom.singedges[i]->FindPointsOnEdge (mesh);
+ for (int i = 0; i < geom.singpoints.Size(); i++)
+ geom.singpoints[i]->FindPoints (mesh);
+
+ for (int i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ int ok = 0;
+ for (int k = 1; k <= mesh.GetNFD(); k++)
+ if (mesh.GetFaceDescriptor(k).SegmentFits (mesh.LineSegment(i)))
+ ok = k;
+
+ if (!ok)
+ ok = mesh.AddFaceDescriptor (FaceDescriptor (mesh.LineSegment(i)));
+
+ mesh.LineSegment(i).si = ok;
+ }
+
+ for (int i = 0; i < geom.identifications.Size(); i++)
+ geom.identifications[i]->IdentifyPoints (mesh);
+ for (int i = 0; i < geom.identifications.Size(); i++)
+ geom.identifications[i]->IdentifyFaces (mesh);
+
+
+
+ // find intersecting segments
+ PrintMessage (3, "Check intersecting edges");
+
+ if (!ec.point_on_edge_problem)
+ for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
+ for (SegmentIndex sj = 0; sj < si; sj++)
+ {
+ if (!mesh[si].seginfo || !mesh[sj].seginfo) continue;
+ if (mesh[mesh[si].p1].GetLayer() != mesh[mesh[sj].p2].GetLayer()) continue;
+
+ Point<3> pi1 = mesh[mesh[si].p1];
+ Point<3> pi2 = mesh[mesh[si].p2];
+ Point<3> pj1 = mesh[mesh[sj].p1];
+ Point<3> pj2 = mesh[mesh[sj].p2];
+ Vec<3> vi = pi2 - pi1;
+ Vec<3> vj = pj2 - pj1;
+
+ if (sqr (vi * vj) > (1-1e-6) * Abs2 (vi) * Abs2 (vj)) continue;
+
+ // pi1 + vi t = pj1 + vj s
+ Mat<3,2> mat;
+ Vec<3> rhs;
+ Vec<2> sol;
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(j,0) = vi(j);
+ mat(j,1) = -vj(j);
+ rhs(j) = pj1(j)-pi1(j);
+ }
+
+ mat.Solve (rhs, sol);
- (*testout) << specpoints.Size() << " special points:" << endl;
- for (i = 0; i < specpoints.Size(); i++)
- specpoints[i].Print (*testout);
+ if (sol(0) > 1e-6 && sol(0) < 1-1e-6 &&
+ sol(1) > 1e-6 && sol(1) < 1-1e-6 &&
+ Abs (rhs - mat*sol) < 1e-6)
+ {
+ Point<3> ip = pi1 + sol(0) * vi;
+ cout << "Intersection at " << ip << endl;
+
+ geom.AddUserPoint (ip);
+ spoints.Append (MeshPoint (ip, mesh[mesh[si].p1].GetLayer()));
+ mesh.AddPoint (ip);
+ }
+ }
+ }
- /*
- for (i = 1; i <= geom.identifications.Size(); i++)
- geom.identifications.Elem(i)->IdentifySpecialPoints (specpoints);
- */
- multithread.task = savetask;
-}
-static void FindEdges (CSGeometry & geom, Mesh & mesh,
- const char * filename)
-{
- int i, k;
+
+
+ static void MeshSurface (CSGeometry & geom, Mesh & mesh)
+ {
+ char * savetask = multithread.task;
+ multithread.task = "Surface meshing";
- EdgeCalculation ec (geom, specpoints);
- ec.Calc (mparam.maxh, mesh);
+ ARRAY<Segment> segments;
+ int noldp = mesh.GetNP();
- for (i = 1; i <= geom.singedges.Size(); i++)
- geom.singedges.Elem(i)->FindPointsOnEdge (mesh);
- for (i = 1; i <= geom.singpoints.Size(); i++)
- geom.singpoints.Elem(i)->FindPoints (mesh);
+ double starttime = GetTime();
- // SaveEdges (mesh, filename, h, "edges.out");
+ // find master faces from identified
+ ARRAY<int> masterface(mesh.GetNFD());
+ for (int i = 1; i <= mesh.GetNFD(); i++)
+ masterface.Elem(i) = i;
+
+ ARRAY<INDEX_2> fpairs;
+ bool changed;
+ do
+ {
+ changed = 0;
+ for (int i = 0; i < geom.identifications.Size(); i++)
+ {
+ geom.identifications[i]->GetIdentifiedFaces (fpairs);
+
+ for (int j = 0; j < fpairs.Size(); j++)
+ {
+ if (masterface.Get(fpairs[j].I1()) <
+ masterface.Get(fpairs[j].I2()))
+ {
+ changed = 1;
+ masterface.Elem(fpairs[j].I2()) =
+ masterface.Elem(fpairs[j].I1());
+ }
+ if (masterface.Get(fpairs[j].I2()) <
+ masterface.Get(fpairs[j].I1()))
+ {
+ changed = 1;
+ masterface.Elem(fpairs[j].I1()) =
+ masterface.Elem(fpairs[j].I2());
+ }
+ }
+ }
+ }
+ while (changed);
+
+
+ int bccnt=0;
+ for (int k = 0; k < geom.GetNSurf(); k++)
+ bccnt = max2 (bccnt, geom.GetSurface(k)->GetBCProperty());
+
+ for (int k = 1; k <= mesh.GetNFD(); k++)
+ {
+ FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
+ const Surface * surf = geom.GetSurface(fd.SurfNr());
+
+ if (fd.TLOSurface() &&
+ geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetBCProp() > 0)
+ fd.SetBCProperty (geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetBCProp());
+ else if (surf -> GetBCProperty() != -1)
+ fd.SetBCProperty (surf->GetBCProperty());
+ else
+ {
+ bccnt++;
+ fd.SetBCProperty (bccnt);
+ }
+
+ for (int l = 0; l < geom.bcmodifications.Size(); l++)
+ {
+ if (geom.GetSurfaceClassRepresentant (fd.SurfNr()) ==
+ geom.GetSurfaceClassRepresentant (geom.bcmodifications[l].si) &&
+ (fd.DomainIn() == geom.bcmodifications[l].tlonr+1 ||
+ fd.DomainOut() == geom.bcmodifications[l].tlonr+1))
+ {
+ fd.SetBCProperty (geom.bcmodifications[l].bcnr);
+ }
+ }
+ }
+
+
+ for (int j = 0; j < geom.singfaces.Size(); j++)
+ {
+ ARRAY<int> surfs;
+ geom.GetIndependentSurfaceIndices (geom.singfaces[j]->GetSolid(),
+ geom.BoundingBox(), surfs);
+ for (int k = 1; k <= mesh.GetNFD(); k++)
+ {
+ FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
+ for (int l = 0; l < surfs.Size(); l++)
+ if (surfs[l] == fd.SurfNr())
+ {
+ if (geom.singfaces[j]->GetDomainNr() == fd.DomainIn())
+ fd.domin_singular = 1;
+ if (geom.singfaces[j]->GetDomainNr() == fd.DomainOut())
+ fd.domout_singular = 1;
+ }
+ }
+ }
+
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- int ok = 0;
- for (k = 1; k <= mesh.GetNFD(); k++)
- if (mesh.GetFaceDescriptor(k).SegmentFits (mesh.LineSegment(i)))
- ok = k;
+ // assemble edge hash-table
+ mesh.CalcSurfacesOfNode();
- if (!ok)
- ok = mesh.AddFaceDescriptor (FaceDescriptor (mesh.LineSegment(i)));
+ for (int k = 1; k <= mesh.GetNFD(); k++)
+ {
+ multithread.percent = 100.0 * k / (mesh.GetNFD()+1e-10);
- mesh.LineSegment(i).si = ok;
- }
+ if (masterface.Get(k) != k)
+ continue;
- (*testout) << "identify points after line meshing" << endl;
- for (i = 0; i < geom.identifications.Size(); i++)
- geom.identifications[i]->IdentifyPoints (mesh);
- for (i = 0; i < geom.identifications.Size(); i++)
- geom.identifications[i]->IdentifyFaces (mesh);
+ FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
- // mesh.Save ("lines.vol");
-}
+ (*testout) << "Surface " << k << endl;
+ (*testout) << "Face Descriptor: " << fd << endl;
+ PrintMessage (1, "Surface ", k, " / ", mesh.GetNFD());
+ int oldnf = mesh.GetNSE();
+
+ const Surface * surf =
+ geom.GetSurface((mesh.GetFaceDescriptor(k).SurfNr()));
-static void MeshSurface (CSGeometry & geom, Mesh & mesh)
-{
- int i, j, k;
- int changed;
- char * savetask = multithread.task;
- multithread.task = "Surface meshing";
+ Meshing2Surfaces meshing(*surf, geom.BoundingBox());
+ meshing.SetStartTime (starttime);
+ for (PointIndex pi = PointIndex::BASE; pi < noldp+PointIndex::BASE; pi++)
+ meshing.AddPoint (mesh[pi], pi);
- ARRAY<Segment> segments;
- int noldp = mesh.GetNP();
+ segments.SetSize (0);
+
+ for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
+ if (mesh[si].si == k)
+ segments.Append (mesh[si]);
+
+ for (int i = 1; i <= geom.identifications.Size(); i++)
+ geom.identifications.Get(i)->
+ BuildSurfaceElements(segments, mesh, surf);
+
+ for (int si = 0; si < segments.Size(); si++)
+ {
+ PointGeomInfo gi;
+ gi.trignum = k;
+ meshing.AddBoundaryElement (segments[si].p1 + 1 - PointIndex::BASE,
+ segments[si].p2 + 1 - PointIndex::BASE,
+ gi, gi);
+ }
+
+ double maxh = mparam.maxh;
+ if (fd.DomainIn() != 0)
+ {
+ const Solid * s1 =
+ geom.GetTopLevelObject(fd.DomainIn()-1) -> GetSolid();
+ if (s1->GetMaxH() < maxh)
+ maxh = s1->GetMaxH();
+ maxh = min2(maxh, geom.GetTopLevelObject(fd.DomainIn()-1)->GetMaxH());
+ }
+ if (fd.DomainOut() != 0)
+ {
+ const Solid * s1 =
+ geom.GetTopLevelObject(fd.DomainOut()-1) -> GetSolid();
+ if (s1->GetMaxH() < maxh)
+ maxh = s1->GetMaxH();
+ maxh = min2(maxh, geom.GetTopLevelObject(fd.DomainOut()-1)->GetMaxH());
+ }
+ if (fd.TLOSurface() != 0)
+ {
+ double hi = geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetMaxH();
+ if (hi < maxh) maxh = hi;
+ }
+
+ (*testout) << "domin = " << fd.DomainIn() << ", domout = " << fd.DomainOut()
+ << ", tlo-surf = " << fd.TLOSurface()
+ << " mpram.maxh = " << mparam.maxh << ", maxh = " << maxh << endl;
+
+ mparam.checkoverlap = 0;
+
+ MESHING2_RESULT res =
+ meshing.GenerateMesh (mesh, maxh, k);
+
+ if (res != MESHING2_OK)
+ {
+ PrintError ("Problem in Surface mesh generation");
+ throw NgException ("Problem in Surface mesh generation");
+ }
+
+ if (multithread.terminate) return;
+
+ for (int i = oldnf+1; i <= mesh.GetNSE(); i++)
+ mesh.SurfaceElement(i).SetIndex (k);
- double starttime = GetTime();
+ // mesh.CalcSurfacesOfNode();
+ if (segments.Size())
+ {
+ // surface was meshed, not copied
+ PrintMessage (2, "Optimize Surface");
+ for (int i = 1; i <= mparam.optsteps2d; i++)
+ {
+ if (multithread.terminate) return;
- // find master faces from identified
- ARRAY<int> masterface(mesh.GetNFD());
- for (i = 1; i <= mesh.GetNFD(); i++)
- masterface.Elem(i) = i;
-
- ARRAY<INDEX_2> fpairs;
- do
- {
- changed = 0;
- for (i = 0; i < geom.identifications.Size(); i++)
- {
- geom.identifications[i]->GetIdentifiedFaces (fpairs);
-
- for (j = 0; j < fpairs.Size(); j++)
- {
- if (masterface.Get(fpairs[j].I1()) <
- masterface.Get(fpairs[j].I2()))
{
- changed = 1;
- masterface.Elem(fpairs[j].I2()) =
- masterface.Elem(fpairs[j].I1());
+ MeshOptimize2dSurfaces meshopt(geom);
+ meshopt.SetFaceIndex (k);
+ meshopt.SetImproveEdges (0);
+ meshopt.SetMetricWeight (0.2);
+ meshopt.SetWriteStatus (0);
+
+ meshopt.EdgeSwapping (mesh, (i > mparam.optsteps2d/2));
}
- if (masterface.Get(fpairs[j].I2()) <
- masterface.Get(fpairs[j].I1()))
+
+ if (multithread.terminate) return;
{
- changed = 1;
- masterface.Elem(fpairs[j].I1()) =
- masterface.Elem(fpairs[j].I2());
- }
- }
- }
- }
- while (changed);
-
-
- int bccnt=0;
- for (k = 0; k < geom.GetNSurf(); k++)
- bccnt = max2 (bccnt, geom.GetSurface(k)->GetBCProperty());
-
- for (k = 1; k <= mesh.GetNFD(); k++)
- {
- FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
- const Surface * surf = geom.GetSurface(fd.SurfNr());
-
- if (fd.TLOSurface() &&
- geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetBCProp() > 0)
- fd.SetBCProperty (geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetBCProp());
- else if (surf -> GetBCProperty() != -1)
- fd.SetBCProperty (surf->GetBCProperty());
- else
- {
- bccnt++;
- fd.SetBCProperty (bccnt);
- }
-
- for (int l = 0; l < geom.bcmodifications.Size(); l++)
- {
- if (geom.GetSurfaceClassRepresentant (fd.SurfNr()) ==
- geom.GetSurfaceClassRepresentant (geom.bcmodifications[l].si) &&
- (fd.DomainIn() == geom.bcmodifications[l].tlonr+1 ||
- fd.DomainOut() == geom.bcmodifications[l].tlonr+1))
- {
- cout << "modify, surfnr = " << fd.SurfNr() << ", dom = "
- << geom.bcmodifications[l].tlonr+1 << endl;
- fd.SetBCProperty (geom.bcmodifications[l].bcnr);
- }
- }
- }
+ // mesh.CalcSurfacesOfNode();
+
+ MeshOptimize2dSurfaces meshopt(geom);
+ meshopt.SetFaceIndex (k);
+ meshopt.SetImproveEdges (0);
+ meshopt.SetMetricWeight (0.2);
+ meshopt.SetWriteStatus (0);
- /*
- (*testout) << "Face descriptors:" << endl;
- for (k = 1; k <= mesh.GetNFD(); k++)
- (*testout) << "fd(" << k << ") = " << mesh.GetFaceDescriptor(k) << endl;
- */
+ meshopt.ImproveMesh (mesh);
+ }
- // assemble edge hash-table
- (*testout) << "calc surf before surface" << endl;
- mesh.CalcSurfacesOfNode();
+ {
+ MeshOptimize2dSurfaces meshopt(geom);
+ meshopt.SetFaceIndex (k);
+ meshopt.SetImproveEdges (0);
+ meshopt.SetMetricWeight (0.2);
+ meshopt.SetWriteStatus (0);
+
+ meshopt.CombineImprove (mesh);
+ // mesh.CalcSurfacesOfNode();
+ }
- for (k = 1; k <= mesh.GetNFD(); k++)
- {
- (*testout) << "mesh face " << k << endl;
- multithread.percent = 100 * k / (mesh.GetNFD()+1e-10);
+ if (multithread.terminate) return;
+ {
+ MeshOptimize2dSurfaces meshopt(geom);
+ meshopt.SetFaceIndex (k);
+ meshopt.SetImproveEdges (0);
+ meshopt.SetMetricWeight (0.2);
+ meshopt.SetWriteStatus (0);
- if (masterface.Get(k) != k)
- continue;
+ meshopt.ImproveMesh (mesh);
+ }
+ }
+ }
- FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
- (*testout) << "Surface " << k << endl;
- (*testout) << "Face Descriptor: " << fd << endl;
- PrintMessage (1, "Surface ", k, " / ", mesh.GetNFD());
+ PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
- int oldnf = mesh.GetNSE();
-
- const Surface * surf =
- geom.GetSurface((mesh.GetFaceDescriptor(k).SurfNr()));
-
- /*
- if (surf -> GetBCProperty() != -1)
- fd.SetBCProperty (surf->GetBCProperty());
- else
- {
- bccnt++;
- fd.SetBCProperty (bccnt);
- }
- */
-
-
- Meshing2Surfaces meshing(*surf, geom.BoundingBox());
- meshing.SetStartTime (starttime);
-
- for (PointIndex pi = PointIndex::BASE;
- pi < noldp+PointIndex::BASE; pi++)
- {
- meshing.AddPoint (mesh[pi], pi);
- }
-
- segments.SetSize (0);
-
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- Segment * seg = &mesh.LineSegment(i);
- if (seg->si == k)
- {
- segments.Append (*seg);
- (*testout) << "add segment " << seg->p1 << "-" << seg->p2 << endl;
- }
- }
-
- for (i = 1; i <= geom.identifications.Size(); i++)
- geom.identifications.Get(i)->
- BuildSurfaceElements(segments, mesh, surf);
-
- // (*testout) << "Mesh surface, elements:" << endl;
- for (SegmentIndex si = 0; si < segments.Size(); si++)
- {
- PointGeomInfo gi;
- gi.trignum = k;
- /*
- (*testout) << segments[si].p1 << " - " << segments[si].p2 << endl;
- (*testout) << mesh[segments[si].p1] << " - "
- << mesh[segments[si].p2] << endl;
- */
- meshing.AddBoundaryElement (segments[si].p1 + 1 - PointIndex::BASE,
- segments[si].p2 + 1 - PointIndex::BASE,
- gi, gi);
- }
-
- double maxh = mparam.maxh;
- if (fd.DomainIn() != 0)
- {
- const Solid * s1 =
- geom.GetTopLevelObject(fd.DomainIn()-1) -> GetSolid();
- if (s1->GetMaxH() < maxh)
- maxh = s1->GetMaxH();
- maxh = min2(maxh, geom.GetTopLevelObject(fd.DomainIn()-1)->GetMaxH());
- }
- if (fd.DomainOut() != 0)
- {
- const Solid * s1 =
- geom.GetTopLevelObject(fd.DomainOut()-1) -> GetSolid();
- if (s1->GetMaxH() < maxh)
- maxh = s1->GetMaxH();
- maxh = min2(maxh, geom.GetTopLevelObject(fd.DomainOut()-1)->GetMaxH());
- }
- if (fd.TLOSurface() != 0)
- {
- double hi = geom.GetTopLevelObject(fd.TLOSurface()-1) -> GetMaxH();
- if (hi < maxh) maxh = hi;
- }
-
- (*testout) << "domin = " << fd.DomainIn() << ", domout = " << fd.DomainOut()
- << ", tlo-surf = " << fd.TLOSurface()
- << " mpram.maxh = " << mparam.maxh << ", maxh = " << maxh << endl;
-
-
- MESHING2_RESULT res =
- meshing.GenerateMesh (mesh, maxh, k);
-
- if (res != MESHING2_OK)
- {
- PrintError ("Problem in Surface mesh generation");
- throw NgException ("Problem in Surface mesh generation");
- }
- if (multithread.terminate) return;
+#ifdef OPENGL
+ extern void Render();
+ Render();
+#endif
+ }
+
+ mesh.Compress();
+
+ do
+ {
+ changed = 0;
+ for (int k = 1; k <= mesh.GetNFD(); k++)
+ {
+ multithread.percent = 100.0 * k / (mesh.GetNFD()+1e-10);
+
+ if (masterface.Get(k) == k)
+ continue;
-
- for (i = oldnf+1; i <= mesh.GetNSE(); i++)
- mesh.SurfaceElement(i).SetIndex (k);
+ FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
+ (*testout) << "Surface " << k << endl;
+ (*testout) << "Face Descriptor: " << fd << endl;
+ PrintMessage (2, "Surface ", k);
- // mesh.CalcSurfacesOfNode();
- if (segments.Size())
- {
- // surface was meshed, not copied
- PrintMessage (2, "Optimize Surface");
- for (i = 1; i <= mparam.optsteps2d; i++)
- {
- if (multithread.terminate) return;
+ int oldnf = mesh.GetNSE();
+
+ const Surface * surf =
+ geom.GetSurface((mesh.GetFaceDescriptor(k).SurfNr()));
+ /*
+ if (surf -> GetBCProperty() != -1)
+ fd.SetBCProperty (surf->GetBCProperty());
+ else
{
- MeshOptimize2dSurfaces meshopt(geom);
- meshopt.SetFaceIndex (k);
- meshopt.SetImproveEdges (0);
- meshopt.SetMetricWeight (0.2);
- meshopt.SetWriteStatus (0);
-
- meshopt.EdgeSwapping (mesh, (i > mparam.optsteps2d/2));
+ bccnt++;
+ fd.SetBCProperty (bccnt);
}
-
- if (multithread.terminate) return;
+ */
+
+ segments.SetSize (0);
+ for (int i = 1; i <= mesh.GetNSeg(); i++)
{
- // mesh.CalcSurfacesOfNode();
-
- MeshOptimize2dSurfaces meshopt(geom);
- meshopt.SetFaceIndex (k);
- meshopt.SetImproveEdges (0);
- meshopt.SetMetricWeight (0.2);
- meshopt.SetWriteStatus (0);
-
- meshopt.ImproveMesh (mesh);
+ Segment * seg = &mesh.LineSegment(i);
+ if (seg->si == k)
+ segments.Append (*seg);
}
+ for (int i = 1; i <= geom.identifications.Size(); i++)
{
- MeshOptimize2dSurfaces meshopt(geom);
- meshopt.SetFaceIndex (k);
- meshopt.SetImproveEdges (0);
- meshopt.SetMetricWeight (0.2);
- meshopt.SetWriteStatus (0);
-
- meshopt.CombineImprove (mesh);
- // mesh.CalcSurfacesOfNode();
+ geom.identifications.Elem(i)->GetIdentifiedFaces (fpairs);
+ int found = 0;
+ for (int j = 1; j <= fpairs.Size(); j++)
+ if (fpairs.Get(j).I1() == k || fpairs.Get(j).I2() == k)
+ found = 1;
+
+ if (!found)
+ continue;
+
+ geom.identifications.Get(i)->
+ BuildSurfaceElements(segments, mesh, surf);
+ if (!segments.Size())
+ break;
}
- if (multithread.terminate) return;
- {
- MeshOptimize2dSurfaces meshopt(geom);
- meshopt.SetFaceIndex (k);
- meshopt.SetImproveEdges (0);
- meshopt.SetMetricWeight (0.2);
- meshopt.SetWriteStatus (0);
-
- meshopt.ImproveMesh (mesh);
- }
- }
- }
+
+ if (multithread.terminate) return;
+ for (int i = oldnf+1; i <= mesh.GetNSE(); i++)
+ mesh.SurfaceElement(i).SetIndex (k);
- PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
+ if (!segments.Size())
+ {
+ masterface.Elem(k) = k;
+ changed = 1;
+ }
+ PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
+ }
+
#ifdef OPENGL
- extern void Render();
- Render();
+ extern void Render();
+ Render();
#endif
- }
+ }
+ while (changed);
- mesh.Compress();
+ mesh.SplitSeparatedFaces();
+ mesh.CalcSurfacesOfNode();
+ multithread.task = savetask;
+ }
- do
- {
- changed = 0;
- for (k = 1; k <= mesh.GetNFD(); k++)
- {
- multithread.percent = 100 * k / (mesh.GetNFD()+1e-10);
-
- if (masterface.Get(k) == k)
- continue;
- FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
+ int GenerateMesh (CSGeometry & geom,
+ Mesh *& mesh,
+ int perfstepsstart, int perfstepsend,
+ const char * optstr)
+ {
- (*testout) << "Surface " << k << endl;
- (*testout) << "Face Descriptor: " << fd << endl;
- PrintMessage (2, "Surface ", k);
+ if (mesh && mesh->GetNSE() &&
+ !geom.GetNSolids())
+ {
+ if (perfstepsstart < MESHCONST_MESHVOLUME)
+ perfstepsstart = MESHCONST_MESHVOLUME;
+ }
- int oldnf = mesh.GetNSE();
-
- const Surface * surf =
- geom.GetSurface((mesh.GetFaceDescriptor(k).SurfNr()));
-
- /*
- if (surf -> GetBCProperty() != -1)
- fd.SetBCProperty (surf->GetBCProperty());
- else
- {
- bccnt++;
- fd.SetBCProperty (bccnt);
- }
- */
-
- segments.SetSize (0);
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- Segment * seg = &mesh.LineSegment(i);
- if (seg->si == k)
- segments.Append (*seg);
- }
-
- for (i = 1; i <= geom.identifications.Size(); i++)
- {
- geom.identifications.Elem(i)->GetIdentifiedFaces (fpairs);
- int found = 0;
- for (j = 1; j <= fpairs.Size(); j++)
- if (fpairs.Get(j).I1() == k || fpairs.Get(j).I2() == k)
- found = 1;
-
- if (!found)
- continue;
-
- geom.identifications.Get(i)->
- BuildSurfaceElements(segments, mesh, surf);
- if (!segments.Size())
- break;
- }
-
- if (multithread.terminate) return;
- for (i = oldnf+1; i <= mesh.GetNSE(); i++)
- mesh.SurfaceElement(i).SetIndex (k);
+ if (perfstepsstart <= MESHCONST_ANALYSE)
+ {
+ delete mesh;
+ mesh = new Mesh();
+ mesh->SetGlobalH (mparam.maxh);
- if (!segments.Size())
- {
- masterface.Elem(k) = k;
- changed = 1;
- }
+ ARRAY<double> maxhdom(geom.GetNTopLevelObjects());
+ for (int i = 0; i < maxhdom.Size(); i++)
+ maxhdom[i] = geom.GetTopLevelObject(i)->GetMaxH();
- PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
- }
-
-#ifdef OPENGL
- extern void Render();
- Render();
-#endif
- }
- while (changed);
+ mesh->SetMaxHDomain (maxhdom);
- mesh.SplitSeparatedFaces();
+ if (mparam.uselocalh)
+ {
+ double maxsize = geom.MaxSize();
+ mesh->SetLocalH (Point<3>(-maxsize, -maxsize, -maxsize),
+ Point<3>(maxsize, maxsize, maxsize),
+ mparam.grading);
- mesh.CalcSurfacesOfNode();
+ mesh -> LoadLocalMeshSize (mparam.meshsizefilename);
+ }
- multithread.task = savetask;
-}
-
-
-int GenerateMesh (CSGeometry & geom,
- Mesh *& mesh,
- int perfstepsstart, int perfstepsend,
- const char * optstr)
-{
- extern char geomfilename[];
- const char * filename = geomfilename;
-
- int i;
- char filenametrunc[255];
- char filenameext[255];
-
- if (mesh && mesh->GetNSE() &&
- !geom.GetNSolids())
- {
- if (perfstepsstart < MESHCONST_MESHVOLUME)
- perfstepsstart = MESHCONST_MESHVOLUME;
- }
-
-
-
- strcpy (filenametrunc, filename);
- char * pos = strstr (filenametrunc, ".geo");
- if (pos) strcpy (pos, "");
-
- if (perfstepsstart <= MESHCONST_ANALYSE)
- {
- delete mesh;
- mesh = new Mesh();
-
- mesh->SetGlobalH (mparam.maxh);
-
- ARRAY<double> maxhdom(geom.GetNTopLevelObjects());
- for (i = 0; i < maxhdom.Size(); i++)
- maxhdom[i] = geom.GetTopLevelObject(i)->GetMaxH();
-
- mesh->SetMaxHDomain (maxhdom);
-
- if (mparam.uselocalh)
- {
- // double maxsize = globflags.GetNumFlag ("maxsize", 500);
- double maxsize = geom.MaxSize();
- mesh->SetLocalH (Point<3>(-maxsize, -maxsize, -maxsize),
- Point<3>(maxsize, maxsize, maxsize),
- mparam.grading);
-
- if (mparam.meshsizefilename)
- {
- ifstream msf(mparam.meshsizefilename);
- if (msf)
- mesh->LoadLocalMeshSize (msf);
- }
- }
-
- spoints.SetSize(0);
- FindPoints (geom, *mesh, filename);
+ spoints.SetSize(0);
+ FindPoints (geom, *mesh);
- PrintMessage (5, "find points done");
+ PrintMessage (5, "find points done");
#ifdef LOG_STREAM
- (*logout) << "Special points found" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl << endl;
+ (*logout) << "Special points found" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl << endl;
#endif
- }
+ }
- if (multithread.terminate || perfstepsend <= MESHCONST_ANALYSE)
- return TCL_OK;
+ if (multithread.terminate || perfstepsend <= MESHCONST_ANALYSE)
+ return TCL_OK;
- if (perfstepsstart <= MESHCONST_MESHEDGES)
- {
- FindEdges (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
+
+ if (perfstepsstart <= MESHCONST_MESHEDGES)
+ {
+ FindEdges (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
#ifdef LOG_STREAM
- (*logout) << "Edges meshed" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl;
+ (*logout) << "Edges meshed" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl;
#endif
- if (multithread.terminate)
- return TCL_OK;
+ if (multithread.terminate)
+ return TCL_OK;
-
- if (mparam.uselocalh)
- {
- mesh->CalcLocalH();
- mesh->DeleteMesh();
+ if (mparam.uselocalh)
+ {
+ mesh->CalcLocalH();
+ mesh->DeleteMesh();
- FindPoints (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
- FindEdges (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
+ FindPoints (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
+ FindEdges (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
- mesh->DeleteMesh();
+ mesh->DeleteMesh();
- FindPoints (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
- FindEdges (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
- }
- }
+ FindPoints (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
+ FindEdges (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
+ }
+ }
- if (multithread.terminate || perfstepsend <= MESHCONST_MESHEDGES)
- return TCL_OK;
+ if (multithread.terminate || perfstepsend <= MESHCONST_MESHEDGES)
+ return TCL_OK;
- if (perfstepsstart <= MESHCONST_MESHSURFACE)
- {
- MeshSurface (geom, *mesh);
- if (multithread.terminate) return TCL_OK;
+ if (perfstepsstart <= MESHCONST_MESHSURFACE)
+ {
+ MeshSurface (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
#ifdef LOG_STREAM
- (*logout) << "Surfaces meshed" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl;
+ (*logout) << "Surfaces meshed" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl;
#endif
- if (mparam.uselocalh && 0)
- {
- mesh->CalcLocalH();
- mesh->DeleteMesh();
+ if (mparam.uselocalh && 0)
+ {
+ mesh->CalcLocalH();
+ mesh->DeleteMesh();
- FindPoints (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
- FindEdges (geom, *mesh, filename);
- if (multithread.terminate) return TCL_OK;
+ FindPoints (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
+ FindEdges (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
- MeshSurface (geom, *mesh);
- if (multithread.terminate) return TCL_OK;
- }
+ MeshSurface (geom, *mesh);
+ if (multithread.terminate) return TCL_OK;
+ }
#ifdef LOG_STREAM
- (*logout) << "Surfaces remeshed" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl;
+ (*logout) << "Surfaces remeshed" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl;
#endif
#ifdef STAT_STREAM
- (*statout) << mesh->GetNSeg() << " & "
- << mesh->GetNSE() << " & - &"
- << GetTime() << " & " << endl;
+ (*statout) << mesh->GetNSeg() << " & "
+ << mesh->GetNSE() << " & - &"
+ << GetTime() << " & " << endl;
#endif
- MeshQuality2d (*mesh);
- mesh->CalcSurfacesOfNode();
-
- /*
- strcpy (filenameext, filenametrunc);
- strcat (filenameext, ".surf.mesh");
- WriteFile (WRITE_SURFACE, mesh, geom, filenameext, filename, h);
- */
- }
+ MeshQuality2d (*mesh);
+ mesh->CalcSurfacesOfNode();
+ }
- if (multithread.terminate || perfstepsend <= MESHCONST_OPTSURFACE)
- return TCL_OK;
+ if (multithread.terminate || perfstepsend <= MESHCONST_OPTSURFACE)
+ return TCL_OK;
- if (perfstepsstart <= MESHCONST_MESHVOLUME)
- {
- multithread.task = "Volume meshing";
-
- MESHING3_RESULT res =
- MeshVolume (mparam, *mesh);
+ if (perfstepsstart <= MESHCONST_MESHVOLUME)
+ {
+ multithread.task = "Volume meshing";
- if (res != MESHING3_OK) return TCL_ERROR;
+ MESHING3_RESULT res =
+ MeshVolume (mparam, *mesh);
+
+ if (res != MESHING3_OK) return TCL_ERROR;
- if (multithread.terminate) return TCL_OK;
+ if (multithread.terminate) return TCL_OK;
- RemoveIllegalElements (*mesh);
- if (multithread.terminate) return TCL_OK;
+ RemoveIllegalElements (*mesh);
+ if (multithread.terminate) return TCL_OK;
- MeshQuality3d (*mesh);
+ MeshQuality3d (*mesh);
- for (int i = 0; i < geom.GetNTopLevelObjects(); i++)
- mesh->SetMaterial (i+1, geom.GetTopLevelObject(i)->GetMaterial().c_str());
+ for (int i = 0; i < geom.GetNTopLevelObjects(); i++)
+ mesh->SetMaterial (i+1, geom.GetTopLevelObject(i)->GetMaterial().c_str());
#ifdef STAT_STREAM
- (*statout) << GetTime() << " & ";
+ (*statout) << GetTime() << " & ";
#endif
#ifdef LOG_STREAM
- (*logout) << "Volume meshed" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl;
+ (*logout) << "Volume meshed" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl;
#endif
- }
+ }
- if (multithread.terminate || perfstepsend <= MESHCONST_MESHVOLUME)
- return TCL_OK;
+ if (multithread.terminate || perfstepsend <= MESHCONST_MESHVOLUME)
+ return TCL_OK;
- if (perfstepsstart <= MESHCONST_OPTVOLUME)
- {
- multithread.task = "Volume optimization";
+ if (perfstepsstart <= MESHCONST_OPTVOLUME)
+ {
+ multithread.task = "Volume optimization";
- OptimizeVolume (mparam, *mesh, &geom);
- if (multithread.terminate) return TCL_OK;
+ OptimizeVolume (mparam, *mesh);
+ if (multithread.terminate) return TCL_OK;
#ifdef STAT_STREAM
- (*statout) << GetTime() << " & "
- << mesh->GetNE() << " & "
- << mesh->GetNP() << " " << '\\' << '\\' << " \\" << "hline" << endl;
+ (*statout) << GetTime() << " & "
+ << mesh->GetNE() << " & "
+ << mesh->GetNP() << " " << '\\' << '\\' << " \\" << "hline" << endl;
#endif
#ifdef LOG_STREAM
- (*logout) << "Volume optimized" << endl
- << "time = " << GetTime() << " sec" << endl
- << "points: " << mesh->GetNP() << endl;
+ (*logout) << "Volume optimized" << endl
+ << "time = " << GetTime() << " sec" << endl
+ << "points: " << mesh->GetNP() << endl;
#endif
+ }
-
-#ifndef TRAFO
- /*
- if (&geom)
- {
- ZRefinementOptions opt;
- opt.minref = 0;
- ZRefinement (*mesh, &geom, opt);
- }
- */
-#endif
- }
-
- /*
- cout << (char)7 << (char)7 << endl;
- cout << "Meshing finished" << endl << endl;
- cout << setw (4) << mesh->GetNP() << " Points" << endl;
- cout << setw (4) << mesh->GetNSE() << " Surface Elements" << endl;
- cout << setw (4) << mesh->GetNE() << " Volume Elements" << endl;
- cout << setw (4) << int (GetTime()) << " Seconds" << endl;
- */
-
- /*
- strcpy (filenameext, filenametrunc);
- strcat (filenameext, ".vol");
- mesh->Save (filenameext);
- */
-
- return TCL_OK;
-}
+ return TCL_OK;
+ }
}
diff --git a/Netgen/libsrc/csg/identify.cpp b/Netgen/libsrc/csg/identify.cpp
index 337bc26a4a..4622ee42bb 100644
--- a/Netgen/libsrc/csg/identify.cpp
+++ b/Netgen/libsrc/csg/identify.cpp
@@ -208,7 +208,7 @@ Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
continue;
Vec<3> n1;
- s1->GetNormalVector (hsp1.p, n1);
+ n1 = s1->GetNormalVector (hsp1.p);
n1 /= n1.Length();
if ( fabs(n1 * hsp1.v) > 1e-3)
continue;
@@ -218,7 +218,7 @@ Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
continue;
Vec<3> n2;
- s2->GetNormalVector (hsp2.p, n2);
+ n2 = s2->GetNormalVector (hsp2.p);
n2 /= n2.Length();
if ( fabs(n2 * hsp2.v) > 1e-3)
continue;
@@ -475,7 +475,7 @@ BuildSurfaceElements (ARRAY<Segment> & segs,
Point<3> (mesh.Point (newel.PNum(1))));
Vec<3> nsurf;
- geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)), nsurf);
+ nsurf = geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)));
if (nsurf * nt < 0)
Swap (newel.PNum(2), newel.PNum(3));
@@ -525,17 +525,21 @@ CloseSurfaceIdentification (int anr,
const CSGeometry & ageom,
const Surface * as1,
const Surface * as2,
+ const TopLevelObject * adomain,
const Flags & flags)
: Identification(anr, ageom)
{
s1 = as1;
s2 = as2;
+ domain = adomain;
ref_levels = int (flags.GetNumFlag ("reflevels", 2));
ref_levels_s1 = int (flags.GetNumFlag ("reflevels1", 0));
ref_levels_s2 = int (flags.GetNumFlag ("reflevels2", 0));
slices = flags.GetNumListFlag ("slices");
// eps_n = 1e-3;
eps_n = 1e-6;
+
+ dom_surf_valid = 0;
}
CloseSurfaceIdentification :: ~CloseSurfaceIdentification ()
@@ -575,7 +579,7 @@ void CloseSurfaceIdentification :: IdentifySpecialPoints
if (!s1->PointOnSurface (p1))
continue;
- s1->GetNormalVector (p1, n1);
+ s1->GetNormalVector (p1, n1);
n1 /= n1.Length();
if ( fabs(n1 * points.Get(i).v) > 1e-3)
continue;
@@ -622,65 +626,71 @@ void CloseSurfaceIdentification :: IdentifySpecialPoints
int CloseSurfaceIdentification ::
Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
{
- int i;
- double val;
- for (i = 1; i <= 1; i++)
+ if (!dom_surf_valid)
{
- if (!s1->PointOnSurface (sp1.p))
- continue;
+ const_cast<bool&> (dom_surf_valid) = 1;
+ ARRAY<int> & hsurf = const_cast<ARRAY<int>&> (domain_surfaces);
- Vec<3> n1;
- s1->GetNormalVector (sp1.p, n1);
- n1.Normalize();
- if ( fabs(n1 * sp1.v) > eps_n)
- continue;
+ if (domain)
+ {
+ BoxSphere<3> hbox (geom.BoundingBox());
+ geom.GetIndependentSurfaceIndices (domain->GetSolid(), hbox,
+ hsurf);
+ }
+ else
+ {
+ hsurf.SetSize (geom.GetNSurf());
+ for (int j = 0; j < hsurf.Size(); j++)
+ hsurf[j] = j;
+ }
+ }
- if (!s2->PointOnSurface(sp2.p))
- continue;
- Vec<3> n2;
- s2->GetNormalVector (sp2.p, n2);
- n2.Normalize();
- if ( fabs(n2 * sp2.v) > eps_n)
- continue;
- // must have joint surface
- bool joint = 0;
- for (int j = 0; j < geom.GetNSurf(); j++)
+ if (!s1->PointOnSurface (sp1.p))
+ return 0;
+
+ Vec<3> n1 = s1->GetNormalVector (sp1.p);
+ n1.Normalize();
+ if ( fabs(n1 * sp1.v) > eps_n)
+ return 0;
+
+ if (!s2->PointOnSurface(sp2.p))
+ return 0;
+
+ Vec<3> n2 = s2->GetNormalVector (sp2.p);
+ n2.Normalize();
+ if ( fabs(n2 * sp2.v) > eps_n)
+ return 0;
+
+ // must have joint surface
+ bool joint = 0;
+ // for (int j = 0; j < geom.GetNSurf(); j++)
+ for (int jj = 0; jj < domain_surfaces.Size(); jj++)
+ {
+ int j = domain_surfaces[jj];
+ if (geom.GetSurface(j) -> PointOnSurface(sp1.p) &&
+ geom.GetSurface(j) -> PointOnSurface(sp2.p) )
{
- if (geom.GetSurface(j) -> PointOnSurface(sp1.p) &&
- geom.GetSurface(j) -> PointOnSurface(sp2.p) )
+ Vec<3> hn1 = geom.GetSurface(j)->GetNormalVector (sp1.p);
+ Vec<3> hn2 = geom.GetSurface(j)->GetNormalVector (sp2.p);
+
+ if (hn1 * hn2 > 0)
{
- Vec<3> hn1, hn2;
- geom.GetSurface(j)->GetNormalVector (sp1.p, hn1);
- geom.GetSurface(j)->GetNormalVector (sp2.p, hn2);
-
- if (hn1 * hn2 > 0)
- {
- joint = 1;
- break;
- }
+ joint = 1;
+ break;
}
}
- if (!joint) continue;
-
- Vec<3> v = sp2.p - sp1.p;
- double vl = v.Length();
- double cl = fabs (v*n1);
-
- /*
- val = 1 - cl*cl/(vl*vl);
- val += (sp1.v - sp2.v).Length();
-
- if (val < 1e-3)
- {
- return 1;
- }
- */
- if (cl > (1-eps_n*eps_n) * vl && (sp1.v - sp2.v).Length() < 0.1)
- return 1;
}
+ if (!joint) return 0;
+
+ Vec<3> v = sp2.p - sp1.p;
+ double vl = v.Length();
+ double cl = fabs (v*n1);
+
+ if (cl > (1-eps_n*eps_n) * vl && (sp1.v - sp2.v).Length() < 0.1)
+ return 1;
return 0;
}
@@ -688,8 +698,7 @@ Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
int CloseSurfaceIdentification ::
Identifyable (const Point<3> & p1, const Point<3> & p2) const
{
- return (s1->PointOnSurface (p1) &&
- s2->PointOnSurface (p2));
+ return (s1->PointOnSurface (p1) && s2->PointOnSurface (p2));
}
@@ -701,7 +710,7 @@ IdentifyableCandidate (const SpecialPoint & sp1) const
if (s1->PointOnSurface (sp1.p))
{
Vec<3> n1;
- s1->GetNormalVector (sp1.p, n1);
+ n1 = s1->GetNormalVector (sp1.p);
n1.Normalize();
if ( fabs(n1 * sp1.v) > eps_n)
return 0;
@@ -711,7 +720,7 @@ IdentifyableCandidate (const SpecialPoint & sp1) const
if (s2->PointOnSurface (sp1.p))
{
Vec<3> n1;
- s2->GetNormalVector (sp1.p, n1);
+ n1 = s2->GetNormalVector (sp1.p);
n1.Normalize();
if ( fabs(n1 * sp1.v) > eps_n)
return 0;
@@ -725,14 +734,8 @@ IdentifyableCandidate (const SpecialPoint & sp1) const
int CloseSurfaceIdentification ::
ShortEdge (const SpecialPoint & sp1, const SpecialPoint & sp2) const
{
- int i;
- double val;
-
- SpecialPoint hsp1 = sp1;
- SpecialPoint hsp2 = sp2;
-
- if ( (s1->PointOnSurface (hsp1.p) && s2->PointOnSurface (hsp2.p)) ||
- (s1->PointOnSurface (hsp2.p) && s2->PointOnSurface (hsp1.p)) )
+ if ( (s1->PointOnSurface (sp1.p) && s2->PointOnSurface (sp2.p)) ||
+ (s1->PointOnSurface (sp2.p) && s2->PointOnSurface (sp1.p)) )
{
return 1;
}
@@ -833,7 +836,7 @@ void CloseSurfaceIdentification :: IdentifyPoints (Mesh & mesh)
double mindist = 1e10;
Vec<3> n1;
- s1->GetNormalVector (p1, n1);
+ n1 = s1->GetNormalVector (p1);
n1.Normalize();
for (i2 = 1; i2 <= np; i2++)
@@ -852,6 +855,28 @@ void CloseSurfaceIdentification :: IdentifyPoints (Mesh & mesh)
Vec<3> n = p2 - p1;
n.Normalize();
+
+ bool joint = 0;
+ for (int jj = 0; jj < domain_surfaces.Size(); jj++)
+ {
+ int j = domain_surfaces[jj];
+ if (geom.GetSurface(j) -> PointOnSurface(p1) &&
+ geom.GetSurface(j) -> PointOnSurface(p2) )
+ {
+ Vec<3> hn1 = geom.GetSurface(j)->GetNormalVector (p1);
+ Vec<3> hn2 = geom.GetSurface(j)->GetNormalVector (p2);
+
+ if (hn1 * hn2 > 0)
+ {
+ joint = 1;
+ break;
+ }
+ }
+ }
+ if (!joint) continue;
+
+
+
if (fabs (n * n1) > 0.9 &&
Dist (p1, p2) < mindist)
@@ -1026,7 +1051,7 @@ BuildSurfaceElements (ARRAY<Segment> & segs,
Point<3> (mesh.Point(el.PNum(1))));
Vec<3> ns;
- surf->GetNormalVector (mesh.Point(el.PNum(1)), ns);
+ ns = surf->GetNormalVector (mesh.Point(el.PNum(1)));
// (*testout) << "n = " << n << " ns = " << ns << endl;
if (n * ns < 0)
{
@@ -1102,7 +1127,7 @@ BuildSurfaceElements (ARRAY<Segment> & segs,
Vec<3> nt = Cross (Vec<3> (mesh.Point (newel.PNum(1)), mesh.Point (newel.PNum(2))),
Vec<3> (mesh.Point (newel.PNum(1)), mesh.Point (newel.PNum(3))));
Vec<3> nsurf;
- geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)), nsurf);
+ nsurf = geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)));
if (nsurf * nt < 0)
Swap (newel.PNum(2), newel.PNum(3));
@@ -1183,7 +1208,7 @@ BuildSurfaceElements2 (ARRAY<Segment> & segs,
Point<3> (mesh.Point (newel.PNum(3)))-
Point<3> (mesh.Point (newel.PNum(1))));
Vec<3> nsurf;
- geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)), nsurf);
+ nsurf = geom.GetSurface (surfnr)->GetNormalVector (mesh.Point(newel.PNum(1)));
if (nsurf * nt < 0)
Swap (newel.PNum(2), newel.PNum(3));
@@ -1288,7 +1313,7 @@ void CloseEdgesIdentification :: IdentifySpecialPoints
if (!s1->PointOnSurface (p1))
continue;
- s1->GetNormalVector (p1, n1);
+ s1->GetNormalVector (p1, n1);
n1 /= n1.Length();
if ( fabs(n1 * points.Get(i).v) > 1e-3)
continue;
@@ -1347,7 +1372,7 @@ Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
continue;
Vec<3> n1;
- s1->GetNormalVector (hsp1.p, n1);
+ n1 = s1->GetNormalVector (hsp1.p);
n1 /= n1.Length();
if ( fabs(n1 * hsp1.v) > 1e-3)
continue;
@@ -1357,7 +1382,7 @@ Identifyable (const SpecialPoint & sp1, const SpecialPoint & sp2) const
continue;
Vec<3> n2;
- s2->GetNormalVector (hsp2.p, n2);
+ n2 = s2->GetNormalVector (hsp2.p);
n2 /= n2.Length();
if ( fabs(n2 * hsp2.v) > 1e-3)
continue;
@@ -1412,8 +1437,8 @@ void CloseEdgesIdentification :: IdentifyPoints (Mesh & mesh)
Vec<3> n = p2 - p1;
n.Normalize();
- s1->GetNormalVector (p1, n1);
- facet->GetNormalVector (p1, nf);
+ n1 = s1->GetNormalVector (p1);
+ nf = facet->GetNormalVector (p1);
t = Cross (n1, nf);
t /= t.Length();
@@ -1455,7 +1480,7 @@ BuildSurfaceElements (ARRAY<Segment> & segs,
Point<3> (mesh.Point(el.PNum(3)))-
Point<3> (mesh.Point(el.PNum(1))));
Vec<3> ns;
- surf->GetNormalVector (mesh.Point(el.PNum(1)), ns);
+ ns = surf->GetNormalVector (mesh.Point(el.PNum(1)));
(*testout) << "n = " << n << " ns = " << ns << endl;
if (n * ns < 0)
{
diff --git a/Netgen/libsrc/csg/identify.hpp b/Netgen/libsrc/csg/identify.hpp
index b358a424c4..16e371b200 100644
--- a/Netgen/libsrc/csg/identify.hpp
+++ b/Netgen/libsrc/csg/identify.hpp
@@ -95,10 +95,12 @@ public:
///
+class TopLevelObject;
class CloseSurfaceIdentification : public Identification
{
const Surface * s1;
const Surface * s2;
+ const TopLevelObject * domain;
/// number of refinement levels (in Z-refinement)
int ref_levels;
/// number of refinement levels for layer next to s1 (in Z-refinement)
@@ -108,11 +110,16 @@ class CloseSurfaceIdentification : public Identification
///
double eps_n;
ARRAY<double> slices;
+ /// used only for domain-local identification:
+ ARRAY<int> domain_surfaces;
+ ///
+ bool dom_surf_valid;
public:
CloseSurfaceIdentification (int anr,
const CSGeometry & ageom,
const Surface * as1,
const Surface * as2,
+ const TopLevelObject * adomain,
const Flags & flags);
virtual ~CloseSurfaceIdentification ();
diff --git a/Netgen/libsrc/csg/polyhedra.cpp b/Netgen/libsrc/csg/polyhedra.cpp
index 9a6855227f..f0ce2f63f5 100644
--- a/Netgen/libsrc/csg/polyhedra.cpp
+++ b/Netgen/libsrc/csg/polyhedra.cpp
@@ -23,18 +23,16 @@ Polyhedra::Face::Face (int pi1, int pi2, int pi3, const ARRAY<Point<3> > & point
nn = n;
nn.Normalize();
// PseudoInverse (v1, v2, w1, w2);
-
Mat<2,3> mat;
Mat<3,2> inv;
- int i, j;
- for (i = 0; i < 3; i++)
+ for (int i = 0; i < 3; i++)
{
mat(0,i) = v1(i);
mat(1,i) = v2(i);
}
CalcInverse (mat, inv);
- for (i = 0; i < 3; i++)
+ for (int i = 0; i < 3; i++)
{
w1(i) = inv(i,0);
w2(i) = inv(i,1);
@@ -79,10 +77,7 @@ INSOLID_TYPE Polyhedra :: BoxInSolid (const BoxSphere<3> & box) const
double dist2 = MinDistTP2 (p1, p2, p3, box.Center());
if (dist2 < sqr (box.Diam()/2))
- {
- // (*testout) << "intersect" << endl;
- return DOES_INTERSECT;
- }
+ return DOES_INTERSECT;
};
return PointInSolid (box.Center(), 1e-3 * box.Diam());
@@ -92,10 +87,9 @@ INSOLID_TYPE Polyhedra :: BoxInSolid (const BoxSphere<3> & box) const
INSOLID_TYPE Polyhedra :: PointInSolid (const Point<3> & p,
double eps) const
{
- // (*testout) << "Point in Sol, p = " << p << " " << flush;
Vec<3> n, v1, v2;
- // "random numbers":
+ // random (?) numbers:
n(0) = 0.123871;
n(1) = 0.15432;
n(2) = 0.43989;
@@ -124,13 +118,10 @@ INSOLID_TYPE Polyhedra :: PointInSolid (const Point<3> & p,
if (lam3 < eps)
{
if (lam1 >= -eps && lam2 >= -eps && lam1+lam2 <= 1+eps)
- {
- return DOES_INTERSECT;
- }
+ return DOES_INTERSECT;
}
else if (lam1 >= 0 && lam2 >= 0 && lam1+lam2 <= 1)
- // lam3 > 0)
- {
+ { // lam3 > 0
cnt++;
}
@@ -146,10 +137,100 @@ INSOLID_TYPE Polyhedra :: VecInSolid (const Point<3> & p,
const Vec<3> & v,
double eps) const
{
+ int point_on_n_faces = 0;
+ INSOLID_TYPE res;
+
+ Vec<3> vn = v;
+ vn.Normalize();
+ for (int i = 0; i < faces.Size(); i++)
+ {
+ const Point<3> & p1 = points[faces[i].pnums[0]];
+
+ Vec<3> v0 = p - p1;
+ double lam3 = -(faces[i].n * v0);
+
+ if (fabs (lam3) > eps) continue;
+
+ double lam1 = (faces[i].w1 * v0);
+ double lam2 = (faces[i].w2 * v0);
+
+ if (lam1 >= -eps && lam2 >= -eps && lam1+lam2 <= 1+eps)
+ {
+ point_on_n_faces++;
+
+ double scal = vn * faces[i].n;
+
+ res = DOES_INTERSECT;
+ if (scal > eps) res = IS_OUTSIDE;
+ if (scal < -eps) res = IS_INSIDE;
+ }
+ }
+
+ if (point_on_n_faces == 1)
+ return res;
+
+
Point<3> p2 = p + (1e-3/(v.Length()+1e-16)) * v;
- return PointInSolid (p2, eps);
+ res = PointInSolid (p2, eps);
+ // (*testout) << "p = " << p << " v = " << v << " p2 = " << p2 << endl;
+ // (*testout) << "polyeder::vecinsolid = " << int(res) << endl;
+ return res;
+}
+
+
+INSOLID_TYPE Polyhedra :: VecInSolid2 (const Point<3> & p,
+ const Vec<3> & v1,
+ const Vec<3> & v2,
+ double eps) const
+{
+ int point_on_n_faces = 0;
+ INSOLID_TYPE res;
+
+ Vec<3> v1n = v1;
+ v1n.Normalize();
+ Vec<3> v2n = v2;
+ v2n.Normalize();
+
+
+ for (int i = 0; i < faces.Size(); i++)
+ {
+ const Point<3> & p1 = points[faces[i].pnums[0]];
+
+ Vec<3> v0 = p - p1;
+ double lam3 = -(faces[i].n * v0);
+
+ if (fabs (lam3) > eps) continue;
+
+ double lam1 = (faces[i].w1 * v0);
+ double lam2 = (faces[i].w2 * v0);
+
+ if (lam1 >= -eps && lam2 >= -eps && lam1+lam2 <= 1+eps)
+ {
+ double scal1 = v1n * faces[i].n;
+ if (fabs (scal1) > eps) continue;
+
+
+ point_on_n_faces++;
+
+ double scal2 = v2n * faces[i].n;
+ res = DOES_INTERSECT;
+ if (scal2 > eps) res = IS_OUTSIDE;
+ if (scal2 < -eps) res = IS_INSIDE;
+ }
+ }
+
+ if (point_on_n_faces == 1)
+ return res;
+
+
+
+
+ return Primitive :: VecInSolid2 (p, v1, v2, eps);
}
+
+
+
void Polyhedra :: GetPrimitiveData (char *& classname,
ARRAY<double> & coeffs) const
{
@@ -182,19 +263,10 @@ void Polyhedra :: SetPrimitiveData (ARRAY<double> & coeffs)
void Polyhedra :: Reduce (const BoxSphere<3> & box)
{
- int i;
-
- for (i = 0; i < planes.Size(); i++)
+ for (int i = 0; i < planes.Size(); i++)
surfaceactive[i] = 0;
- /*
- for (i = 1; i <= faces.Size(); i++)
- if (FaceBoxIntersection (i, box))
- surfaceactive.Elem (faces.Get(i).planenr) = 1;
- */
-
- for (i = 0; i < faces.Size(); i++)
- // if (faces.Get(i).bbox.Intersect (box))
+ for (int i = 0; i < faces.Size(); i++)
if (FaceBoxIntersection (i, box))
surfaceactive[faces[i].planenr] = 1;
}
@@ -212,8 +284,6 @@ int Polyhedra :: AddPoint (const Point<3> & p)
int Polyhedra :: AddFace (int pi1, int pi2, int pi3)
{
- int i;
-
faces.Append (Face (pi1, pi2, pi3, points));
Point<3> p1 = points[pi1];
@@ -229,7 +299,7 @@ int Polyhedra :: AddFace (int pi1, int pi2, int pi3)
Plane pl (p1, n);
int inverse;
int identicto = -1;
- for (i = 0; i < planes.Size(); i++)
+ for (int i = 0; i < planes.Size(); i++)
if (pl.IsIdentic (*planes[i], inverse, 1e-6))
{
if (!inverse)
diff --git a/Netgen/libsrc/csg/polyhedra.hpp b/Netgen/libsrc/csg/polyhedra.hpp
index d422c8ca15..529cfff40d 100644
--- a/Netgen/libsrc/csg/polyhedra.hpp
+++ b/Netgen/libsrc/csg/polyhedra.hpp
@@ -48,6 +48,12 @@ public:
const Vec<3> & v,
double eps) const;
+ // checks if lim s->0 lim t->0 p + t(v1 + s v2) in solid
+ virtual INSOLID_TYPE VecInSolid2 (const Point<3> & p,
+ const Vec<3> & v1,
+ const Vec<3> & v2,
+ double eps) const;
+
virtual int GetNSurfaces() const
{ return planes.Size(); }
virtual Surface & GetSurface (int i)
diff --git a/Netgen/libsrc/csg/singularref.cpp b/Netgen/libsrc/csg/singularref.cpp
index b445d0085b..add7bfdf65 100644
--- a/Netgen/libsrc/csg/singularref.cpp
+++ b/Netgen/libsrc/csg/singularref.cpp
@@ -32,23 +32,21 @@ SingularEdge :: SingularEdge (double abeta,
void SingularEdge :: FindPointsOnEdge (class Mesh & mesh)
{
(*testout) << "find points on edge" << endl;
- int i, j;
+ int j;
points.SetSize(0);
segms.SetSize(0);
- for (i = 1; i <= mesh.GetNSeg(); i++)
+ for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
{
- INDEX_2 i2 (mesh.LineSegment(i).p1,
- mesh.LineSegment(i).p2);
+ INDEX_2 i2 (mesh[si].p1, mesh[si].p2);
- int onedge = 1;
+ bool onedge = 1;
for (j = 1; j <= 2; j++)
{
- const Point<3> p = mesh.Point(i2.I(j));
+ const Point<3> p = mesh[ PointIndex (i2.I(j)) ];
if (sol1->IsIn (p, 1e-3) && sol2->IsIn(p, 1e-3) &&
!sol1->IsStrictIn (p, 1e-3) && !sol2->IsStrictIn(p, 1e-3))
{
;
-
}
else
onedge = 0;
@@ -56,44 +54,30 @@ void SingularEdge :: FindPointsOnEdge (class Mesh & mesh)
if (onedge)
{
segms.Append (i2);
- cout << "sing segment << " << i2 << endl;
- points.Append (mesh.Point(i2.I1()));
- points.Append (mesh.Point(i2.I2()));
+ PrintMessage (5, "sing segment ", i2.I1(), " - ", i2.I2());
+ points.Append (mesh[ PointIndex (i2.I1())]);
+ points.Append (mesh[ PointIndex (i2.I2())]);
+ mesh[si].singedge_left = 1;
+ mesh[si].singedge_right = 1;
}
}
-
+ /*
(*testout) << "Singular points:" << endl;
- for (i = 1; i <= points.Size(); i++)
- (*testout) << points.Get(i) << endl;
- /*
- for (i = 1; i <= mesh.GetNP(); i++)
- {
- const Point<3> p = mesh.Point(i);
- if (sol1->IsIn (p) && sol2->IsIn(p) &&
- !sol1->IsStrictIn (p) && !sol2->IsStrictIn(p))
- {
- points.Append (p);
- cout << "Point " << p << " is on singular edge" << endl;
- }
- }
+ for (int i = 0; i < points.Size(); i++)
+ (*testout) << points[i] << endl;
*/
}
void SingularEdge :: SetMeshSize (class Mesh & mesh, double globalh)
{
- int i;
-
double hloc = pow (globalh, 1/beta);
- for (i = 1; i <= points.Size(); i++)
- mesh.RestrictLocalH (points.Get(i), hloc);
+ for (int i = 0; i < points.Size(); i++)
+ mesh.RestrictLocalH (points[i], hloc);
}
-
-
-
SingularPoint :: SingularPoint (double abeta,
const Solid * asol1,
const Solid * asol2,
@@ -108,16 +92,17 @@ SingularPoint :: SingularPoint (double abeta,
void SingularPoint :: FindPoints (class Mesh & mesh)
{
- int i;
points.SetSize(0);
- for (i = 1; i <= mesh.GetNP(); i++)
+ for (PointIndex pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
{
- const Point<3> p = mesh.Point(i);
+ const Point<3> p = mesh[pi];
if (sol1->IsIn (p) && sol2->IsIn(p) && sol3->IsIn(p) &&
!sol1->IsStrictIn (p) && !sol2->IsStrictIn(p) && !sol3->IsStrictIn(p))
{
points.Append (p);
- cout << "Point " << p << " is a singular point" << endl;
+ PrintMessage (5, "Point (", p(0), ", ", p(1), ", ", p(2), ") is singular");
+ mesh[pi].SetSingular();
}
}
}
@@ -125,10 +110,8 @@ void SingularPoint :: FindPoints (class Mesh & mesh)
void SingularPoint :: SetMeshSize (class Mesh & mesh, double globalh)
{
- int i;
-
double hloc = pow (globalh, 1/beta);
- for (i = 1; i <= points.Size(); i++)
+ for (int i = 1; i <= points.Size(); i++)
mesh.RestrictLocalH (points.Get(i), hloc);
}
}
diff --git a/Netgen/libsrc/csg/singularref.hpp b/Netgen/libsrc/csg/singularref.hpp
index b2d2f2d839..d52dcf8f8c 100644
--- a/Netgen/libsrc/csg/singularref.hpp
+++ b/Netgen/libsrc/csg/singularref.hpp
@@ -13,6 +13,28 @@
+/**
+ Singular Face.
+ Causes a bounday layer mesh refinement.
+ All elements in subdomain domnr will get a boundary layer
+ on faces sharing the solid sol
+ */
+class SingularFace
+{
+public:
+ int domnr;
+ const Solid *sol;
+ // ARRAY<Point<3> > points;
+ // ARRAY<INDEX_2> segms;
+public:
+ SingularFace (int adomnr, const Solid * asol)
+ : domnr(adomnr), sol(asol) { ; }
+ const Solid * GetSolid() const { return sol; }
+ int GetDomainNr () const { return domnr; }
+};
+
+
+///
class SingularEdge
{
public:
@@ -27,6 +49,7 @@ public:
};
+///
class SingularPoint
{
public:
diff --git a/Netgen/libsrc/csg/solid.cpp b/Netgen/libsrc/csg/solid.cpp
index 5ea936c1d1..08d20f78a4 100644
--- a/Netgen/libsrc/csg/solid.cpp
+++ b/Netgen/libsrc/csg/solid.cpp
@@ -9,1277 +9,1209 @@ namespace netgen
using namespace netgen;
-SolidIterator :: SolidIterator ()
-{
- ;
-}
-
-SolidIterator :: ~SolidIterator ()
-{
- ;
-}
-
-
-
-
-int Solid :: cntnames = 0;
-
-Solid :: Solid (Primitive * aprim)
-{
- op = TERM;
- prim = aprim;
- s1 = s2 = NULL;
- maxh = 1e10;
-
/*
- cntnames ++;
- name = new char[16];
- sprintf (name, "noname%d", cntnames);
+ SolidIterator :: SolidIterator ()
+ {
+ ;
+ }
+
+ SolidIterator :: ~SolidIterator ()
+ {
+ ;
+ }
*/
- name = NULL; // name by number ?
-}
-Solid :: Solid (optyp aop, Solid * as1, Solid * as2)
-{
- op = aop;
- s1 = as1;
- s2 = as2;
- prim = NULL;
- name = NULL;
- maxh = 1e10;
-}
-Solid :: ~Solid ()
-{
- delete [] name;
- switch (op)
- {
- case UNION:
- case SECTION:
- {
- delete s1;
- delete s2;
+ // int Solid :: cntnames = 0;
+
+ Solid :: Solid (Primitive * aprim)
+ {
+ op = TERM;
+ prim = aprim;
+ s1 = s2 = NULL;
+ maxh = 1e10;
+ name = NULL;
+ }
+
+ Solid :: Solid (optyp aop, Solid * as1, Solid * as2)
+ {
+ op = aop;
+ s1 = as1;
+ s2 = as2;
+ prim = NULL;
+ name = NULL;
+ maxh = 1e10;
+ }
+
+ Solid :: ~Solid ()
+ {
+ // cout << "delete solid, op = " << int(op) << endl;
+ delete [] name;
+
+ switch (op)
+ {
+ case UNION:
+ case SECTION:
+ {
+ if (s1->op != ROOT) delete s1;
+ if (s2->op != ROOT) delete s2;
+ break;
+ }
+ case SUB:
+ // case ROOT:
+ {
+ if (s1->op != ROOT) delete s1;
+ break;
+ }
+ case TERM:
+ {
+ // cout << "has term" << endl;
+ delete prim;
+ break;
+ }
+ default:
break;
}
- case SUB:
- // case ROOT:
+ }
+
+ void Solid :: SetName (const char * aname)
+ {
+ delete [] name;
+ name = new char[strlen (aname)+1];
+ strcpy (name, aname);
+ }
+
+
+ Solid * Solid :: Copy (CSGeometry & geom) const
+ {
+ Solid * nsol;
+ switch (op)
{
- delete s1;
- break;
+ case TERM: case TERM_REF:
+ {
+ Primitive * nprim = prim->Copy();
+ geom.AddSurfaces (nprim);
+ nsol = new Solid (nprim);
+ break;
+ }
+
+ case SECTION:
+ case UNION:
+ {
+ nsol = new Solid (op, s1->Copy(geom), s2->Copy(geom));
+ break;
+ }
+
+ case SUB:
+ {
+ nsol = new Solid (SUB, s1 -> Copy (geom));
+ break;
+ }
+
+ case ROOT:
+ {
+ nsol = s1->Copy(geom);
+ break;
+ }
}
- default:
- break;
- }
-}
-void Solid :: SetName (const char * aname)
-{
- delete [] name;
- name = new char[strlen (aname)+1];
- strcpy (name, aname);
-}
+ return nsol;
+ }
+
+
+ void Solid :: Transform (Transformation<3> & trans)
+ {
+ switch (op)
+ {
+ case TERM: case TERM_REF:
+ {
+ prim -> Transform (trans);
+ break;
+ }
+ case SECTION:
+ case UNION:
+ {
+ s1 -> Transform (trans);
+ s2 -> Transform (trans);
+ break;
+ }
+ case SUB:
+ case ROOT:
+ {
+ s1 -> Transform (trans);
+ break;
+ }
+ }
+ }
-Solid * Solid :: Copy (CSGeometry & geom) const
-{
- Solid * nsol;
- switch (op)
- {
- case TERM:
+ void Solid :: IterateSolid (SolidIterator & it,
+ bool only_once)
+ {
+ if (only_once)
{
- Primitive * nprim = prim->Copy();
+ if (visited)
+ return;
- for (int j = 0; j < nprim->GetNSurfaces(); j++)
- {
- geom.AddSurface (&nprim->GetSurface(j));
- nprim->SetSurfaceId (j, geom.GetNSurf()-1);
- }
- nsol = new Solid (nprim);
- break;
+ visited = 1;
}
- case SECTION:
- case UNION:
+
+ it.Do (this);
+
+ switch (op)
{
- Solid *nsol1, *nsol2;
+ case SECTION:
+ {
+ s1->IterateSolid (it, only_once);
+ s2->IterateSolid (it, only_once);
+ break;
+ }
+ case UNION:
+ {
+ s1->IterateSolid (it, only_once);
+ s2->IterateSolid (it, only_once);
+ break;
+ }
+ case SUB:
+ case ROOT:
+ {
+ s1->IterateSolid (it, only_once);
+ break;
+ }
+ }
+ }
- nsol1 = s1 -> Copy (geom);
- nsol2 = s2 -> Copy (geom);
- nsol = new Solid (op, nsol1, nsol2);
- break;
- }
- case SUB:
+
+ bool Solid :: IsIn (const Point<3> & p, double eps) const
+ {
+ switch (op)
{
- Solid * nsol1 = s1 -> Copy (geom);
- nsol = new Solid (SUB, nsol1);
- break;
+ case TERM: case TERM_REF:
+ {
+ INSOLID_TYPE ist = prim->PointInSolid (p, eps);
+ return ( (ist == IS_INSIDE) || (ist == DOES_INTERSECT) ) ? 1 : 0;
+ }
+ case SECTION:
+ return s1->IsIn (p, eps) && s2->IsIn (p, eps);
+ case UNION:
+ return s1->IsIn (p, eps) || s2->IsIn (p, eps);
+ case SUB:
+ return !s1->IsStrictIn (p, eps);
+ case ROOT:
+ return s1->IsIn (p, eps);
}
-
- case ROOT:
+ return 0;
+ }
+
+ bool Solid :: IsStrictIn (const Point<3> & p, double eps) const
+ {
+ switch (op)
{
- nsol = s1->Copy(geom);
- break;
+ case TERM: case TERM_REF:
+ {
+ INSOLID_TYPE ist = prim->PointInSolid (p, eps);
+ return (ist == IS_INSIDE) ? 1 : 0;
+ }
+ case SECTION:
+ return s1->IsStrictIn(p, eps) && s2->IsStrictIn(p, eps);
+ case UNION:
+ return s1->IsStrictIn(p, eps) || s2->IsStrictIn(p, eps);
+ case SUB:
+ return !s1->IsIn (p, eps);
+ case ROOT:
+ return s1->IsStrictIn (p, eps);
}
- }
- return nsol;
-}
+ return 0;
+ }
-
-void Solid :: Transform (Transformation<3> & trans)
-{
- switch (op)
- {
- case TERM:
+ bool Solid :: VectorIn (const Point<3> & p, const Vec<3> & v,
+ double eps) const
+ {
+ Vec<3> hv;
+ switch (op)
{
- prim -> Transform (trans);
- break;
+ case TERM: case TERM_REF:
+ {
+ INSOLID_TYPE ist = prim->VecInSolid (p, v, eps);
+ return (ist == IS_INSIDE || ist == DOES_INTERSECT) ? 1 : 0;
+ }
+ case SECTION:
+ return s1 -> VectorIn (p, v, eps) && s2 -> VectorIn (p, v, eps);
+ case UNION:
+ return s1 -> VectorIn (p, v, eps) || s2 -> VectorIn (p, v, eps);
+ case SUB:
+ return !s1->VectorStrictIn(p, v, eps);
+ case ROOT:
+ return s1->VectorIn(p, v, eps);
}
- case SECTION:
- case UNION:
+ return 0;
+ }
+
+ bool Solid :: VectorStrictIn (const Point<3> & p, const Vec<3> & v,
+ double eps) const
+ {
+ Vec<3> hv;
+ switch (op)
{
- s1 -> Transform (trans);
- s2 -> Transform (trans);
- break;
+ case TERM: case TERM_REF:
+ {
+ INSOLID_TYPE ist = prim->VecInSolid (p, v, eps);
+ return (ist == IS_INSIDE) ? 1 : 0;
+ }
+ case SECTION:
+ return s1 -> VectorStrictIn (p, v, eps) &&
+ s2 -> VectorStrictIn (p, v, eps);
+ case UNION:
+ return s1 -> VectorStrictIn (p, v, eps) ||
+ s2 -> VectorStrictIn (p, v, eps);
+ case SUB:
+ return !s1->VectorIn(p, v, eps);
+ case ROOT:
+ return s1->VectorStrictIn(p, v, eps);
}
+ return 0;
+ }
+
+
+ bool Solid::VectorIn2 (const Point<3> & p, const Vec<3> & v1,
+ const Vec<3> & v2, double eps) const
+ {
+ if (VectorStrictIn (p, v1, eps))
+ return 1;
+ if (!VectorIn (p, v1, eps))
+ return 0;
+
+ bool res = VectorIn2Rec (p, v1, v2, eps);
+ return res;
+ }
- case SUB:
- case ROOT:
+ bool Solid::VectorIn2Rec (const Point<3> & p, const Vec<3> & v1,
+ const Vec<3> & v2, double eps) const
+ {
+ switch (op)
{
- s1 -> Transform (trans);
- break;
+ case TERM: case TERM_REF:
+ return prim->VecInSolid2 (p, v1, v2, eps);
+ case SECTION:
+ return s1->VectorIn2Rec (p, v1, v2, eps) &&
+ s2->VectorIn2Rec (p, v1, v2, eps);
+ case UNION:
+ return s1->VectorIn2Rec (p, v1, v2, eps) ||
+ s2->VectorIn2Rec (p, v1, v2, eps);
+ case SUB:
+ return !s1->VectorIn2Rec (p, v1, v2, eps);
+ case ROOT:
+ return s1->VectorIn2Rec (p, v1, v2, eps);
}
- }
-}
+ return 0;
+ }
-void Solid :: IterateSolid (SolidIterator & it,
- int only_once)
-{
- if (only_once)
- {
- if (visited)
- return;
- visited = 1;
- }
- it.Do (this);
- switch (op)
- {
- case SECTION:
- {
- s1->IterateSolid (it, only_once);
- s2->IterateSolid (it, only_once);
- break;
- }
- case UNION:
+ void Solid :: Print (ostream & str) const
+ {
+ switch (op)
{
- s1->IterateSolid (it, only_once);
- s2->IterateSolid (it, only_once);
- break;
+ case TERM: case TERM_REF:
+ {
+ str << prim->GetSurfaceId(0);
+ for (int i = 1; i < prim->GetNSurfaces(); i++)
+ str << "," << prim->GetSurfaceId(i);
+ break;
+ }
+ case SECTION:
+ {
+ str << "(";
+ s1 -> Print (str);
+ str << " AND ";
+ s2 -> Print (str);
+ str << ")";
+ break;
+ }
+ case UNION:
+ {
+ str << "(";
+ s1 -> Print (str);
+ str << " OR ";
+ s2 -> Print (str);
+ str << ")";
+ break;
+ }
+ case SUB:
+ {
+ str << " NOT ";
+ s1 -> Print (str);
+ break;
+ }
+ case ROOT:
+ {
+ str << " [" << name << "=";
+ s1 -> Print (str);
+ str << "] ";
+ break;
+ }
}
- case SUB:
- case ROOT:
+ }
+
+
+
+ void Solid :: GetSolidData (ostream & ost, int first) const
+ {
+ switch (op)
{
- s1->IterateSolid (it, only_once);
- break;
+ case SECTION:
+ {
+ ost << "(";
+ s1 -> GetSolidData (ost, 0);
+ ost << " AND ";
+ s2 -> GetSolidData (ost, 0);
+ ost << ")";
+ break;
+ }
+ case UNION:
+ {
+ ost << "(";
+ s1 -> GetSolidData (ost, 0);
+ ost << " OR ";
+ s2 -> GetSolidData (ost, 0);
+ ost << ")";
+ break;
+ }
+ case SUB:
+ {
+ ost << "NOT ";
+ s1 -> GetSolidData (ost, 0);
+ break;
+ }
+ case TERM: case TERM_REF:
+ {
+ if (name)
+ ost << name;
+ else
+ ost << "(noname)";
+ break;
+ }
+ case ROOT:
+ {
+ if (first)
+ s1 -> GetSolidData (ost, 0);
+ else
+ ost << name;
+ break;
+ }
}
- }
-}
+ }
+ static Solid * CreateSolidExpr (istream & ist, const SYMBOLTABLE<Solid*> & solids);
+ static Solid * CreateSolidTerm (istream & ist, const SYMBOLTABLE<Solid*> & solids);
+ static Solid * CreateSolidPrim (istream & ist, const SYMBOLTABLE<Solid*> & solids);
-int Solid :: IsIn (const Point<3> & p, double eps) const
-{
- int hv1, hv2;
- switch (op)
- {
- case TERM:
- {
- INSOLID_TYPE ist = prim->PointInSolid (p, eps);
- return ( (ist == IS_INSIDE) || (ist == DOES_INTERSECT) ) ? 1 : 0;
- }
- case SECTION:
- return s1->IsIn (p, eps) && s2->IsIn (p, eps);
- case UNION:
- return s1->IsIn (p, eps) || s2->IsIn (p, eps);
- case SUB:
- return !s1->IsStrictIn (p, eps);
- case ROOT:
- return s1->IsIn (p, eps);
- }
- return 0;
-}
+ static void ReadString (istream & ist, char * str)
+ {
+ char * hstr = str;
+ char ch;
-int Solid :: IsStrictIn (const Point<3> & p, double eps) const
-{
- switch (op)
- {
- case TERM:
+ while (1)
{
- INSOLID_TYPE ist = prim->PointInSolid (p, eps);
- return (ist == IS_INSIDE) ? 1 : 0;
- }
- case SECTION:
- return s1->IsStrictIn(p, eps) && s2->IsStrictIn(p, eps);
- case UNION:
- return s1->IsStrictIn(p, eps) || s2->IsStrictIn(p, eps);
- case SUB:
- return !s1->IsIn (p, eps);
- case ROOT:
- return s1->IsStrictIn (p, eps);
- }
- return 0;
-}
+ ist.get(ch);
+ if (!ist.good()) break;
-int Solid :: VectorIn (const Point<3> & p, const Vec<3> & v,
- double eps) const
-{
- Vec<3> hv;
- switch (op)
- {
- case TERM:
- {
- INSOLID_TYPE ist = prim->VecInSolid (p, v, eps);
- return (ist == IS_INSIDE || ist == DOES_INTERSECT) ? 1 : 0;
+ if (!isspace (ch))
+ {
+ ist.putback (ch);
+ break;
+ }
}
- case SECTION:
- return s1 -> VectorIn (p, v, eps) && s2 -> VectorIn (p, v, eps);
- case UNION:
- return s1 -> VectorIn (p, v, eps) || s2 -> VectorIn (p, v, eps);
- case SUB:
- return !s1->VectorStrictIn(p, v, eps);
- case ROOT:
- return s1->VectorIn(p, v, eps);
- }
- return 0;
-}
-int Solid :: VectorStrictIn (const Point<3> & p, const Vec<3> & v,
- double eps) const
-{
- Vec<3> hv;
- switch (op)
- {
- case TERM:
+ while (1)
{
- INSOLID_TYPE ist = prim->VecInSolid (p, v, eps);
- return (ist == IS_INSIDE) ? 1 : 0;
+ ist.get(ch);
+ if (!ist.good()) break;
+ if (isalpha(ch) || isdigit(ch))
+ {
+ *str = ch;
+ str++;
+ }
+ else
+ {
+ ist.putback (ch);
+ break;
+ }
}
- case SECTION:
- return s1 -> VectorStrictIn (p, v, eps) &&
- s2 -> VectorStrictIn (p, v, eps);
- case UNION:
- return s1 -> VectorStrictIn (p, v, eps) ||
- s2 -> VectorStrictIn (p, v, eps);
- case SUB:
- return !s1->VectorIn(p, v, eps);
- case ROOT:
- return s1->VectorStrictIn(p, v, eps);
- }
- return 0;
-}
+ *str = 0;
+ // cout << "Read string (" << hstr << ")"
+ // << "put back: " << ch << endl;
+ }
-int Solid::VectorIn2 (const Point<3> & p, const Vec<3> & v1,
- const Vec<3> & v2, double eps) const
-{
- if (VectorStrictIn (p, v1, eps))
- return 1;
- if (!VectorIn (p, v1, eps))
- return 0;
-
- return VectorIn2Rec (p, v1, v2, eps);
-}
+ Solid * CreateSolidExpr (istream & ist, const SYMBOLTABLE<Solid*> & solids)
+ {
+ // cout << "create expr" << endl;
-int Solid::VectorIn2Rec (const Point<3> & p, const Vec<3> & v1,
- const Vec<3> & v2, double eps) const
-{
- int hv1, hv2;
- switch (op)
- {
- case TERM:
- return prim->VecInSolid2 (p, v1, v2, eps);
- case SECTION:
- return s1->VectorIn2Rec (p, v1, v2, eps) &&
- s2->VectorIn2Rec (p, v1, v2, eps);
- case UNION:
- return s1->VectorIn2Rec (p, v1, v2, eps) ||
- s2->VectorIn2Rec (p, v1, v2, eps);
- case SUB:
- return !s1->VectorIn2Rec (p, v1, v2, eps);
- case ROOT:
- return s1->VectorIn2Rec (p, v1, v2, eps);
- }
- return 0;
-}
+ Solid *s1, *s2;
+ char str[100];
+ s1 = CreateSolidTerm (ist, solids);
+ ReadString (ist, str);
+ if (strcmp (str, "OR") == 0)
+ {
+ // cout << " OR ";
+ s2 = CreateSolidExpr (ist, solids);
+ return new Solid (Solid::UNION, s1, s2);
+ }
+ // cout << "no OR found, put back string: " << str << endl;
+ int i;
+ for (i = strlen(str)-1; i >= 0; i--)
+ ist.putback (str[i]);
+ return s1;
+ }
+ Solid * CreateSolidTerm (istream & ist, const SYMBOLTABLE<Solid*> & solids)
+ {
+ // cout << "create term" << endl;
+ Solid *s1, *s2;
+ char str[100];
-void Solid :: Print (ostream & str) const
-{
- switch (op)
- {
- case TERM:
- {
- str << prim->GetSurfaceId(0);
- for (int i = 1; i < prim->GetNSurfaces(); i++)
- str << "," << prim->GetSurfaceId(i);
- break;
- }
- case SECTION:
- {
- str << "(";
- s1 -> Print (str);
- str << " AND ";
- s2 -> Print (str);
- str << ")";
- break;
- }
- case UNION:
- {
- str << "(";
- s1 -> Print (str);
- str << " OR ";
- s2 -> Print (str);
- str << ")";
- break;
- }
- case SUB:
- {
- str << " NOT ";
- s1 -> Print (str);
- break;
- }
- case ROOT:
+ s1 = CreateSolidPrim (ist, solids);
+ ReadString (ist, str);
+ if (strcmp (str, "AND") == 0)
{
- str << " [" << name << "=";
- s1 -> Print (str);
- str << "] ";
- break;
+ // cout << " AND ";
+ s2 = CreateSolidTerm (ist, solids);
+ return new Solid (Solid::SECTION, s1, s2);
}
- }
-}
+ // cout << "no AND found, put back string: " << str << endl;
+ int i;
+ for (i = strlen(str)-1; i >= 0; i--)
+ ist.putback (str[i]);
-void Solid :: GetSolidData (ostream & ost, int first) const
-{
- switch (op)
- {
- case SECTION:
- {
- ost << "(";
- s1 -> GetSolidData (ost, 0);
- ost << " AND ";
- s2 -> GetSolidData (ost, 0);
- ost << ")";
- break;
- }
- case UNION:
- {
- ost << "(";
- s1 -> GetSolidData (ost, 0);
- ost << " OR ";
- s2 -> GetSolidData (ost, 0);
- ost << ")";
- break;
- }
- case SUB:
+ return s1;
+ }
+
+ Solid * CreateSolidPrim (istream & ist, const SYMBOLTABLE<Solid*> & solids)
+ {
+ Solid * s1;
+ char ch;
+ char str[100];
+
+ ist >> ch;
+ if (ch == '(')
{
- ost << "NOT ";
- s1 -> GetSolidData (ost, 0);
- break;
+ s1 = CreateSolidExpr (ist, solids);
+ ist >> ch; // ')'
+ // cout << "close back " << ch << endl;
+ return s1;
}
- case TERM:
+ ist.putback (ch);
+
+ ReadString (ist, str);
+ if (strcmp (str, "NOT") == 0)
{
- if (name)
- ost << name;
- else
- ost << "(noname)";
- break;
+ // cout << " NOT ";
+ s1 = CreateSolidPrim (ist, solids);
+ return new Solid (Solid::SUB, s1);
}
- case ROOT:
+
+ (*testout) << "get terminal " << str << endl;
+ s1 = solids.Get(str);
+ if (s1)
{
- if (first)
- s1 -> GetSolidData (ost, 0);
- else
- ost << name;
- break;
+ // cout << "primitive: " << str << endl;
+ return s1;
}
- }
-}
+ cerr << "syntax error" << endl;
+ return NULL;
+ }
-static Solid * CreateSolidExpr (istream & ist, const SYMBOLTABLE<Solid*> & solids);
-static Solid * CreateSolidTerm (istream & ist, const SYMBOLTABLE<Solid*> & solids);
-static Solid * CreateSolidPrim (istream & ist, const SYMBOLTABLE<Solid*> & solids);
+ Solid * Solid :: CreateSolid (istream & ist, const SYMBOLTABLE<Solid*> & solids)
+ {
+ Solid * nsol = CreateSolidExpr (ist, solids);
+ nsol = new Solid (ROOT, nsol);
+ (*testout) << "Print new sol: ";
+ nsol -> Print (*testout);
+ (*testout) << endl;
+ return nsol;
+ }
-static void ReadString (istream & ist, char * str)
-{
- char * hstr = str;
- char ch;
- while (1)
- {
- ist.get(ch);
- if (!ist.good()) break;
- if (!isspace (ch))
+ void Solid :: Boundaries (const Point<3> & p, ARRAY<int> & bounds) const
+ {
+ int in, strin;
+ bounds.SetSize (0);
+ RecBoundaries (p, bounds, in, strin);
+ }
+
+ void Solid :: RecBoundaries (const Point<3> & p, ARRAY<int> & bounds,
+ int & in, int & strin) const
+ {
+ switch (op)
+ {
+ case TERM: case TERM_REF:
{
- ist.putback (ch);
+ /*
+ double val;
+ val = surf->CalcFunctionValue (p);
+ in = (val < 1e-6);
+ strin = (val < -1e-6);
+ if (in && !strin) bounds.Append (id);
+ */
+ if (prim->PointInSolid (p, 1e-6) == DOES_INTERSECT)
+ bounds.Append (prim->GetSurfaceId (1));
break;
}
- }
+ case SECTION:
+ {
+ int i, in1, in2, strin1, strin2;
+ ARRAY<int> bounds1, bounds2;
+
+ s1 -> RecBoundaries (p, bounds1, in1, strin1);
+ s2 -> RecBoundaries (p, bounds2, in2, strin2);
- while (1)
- {
- ist.get(ch);
- if (!ist.good()) break;
- if (isalpha(ch) || isdigit(ch))
+ if (in1 && in2)
+ {
+ for (i = 1; i <= bounds1.Size(); i++)
+ bounds.Append (bounds1.Get(i));
+ for (i = 1; i <= bounds2.Size(); i++)
+ bounds.Append (bounds2.Get(i));
+ }
+ in = (in1 && in2);
+ strin = (strin1 && strin2);
+ break;
+ }
+ case UNION:
{
- *str = ch;
- str++;
+ int i, in1, in2, strin1, strin2;
+ ARRAY<int> bounds1, bounds2;
+
+ s1 -> RecBoundaries (p, bounds1, in1, strin1);
+ s2 -> RecBoundaries (p, bounds2, in2, strin2);
+
+ if (!strin1 && !strin2)
+ {
+ for (i = 1; i <= bounds1.Size(); i++)
+ bounds.Append (bounds1.Get(i));
+ for (i = 1; i <= bounds2.Size(); i++)
+ bounds.Append (bounds2.Get(i));
+ }
+ in = (in1 || in2);
+ strin = (strin1 || strin2);
+ break;
}
- else
+ case SUB:
{
- ist.putback (ch);
+ int hin, hstrin;
+ s1 -> RecBoundaries (p, bounds, hin, hstrin);
+ in = !hstrin;
+ strin = !hin;
break;
}
- }
- *str = 0;
- // cout << "Read string (" << hstr << ")"
- // << "put back: " << ch << endl;
-}
+ case ROOT:
+ {
+ s1 -> RecBoundaries (p, bounds, in, strin);
+ break;
+ }
+ }
+ }
-Solid * CreateSolidExpr (istream & ist, const SYMBOLTABLE<Solid*> & solids)
-{
- // cout << "create expr" << endl;
-
- Solid *s1, *s2;
- char str[100];
-
- s1 = CreateSolidTerm (ist, solids);
- ReadString (ist, str);
- if (strcmp (str, "OR") == 0)
- {
- // cout << " OR ";
- s2 = CreateSolidExpr (ist, solids);
- return new Solid (Solid::UNION, s1, s2);
- }
-
- // cout << "no OR found, put back string: " << str << endl;
- int i;
- for (i = strlen(str)-1; i >= 0; i--)
- ist.putback (str[i]);
-
- return s1;
-}
-Solid * CreateSolidTerm (istream & ist, const SYMBOLTABLE<Solid*> & solids)
-{
- // cout << "create term" << endl;
- Solid *s1, *s2;
- char str[100];
+ void Solid :: TangentialSolid (const Point<3> & p, Solid *& tansol) const
+ {
+ int in, strin;
+ RecTangentialSolid (p, tansol, in, strin);
+ }
- s1 = CreateSolidPrim (ist, solids);
- ReadString (ist, str);
- if (strcmp (str, "AND") == 0)
- {
- // cout << " AND ";
- s2 = CreateSolidTerm (ist, solids);
- return new Solid (Solid::SECTION, s1, s2);
- }
+ void Solid :: RecTangentialSolid (const Point<3> & p, Solid *& tansol,
+ int & in, int & strin) const
+ {
+ tansol = NULL;
+ switch (op)
+ {
+ case TERM: case TERM_REF:
+ {
+ /*
+ double val;
+ val = surf->CalcFunctionValue (p);
+ in = (val < 1e-6);
+ strin = (val < -1e-6);
+ if (in && !strin)
+ tansol = new Solid (surf, id);
+ */
- // cout << "no AND found, put back string: " << str << endl;
- int i;
- for (i = strlen(str)-1; i >= 0; i--)
- ist.putback (str[i]);
+ INSOLID_TYPE ist = prim->PointInSolid(p, 1e-6);
- return s1;
-}
+ in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
+ strin = (ist == IS_INSIDE);
-Solid * CreateSolidPrim (istream & ist, const SYMBOLTABLE<Solid*> & solids)
-{
- Solid * s1;
- char ch;
- char str[100];
-
- ist >> ch;
- if (ch == '(')
- {
- s1 = CreateSolidExpr (ist, solids);
- ist >> ch; // ')'
- // cout << "close back " << ch << endl;
- return s1;
- }
- ist.putback (ch);
-
- ReadString (ist, str);
- if (strcmp (str, "NOT") == 0)
- {
- // cout << " NOT ";
- s1 = CreateSolidPrim (ist, solids);
- return new Solid (Solid::SUB, s1);
- }
-
- (*testout) << "get terminal " << str << endl;
- s1 = solids.Get(str);
- if (s1)
- {
- // cout << "primitive: " << str << endl;
- return s1;
- }
- cerr << "syntax error" << endl;
-
- return NULL;
-}
+ if (ist == DOES_INTERSECT)
+ {
+ tansol = new Solid (prim);
+ tansol -> op = TERM_REF;
+ }
+ break;
+ }
+ case SECTION:
+ {
+ int in1, in2, strin1, strin2;
+ Solid * tansol1, * tansol2;
+ s1 -> RecTangentialSolid (p, tansol1, in1, strin1);
+ s2 -> RecTangentialSolid (p, tansol2, in2, strin2);
-Solid * Solid :: CreateSolid (istream & ist, const SYMBOLTABLE<Solid*> & solids)
-{
- Solid * nsol = CreateSolidExpr (ist, solids);
- nsol = new Solid (ROOT, nsol);
- (*testout) << "Print new sol: ";
- nsol -> Print (*testout);
- (*testout) << endl;
- return nsol;
-}
+ if (in1 && in2)
+ {
+ if (tansol1 && tansol2)
+ tansol = new Solid (SECTION, tansol1, tansol2);
+ else if (tansol1)
+ tansol = tansol1;
+ else if (tansol2)
+ tansol = tansol2;
+ }
+ in = (in1 && in2);
+ strin = (strin1 && strin2);
+ break;
+ }
+ case UNION:
+ {
+ int in1, in2, strin1, strin2;
+ Solid * tansol1, * tansol2;
+ s1 -> RecTangentialSolid (p, tansol1, in1, strin1);
+ s2 -> RecTangentialSolid (p, tansol2, in2, strin2);
+ if (!strin1 && !strin2)
+ {
+ if (tansol1 && tansol2)
+ tansol = new Solid (UNION, tansol1, tansol2);
+ else if (tansol1)
+ tansol = tansol1;
+ else if (tansol2)
+ tansol = tansol2;
+ }
+ in = (in1 || in2);
+ strin = (strin1 || strin2);
+ break;
+ }
+ case SUB:
+ {
+ int hin, hstrin;
+ Solid * tansol1;
-void Solid :: Boundaries (const Point<3> & p, ARRAY<int> & bounds) const
-{
- int in, strin;
- bounds.SetSize (0);
- RecBoundaries (p, bounds, in, strin);
-}
+ s1 -> RecTangentialSolid (p, tansol1, hin, hstrin);
-void Solid :: RecBoundaries (const Point<3> & p, ARRAY<int> & bounds,
- int & in, int & strin) const
-{
- switch (op)
- {
- case TERM:
- {
- /*
- double val;
- val = surf->CalcFunctionValue (p);
- in = (val < 1e-6);
- strin = (val < -1e-6);
- if (in && !strin) bounds.Append (id);
- */
- if (prim->PointInSolid (p, 1e-6) == DOES_INTERSECT)
- bounds.Append (prim->GetSurfaceId (1));
- break;
- }
- case SECTION:
- {
- int i, in1, in2, strin1, strin2;
- ARRAY<int> bounds1, bounds2;
-
- s1 -> RecBoundaries (p, bounds1, in1, strin1);
- s2 -> RecBoundaries (p, bounds2, in2, strin2);
-
- if (in1 && in2)
- {
- for (i = 1; i <= bounds1.Size(); i++)
- bounds.Append (bounds1.Get(i));
- for (i = 1; i <= bounds2.Size(); i++)
- bounds.Append (bounds2.Get(i));
- }
- in = (in1 && in2);
- strin = (strin1 && strin2);
- break;
- }
- case UNION:
- {
- int i, in1, in2, strin1, strin2;
- ARRAY<int> bounds1, bounds2;
-
- s1 -> RecBoundaries (p, bounds1, in1, strin1);
- s2 -> RecBoundaries (p, bounds2, in2, strin2);
-
- if (!strin1 && !strin2)
- {
- for (i = 1; i <= bounds1.Size(); i++)
- bounds.Append (bounds1.Get(i));
- for (i = 1; i <= bounds2.Size(); i++)
- bounds.Append (bounds2.Get(i));
- }
- in = (in1 || in2);
- strin = (strin1 || strin2);
- break;
- }
- case SUB:
- {
- int hin, hstrin;
- s1 -> RecBoundaries (p, bounds, hin, hstrin);
- in = !hstrin;
- strin = !hin;
- break;
- }
-
- case ROOT:
- {
- s1 -> RecBoundaries (p, bounds, in, strin);
- break;
- }
- }
-}
-
-
-
-void Solid :: TangentialSolid (const Point<3> & p, Solid *& tansol) const
-{
- int in, strin;
- RecTangentialSolid (p, tansol, in, strin);
-}
-
-void Solid :: RecTangentialSolid (const Point<3> & p, Solid *& tansol,
- int & in, int & strin) const
-{
- tansol = NULL;
-
- switch (op)
- {
- case TERM:
- {
- /*
- double val;
- val = surf->CalcFunctionValue (p);
- in = (val < 1e-6);
- strin = (val < -1e-6);
- if (in && !strin)
- tansol = new Solid (surf, id);
- */
-
- INSOLID_TYPE ist = prim->PointInSolid(p, 1e-6);
-
- in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
- strin = (ist == IS_INSIDE);
-
- if (ist == DOES_INTERSECT)
- tansol = new Solid (prim);
- break;
- }
- case SECTION:
- {
- int in1, in2, strin1, strin2;
- Solid * tansol1, * tansol2;
-
- s1 -> RecTangentialSolid (p, tansol1, in1, strin1);
- s2 -> RecTangentialSolid (p, tansol2, in2, strin2);
-
- if (in1 && in2)
- {
- if (tansol1 && tansol2)
- tansol = new Solid (SECTION, tansol1, tansol2);
- else if (tansol1)
- tansol = tansol1;
- else if (tansol2)
- tansol = tansol2;
- }
- in = (in1 && in2);
- strin = (strin1 && strin2);
- break;
- }
- case UNION:
- {
- int in1, in2, strin1, strin2;
- Solid * tansol1, * tansol2;
-
- s1 -> RecTangentialSolid (p, tansol1, in1, strin1);
- s2 -> RecTangentialSolid (p, tansol2, in2, strin2);
-
- if (!strin1 && !strin2)
- {
- if (tansol1 && tansol2)
- tansol = new Solid (UNION, tansol1, tansol2);
- else if (tansol1)
- tansol = tansol1;
- else if (tansol2)
- tansol = tansol2;
- }
- in = (in1 || in2);
- strin = (strin1 || strin2);
- break;
+ if (tansol1)
+ tansol = new Solid (SUB, tansol1);
+ in = !hstrin;
+ strin = !hin;
+ break;
+ }
+ case ROOT:
+ {
+ s1 -> RecTangentialSolid (p, tansol, in, strin);
+ break;
+ }
}
- case SUB:
- {
- int hin, hstrin;
- Solid * tansol1;
+ }
- s1 -> RecTangentialSolid (p, tansol1, hin, hstrin);
- if (tansol1)
- tansol = new Solid (SUB, tansol1);
- in = !hstrin;
- strin = !hin;
- break;
- }
- case ROOT:
- {
- s1 -> RecTangentialSolid (p, tansol, in, strin);
- break;
- }
- }
-}
+ void Solid :: TangentialSolid2 (const Point<3> & p,
+ const Vec<3> & t,
+ Solid *& tansol) const
+ {
+ int in, strin;
+ RecTangentialSolid2 (p, t, tansol, in, strin);
+ }
+ void Solid :: RecTangentialSolid2 (const Point<3> & p, const Vec<3> & t,
+ Solid *& tansol,
+ int & in, int & strin) const
+ {
+ tansol = NULL;
-void Solid :: TangentialSolid2 (const Point<3> & p,
- const Vec<3> & t,
- Solid *& tansol) const
-{
- int in, strin;
- RecTangentialSolid2 (p, t, tansol, in, strin);
-}
-
-void Solid :: RecTangentialSolid2 (const Point<3> & p, const Vec<3> & t,
- Solid *& tansol,
- int & in, int & strin) const
-{
- tansol = NULL;
-
- switch (op)
- {
- case TERM:
- {
- /*
- double val;
- val = surf->CalcFunctionValue (p);
- in = (val < 1e-6);
- strin = (val < -1e-6);
- if (in && !strin)
- tansol = new Solid (surf, id);
- */
-
- INSOLID_TYPE ist = prim->PointInSolid(p, 1e-6);
- if (ist == DOES_INTERSECT)
- ist = prim->VecInSolid (p, t, 1e-6);
-
- in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
- strin = (ist == IS_INSIDE);
-
- if (ist == DOES_INTERSECT)
- tansol = new Solid (prim);
- break;
- }
- case SECTION:
+ switch (op)
{
- int in1, in2, strin1, strin2;
- Solid * tansol1, * tansol2;
+ case TERM: case TERM_REF:
+ {
+ /*
+ double val;
+ val = surf->CalcFunctionValue (p);
+ in = (val < 1e-6);
+ strin = (val < -1e-6);
+ if (in && !strin)
+ tansol = new Solid (surf, id);
+ */
+
+ INSOLID_TYPE ist = prim->PointInSolid(p, 1e-6);
+ if (ist == DOES_INTERSECT)
+ ist = prim->VecInSolid (p, t, 1e-6);
+
+ in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
+ strin = (ist == IS_INSIDE);
+
+ if (ist == DOES_INTERSECT)
+ {
+ tansol = new Solid (prim);
+ tansol -> op = TERM_REF;
+ }
+ break;
+ }
+ case SECTION:
+ {
+ int in1, in2, strin1, strin2;
+ Solid * tansol1, * tansol2;
- s1 -> RecTangentialSolid2 (p, t, tansol1, in1, strin1);
- s2 -> RecTangentialSolid2 (p, t, tansol2, in2, strin2);
+ s1 -> RecTangentialSolid2 (p, t, tansol1, in1, strin1);
+ s2 -> RecTangentialSolid2 (p, t, tansol2, in2, strin2);
- if (in1 && in2)
- {
- if (tansol1 && tansol2)
- tansol = new Solid (SECTION, tansol1, tansol2);
- else if (tansol1)
- tansol = tansol1;
- else if (tansol2)
- tansol = tansol2;
- }
- in = (in1 && in2);
- strin = (strin1 && strin2);
- break;
- }
- case UNION:
- {
- int in1, in2, strin1, strin2;
- Solid * tansol1, * tansol2;
+ if (in1 && in2)
+ {
+ if (tansol1 && tansol2)
+ tansol = new Solid (SECTION, tansol1, tansol2);
+ else if (tansol1)
+ tansol = tansol1;
+ else if (tansol2)
+ tansol = tansol2;
+ }
+ in = (in1 && in2);
+ strin = (strin1 && strin2);
+ break;
+ }
+ case UNION:
+ {
+ int in1, in2, strin1, strin2;
+ Solid * tansol1, * tansol2;
- s1 -> RecTangentialSolid2 (p, t, tansol1, in1, strin1);
- s2 -> RecTangentialSolid2 (p, t, tansol2, in2, strin2);
+ s1 -> RecTangentialSolid2 (p, t, tansol1, in1, strin1);
+ s2 -> RecTangentialSolid2 (p, t, tansol2, in2, strin2);
- if (!strin1 && !strin2)
- {
- if (tansol1 && tansol2)
- tansol = new Solid (UNION, tansol1, tansol2);
- else if (tansol1)
- tansol = tansol1;
- else if (tansol2)
- tansol = tansol2;
- }
- in = (in1 || in2);
- strin = (strin1 || strin2);
- break;
- }
- case SUB:
- {
- int hin, hstrin;
- Solid * tansol1;
+ if (!strin1 && !strin2)
+ {
+ if (tansol1 && tansol2)
+ tansol = new Solid (UNION, tansol1, tansol2);
+ else if (tansol1)
+ tansol = tansol1;
+ else if (tansol2)
+ tansol = tansol2;
+ }
+ in = (in1 || in2);
+ strin = (strin1 || strin2);
+ break;
+ }
+ case SUB:
+ {
+ int hin, hstrin;
+ Solid * tansol1;
- s1 -> RecTangentialSolid2 (p, t, tansol1, hin, hstrin);
+ s1 -> RecTangentialSolid2 (p, t, tansol1, hin, hstrin);
- if (tansol1)
- tansol = new Solid (SUB, tansol1);
- in = !hstrin;
- strin = !hin;
- break;
- }
- case ROOT:
- {
- s1 -> RecTangentialSolid2 (p, t, tansol, in, strin);
- break;
+ if (tansol1)
+ tansol = new Solid (SUB, tansol1);
+ in = !hstrin;
+ strin = !hin;
+ break;
+ }
+ case ROOT:
+ {
+ s1 -> RecTangentialSolid2 (p, t, tansol, in, strin);
+ break;
+ }
}
- }
-}
+ }
-int Solid :: Edge (const Point<3> & p, const Vec<3> & v) const
-{
- int in, strin, faces;
- RecEdge (p, v, in, strin, faces);
- return faces >= 2;
-}
+ int Solid :: Edge (const Point<3> & p, const Vec<3> & v) const
+ {
+ int in, strin, faces;
+ RecEdge (p, v, in, strin, faces);
+ return faces >= 2;
+ }
-int Solid :: OnFace (const Point<3> & p, const Vec<3> & v) const
-{
- int in, strin, faces;
- RecEdge (p, v, in, strin, faces);
- return faces >= 1;
-}
+ int Solid :: OnFace (const Point<3> & p, const Vec<3> & v) const
+ {
+ int in, strin, faces;
+ RecEdge (p, v, in, strin, faces);
+ return faces >= 1;
+ }
-void Solid :: RecEdge (const Point<3> & p, const Vec<3> & v,
- int & in, int & strin, int & faces) const
-{
- switch (op)
- {
- case TERM:
- {
- INSOLID_TYPE ist = prim->VecInSolid (p, v, 1e-6);
- in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
- strin = (ist == IS_INSIDE);
- /*
- in = VectorIn (p, v);
- strin = VectorStrictIn (p, v);
- */
- faces = 0;
-
- if (in && ! strin)
- {
- // faces = 1;
- int i;
- Vec<3> grad;
- for (i = 1; i <= prim->GetNSurfaces(); i++)
- {
- double val = prim->GetSurface(i).CalcFunctionValue(p);
- prim->GetSurface(i).CalcGradient (p, grad);
- if (fabs (val) < 1e-6 && fabs (v * grad) < 1e-6)
- faces++;
- }
- }
- // else
- // faces = 0;
- break;
- }
- case SECTION:
+ void Solid :: RecEdge (const Point<3> & p, const Vec<3> & v,
+ int & in, int & strin, int & faces) const
+ {
+ switch (op)
{
- int in1, in2, strin1, strin2, faces1, faces2;
+ case TERM: case TERM_REF:
+ {
+ INSOLID_TYPE ist = prim->VecInSolid (p, v, 1e-6);
+ in = (ist == IS_INSIDE || ist == DOES_INTERSECT);
+ strin = (ist == IS_INSIDE);
+ /*
+ in = VectorIn (p, v);
+ strin = VectorStrictIn (p, v);
+ */
+ faces = 0;
+
+ if (in && ! strin)
+ {
+ // faces = 1;
+ int i;
+ Vec<3> grad;
+ for (i = 0; i < prim->GetNSurfaces(); i++)
+ {
+ double val = prim->GetSurface(i).CalcFunctionValue(p);
+ prim->GetSurface(i).CalcGradient (p, grad);
+ if (fabs (val) < 1e-6 && fabs (v * grad) < 1e-6)
+ faces++;
+ }
+ }
+ // else
+ // faces = 0;
+ break;
+ }
+ case SECTION:
+ {
+ int in1, in2, strin1, strin2, faces1, faces2;
- s1 -> RecEdge (p, v, in1, strin1, faces1);
- s2 -> RecEdge (p, v, in2, strin2, faces2);
+ s1 -> RecEdge (p, v, in1, strin1, faces1);
+ s2 -> RecEdge (p, v, in2, strin2, faces2);
- faces = 0;
- if (in1 && in2)
- faces = faces1 + faces2;
- in = in1 && in2;
- strin = strin1 && strin2;
- break;
- }
- case UNION:
- {
- int in1, in2, strin1, strin2, faces1, faces2;
+ faces = 0;
+ if (in1 && in2)
+ faces = faces1 + faces2;
+ in = in1 && in2;
+ strin = strin1 && strin2;
+ break;
+ }
+ case UNION:
+ {
+ int in1, in2, strin1, strin2, faces1, faces2;
- s1 -> RecEdge (p, v, in1, strin1, faces1);
- s2 -> RecEdge (p, v, in2, strin2, faces2);
+ s1 -> RecEdge (p, v, in1, strin1, faces1);
+ s2 -> RecEdge (p, v, in2, strin2, faces2);
- faces = 0;
- if (!strin1 && !strin2)
- faces = faces1 + faces2;
- in = in1 || in2;
- strin = strin1 || strin2;
- break;
- }
- case SUB:
- {
- int in1, strin1;
- s1 -> RecEdge (p, v, in1, strin1, faces);
- in = !strin1;
- strin = !in1;
- break;
- }
- case ROOT:
- {
- s1 -> RecEdge (p, v, in, strin, faces);
- break;
+ faces = 0;
+ if (!strin1 && !strin2)
+ faces = faces1 + faces2;
+ in = in1 || in2;
+ strin = strin1 || strin2;
+ break;
+ }
+ case SUB:
+ {
+ int in1, strin1;
+ s1 -> RecEdge (p, v, in1, strin1, faces);
+ in = !strin1;
+ strin = !in1;
+ break;
+ }
+ case ROOT:
+ {
+ s1 -> RecEdge (p, v, in, strin, faces);
+ break;
+ }
}
- }
-}
+ }
-void Solid :: CalcSurfaceInverse ()
-{
- CalcSurfaceInverseRec (0);
-}
+ void Solid :: CalcSurfaceInverse ()
+ {
+ CalcSurfaceInverseRec (0);
+ }
-void Solid :: CalcSurfaceInverseRec (int inv)
-{
- switch (op)
- {
- case TERM:
- {
- int priminv;
- for (int i = 0; i < prim->GetNSurfaces(); i++)
- {
- priminv = prim->SurfaceInverted(i);
- if (inv) priminv = 1 - priminv;
- prim->GetSurface(i).SetInverse (priminv);
- }
- break;
- }
- case UNION:
- case SECTION:
- {
- s1 -> CalcSurfaceInverseRec (inv);
- s2 -> CalcSurfaceInverseRec (inv);
- break;
- }
- case SUB:
- {
- s1 -> CalcSurfaceInverseRec (1 - inv);
- break;
- }
- case ROOT:
+ void Solid :: CalcSurfaceInverseRec (int inv)
+ {
+ switch (op)
{
- s1 -> CalcSurfaceInverseRec (inv);
- break;
+ case TERM: case TERM_REF:
+ {
+ int priminv;
+ for (int i = 0; i < prim->GetNSurfaces(); i++)
+ {
+ priminv = prim->SurfaceInverted(i);
+ if (inv) priminv = 1 - priminv;
+ prim->GetSurface(i).SetInverse (priminv);
+ }
+ break;
+ }
+ case UNION:
+ case SECTION:
+ {
+ s1 -> CalcSurfaceInverseRec (inv);
+ s2 -> CalcSurfaceInverseRec (inv);
+ break;
+ }
+ case SUB:
+ {
+ s1 -> CalcSurfaceInverseRec (1 - inv);
+ break;
+ }
+ case ROOT:
+ {
+ s1 -> CalcSurfaceInverseRec (inv);
+ break;
+ }
}
- }
-}
+ }
-Solid * Solid :: GetReducedSolid (const BoxSphere<3> & box) const
-{
- int in;
- Solid * res = RecGetReducedSolid (box, in);
- return res;
-}
+ Solid * Solid :: GetReducedSolid (const BoxSphere<3> & box) const
+ {
+ INSOLID_TYPE in;
+ return RecGetReducedSolid (box, in);
+ }
-Solid * Solid :: RecGetReducedSolid (const BoxSphere<3> & box, int & in) const
-{
- Solid * redsol = NULL;
+ Solid * Solid :: RecGetReducedSolid (const BoxSphere<3> & box, INSOLID_TYPE & in) const
+ {
+ Solid * redsol = NULL;
- switch (op)
- {
- case TERM:
+ switch (op)
{
- /* really old
- in = surf -> BoxInSolid (box);
- if (in == 2) // maybe
- redsol = new Solid (surf, id);
- */
- in = int(prim -> BoxInSolid (box));
- if (in == 2) // maybe
- redsol = new Solid (prim);
+ case TERM:
+ case TERM_REF:
+ {
+ in = prim -> BoxInSolid (box);
+ if (in == DOES_INTERSECT)
+ {
+ redsol = new Solid (prim);
+ redsol -> op = TERM_REF;
+ }
+ break;
+ }
+ case SECTION:
+ {
+ INSOLID_TYPE in1, in2;
+ Solid * redsol1, * redsol2;
- // prim->GetSurface(1).Print (*testout);
+ redsol1 = s1 -> RecGetReducedSolid (box, in1);
+ redsol2 = s2 -> RecGetReducedSolid (box, in2);
- break;
- }
- case SECTION:
- {
- int in1, in2;
- Solid * redsol1, * redsol2;
+ if (in1 == IS_OUTSIDE || in2 == IS_OUTSIDE)
+ {
+ if (in1 == DOES_INTERSECT) delete redsol1;
+ if (in2 == DOES_INTERSECT) delete redsol2;
+ in = IS_OUTSIDE;
+ }
+ else
+ {
+ if (in1 == DOES_INTERSECT || in2 == DOES_INTERSECT)
+ in = DOES_INTERSECT;
+ else
+ in = IS_INSIDE;
+
+ if (in1 == DOES_INTERSECT && in2 == DOES_INTERSECT)
+ redsol = new Solid (SECTION, redsol1, redsol2);
+ else if (in1 == DOES_INTERSECT)
+ redsol = redsol1;
+ else if (in2 == DOES_INTERSECT)
+ redsol = redsol2;
+ }
+ break;
+ }
- redsol1 = s1 -> RecGetReducedSolid (box, in1);
- redsol2 = s2 -> RecGetReducedSolid (box, in2);
+ case UNION:
+ {
+ INSOLID_TYPE in1, in2;
+ Solid * redsol1, * redsol2;
- if (in1 == 0 || in2 == 0)
- {
- if (in1 == 2) delete redsol1;
- if (in2 == 2) delete redsol2;
- in = 0;
- }
- else
- {
- if (in1 == 2 || in2 == 2) in = 2;
- else in = 1;
-
- if (in1 == 2 && in2 == 2)
- redsol = new Solid (SECTION, redsol1, redsol2);
- else if (in1 == 2)
- redsol = redsol1;
- else if (in2 == 2)
- redsol = redsol2;
- }
- break;
- }
+ redsol1 = s1 -> RecGetReducedSolid (box, in1);
+ redsol2 = s2 -> RecGetReducedSolid (box, in2);
- case UNION:
- {
- int in1, in2;
- Solid * redsol1, * redsol2;
+ if (in1 == IS_INSIDE || in2 == IS_INSIDE)
+ {
+ if (in1 == DOES_INTERSECT) delete redsol1;
+ if (in2 == DOES_INTERSECT) delete redsol2;
+ in = IS_INSIDE;
+ }
+ else
+ {
+ if (in1 == DOES_INTERSECT || in2 == DOES_INTERSECT) in = DOES_INTERSECT;
+ else in = IS_OUTSIDE;
+
+ if (in1 == DOES_INTERSECT && in2 == DOES_INTERSECT)
+ redsol = new Solid (UNION, redsol1, redsol2);
+ else if (in1 == DOES_INTERSECT)
+ redsol = redsol1;
+ else if (in2 == DOES_INTERSECT)
+ redsol = redsol2;
+ }
+ break;
+ }
- redsol1 = s1 -> RecGetReducedSolid (box, in1);
- redsol2 = s2 -> RecGetReducedSolid (box, in2);
+ case SUB:
+ {
+ INSOLID_TYPE in1;
+ Solid * redsol1 = s1 -> RecGetReducedSolid (box, in1);
- if (in1 == 1 || in2 == 1)
- {
- if (in1 == 2) delete redsol1;
- if (in2 == 2) delete redsol2;
- in = 1;
- }
- else
- {
- if (in1 == 2 || in2 == 2) in = 2;
- else in = 0;
-
- if (in1 == 2 && in2 == 2)
- redsol = new Solid (UNION, redsol1, redsol2);
- else if (in1 == 2)
- redsol = redsol1;
- else if (in2 == 2)
- redsol = redsol2;
- }
- break;
- }
+ switch (in1)
+ {
+ case IS_OUTSIDE: in = IS_INSIDE; break;
+ case IS_INSIDE: in = IS_OUTSIDE; break;
+ case DOES_INTERSECT: in = DOES_INTERSECT; break;
+ }
- case SUB:
- {
- int in1;
- Solid * redsol1;
- redsol1 = s1 -> RecGetReducedSolid (box, in1);
- switch (in1)
- {
- case 0: in = 1; break;
- case 1: in = 0; break;
- case 2: in = 2; break;
- }
- if (redsol1)
- redsol = new Solid (SUB, redsol1);
- break;
- }
+ if (redsol1)
+ redsol = new Solid (SUB, redsol1);
+ break;
+ }
- case ROOT:
- {
- int in1;
- redsol = s1 -> RecGetReducedSolid (box, in1);
- in = in1;
- break;
+ case ROOT:
+ {
+ INSOLID_TYPE in1;
+ redsol = s1 -> RecGetReducedSolid (box, in1);
+ in = in1;
+ break;
+ }
}
- }
- return redsol;
-}
+ return redsol;
+ }
-int Solid :: NumPrimitives () const
-{
- switch (op)
- {
- case TERM:
- {
- return 1;
- }
- case UNION:
- case SECTION:
- {
- return s1->NumPrimitives () + s2 -> NumPrimitives();
- }
- case SUB:
- case ROOT:
+ int Solid :: NumPrimitives () const
+ {
+ switch (op)
{
- return s1->NumPrimitives ();
+ case TERM: case TERM_REF:
+ {
+ return 1;
+ }
+ case UNION:
+ case SECTION:
+ {
+ return s1->NumPrimitives () + s2 -> NumPrimitives();
+ }
+ case SUB:
+ case ROOT:
+ {
+ return s1->NumPrimitives ();
+ }
}
- }
- return 0;
-}
+ return 0;
+ }
-void Solid :: GetSurfaceIndices (ARRAY<int> & surfind) const
-{
- surfind.SetSize (0);
- RecGetSurfaceIndices (surfind);
-}
+ void Solid :: GetSurfaceIndices (ARRAY<int> & surfind) const
+ {
+ surfind.SetSize (0);
+ RecGetSurfaceIndices (surfind);
+ }
-void Solid :: RecGetSurfaceIndices (ARRAY<int> & surfind) const
-{
- switch (op)
- {
- case TERM:
+ void Solid :: RecGetSurfaceIndices (ARRAY<int> & surfind) const
+ {
+ switch (op)
{
- /*
- int i;
- for (i = 1; i <= surfind.Size(); i++)
- if (surfind.Get(i) == prim->GetSurfaceId())
+ case TERM: case TERM_REF:
+ {
+ /*
+ int i;
+ for (i = 1; i <= surfind.Size(); i++)
+ if (surfind.Get(i) == prim->GetSurfaceId())
return;
- surfind.Append (prim->GetSurfaceId());
- break;
- */
- int i, j;
- for (j = 0; j < prim->GetNSurfaces(); j++)
- if (prim->SurfaceActive (j))
- {
- bool found = 0;
- int siprim = prim->GetSurfaceId(j);
-
- for (i = 0; i < surfind.Size(); i++)
- if (surfind[i] == siprim)
- {
- found = 1;
- break;
- }
- if (!found) surfind.Append (siprim);
- }
- break;
- }
- case UNION:
- case SECTION:
- {
- s1 -> RecGetSurfaceIndices (surfind);
- s2 -> RecGetSurfaceIndices (surfind);
- break;
- }
- case SUB:
- case ROOT:
- {
- s1 -> RecGetSurfaceIndices (surfind);
- break;
+ surfind.Append (prim->GetSurfaceId());
+ break;
+ */
+ for (int j = 0; j < prim->GetNSurfaces(); j++)
+ if (prim->SurfaceActive (j))
+ {
+ bool found = 0;
+ int siprim = prim->GetSurfaceId(j);
+
+ for (int i = 0; i < surfind.Size(); i++)
+ if (surfind[i] == siprim)
+ {
+ found = 1;
+ break;
+ }
+ if (!found) surfind.Append (siprim);
+ }
+ break;
+ }
+ case UNION:
+ case SECTION:
+ {
+ s1 -> RecGetSurfaceIndices (surfind);
+ s2 -> RecGetSurfaceIndices (surfind);
+ break;
+ }
+ case SUB:
+ case ROOT:
+ {
+ s1 -> RecGetSurfaceIndices (surfind);
+ break;
+ }
}
- }
-}
+ }
-void Solid :: GetSurfaceIndices (IndexSet & iset) const
-{
- iset.Clear();
- RecGetSurfaceIndices (iset);
-}
+ void Solid :: GetSurfaceIndices (IndexSet & iset) const
+ {
+ iset.Clear();
+ RecGetSurfaceIndices (iset);
+ }
-void Solid :: RecGetSurfaceIndices (IndexSet & iset) const
-{
- switch (op)
- {
- case TERM:
+ void Solid :: RecGetSurfaceIndices (IndexSet & iset) const
+ {
+ switch (op)
{
- /*
- int i;
- for (i = 1; i <= surfind.Size(); i++)
- if (surfind.Get(i) == prim->GetSurfaceId())
+ case TERM: case TERM_REF:
+ {
+ /*
+ int i;
+ for (i = 1; i <= surfind.Size(); i++)
+ if (surfind.Get(i) == prim->GetSurfaceId())
return;
- surfind.Append (prim->GetSurfaceId());
- break;
- */
- int i, j;
- for (j = 0; j < prim->GetNSurfaces(); j++)
- if (prim->SurfaceActive (j))
- {
- int siprim = prim->GetSurfaceId(j);
- iset.Add (siprim);
- }
- break;
- }
- case UNION:
- case SECTION:
- {
- s1 -> RecGetSurfaceIndices (iset);
- s2 -> RecGetSurfaceIndices (iset);
- break;
- }
- case SUB:
- case ROOT:
- {
- s1 -> RecGetSurfaceIndices (iset);
- break;
+ surfind.Append (prim->GetSurfaceId());
+ break;
+ */
+ for (int j = 0; j < prim->GetNSurfaces(); j++)
+ if (prim->SurfaceActive (j))
+ {
+ int siprim = prim->GetSurfaceId(j);
+ iset.Add (siprim);
+ }
+ break;
+ }
+ case UNION:
+ case SECTION:
+ {
+ s1 -> RecGetSurfaceIndices (iset);
+ s2 -> RecGetSurfaceIndices (iset);
+ break;
+ }
+ case SUB:
+ case ROOT:
+ {
+ s1 -> RecGetSurfaceIndices (iset);
+ break;
+ }
}
- }
-}
-
-
-
-
-
-
-BlockAllocator Solid :: ball(sizeof (Solid));
-
-
-void * Solid :: operator new(size_t s)
-{
- return ball.Alloc();
-}
-
-void Solid :: operator delete (void * p)
-{
- ball.Free (p);
-}
-
+ }
-ReducePrimitiveIterator ::
-ReducePrimitiveIterator (const BoxSphere<3> & abox)
- : SolidIterator(), box(abox)
-{
- ;
-}
-
-ReducePrimitiveIterator ::
-~ReducePrimitiveIterator ()
-{
- ;
-}
-
-void
-ReducePrimitiveIterator :: Do (Solid * sol)
-{
- if (sol -> GetPrimitive())
- sol -> GetPrimitive() -> Reduce (box);
-}
-
-
-
-
-UnReducePrimitiveIterator ::
-UnReducePrimitiveIterator ()
- : SolidIterator()
-{
- ;
-}
-
-UnReducePrimitiveIterator ::
-~UnReducePrimitiveIterator ()
-{
- ;
-}
-
-void
-UnReducePrimitiveIterator :: Do (Solid * sol)
-{
- if (sol -> GetPrimitive())
- sol -> GetPrimitive() -> UnReduce ();
-}
+ BlockAllocator Solid :: ball(sizeof (Solid));
}
diff --git a/Netgen/libsrc/csg/solid.hpp b/Netgen/libsrc/csg/solid.hpp
index b09d8fd682..796729125a 100644
--- a/Netgen/libsrc/csg/solid.hpp
+++ b/Netgen/libsrc/csg/solid.hpp
@@ -21,8 +21,8 @@ class Solid;
class SolidIterator
{
public:
- SolidIterator ();
- virtual ~SolidIterator ();
+ SolidIterator () { ; }
+ virtual ~SolidIterator () { ; }
virtual void Do (Solid * sol) = 0;
};
@@ -32,7 +32,7 @@ class Solid
{
public:
- typedef enum optyp1 { TERM, SECTION, UNION, SUB, ROOT, DUMMY } optyp;
+ typedef enum optyp1 { TERM, TERM_REF, SECTION, UNION, SUB, ROOT, DUMMY } optyp;
private:
char * name;
@@ -40,15 +40,15 @@ private:
Solid * s1, * s2;
optyp op;
- int visited;
+ bool visited;
double maxh;
- static int cntnames;
+ // static int cntnames;
public:
Solid (Primitive * aprim);
Solid (optyp aop, Solid * as1, Solid * as2 = NULL);
- virtual ~Solid ();
+ ~Solid ();
const char * Name () const { return name; }
void SetName (const char * aname);
@@ -57,7 +57,7 @@ public:
void Transform (Transformation<3> & trans);
- void IterateSolid (SolidIterator & it, int only_once = 0);
+ void IterateSolid (SolidIterator & it, bool only_once = 0);
void Boundaries (const Point<3> & p, ARRAY<int> & bounds) const;
@@ -66,21 +66,24 @@ public:
void GetSurfaceIndices (IndexSet & iset) const;
Primitive * GetPrimitive ()
- { return (op == TERM) ? prim : NULL; }
+ { return (op == TERM || op == TERM_REF) ? prim : NULL; }
const Primitive * GetPrimitive () const
- { return (op == TERM) ? prim : NULL; }
+ { return (op == TERM || op == TERM_REF) ? prim : NULL; }
+
+ Solid * S1() { return s1; }
+ Solid * S2() { return s2; }
// geometric tests
- int IsIn (const Point<3> & p, double eps = 1e-6) const;
- int IsStrictIn (const Point<3> & p, double eps = 1e-6) const;
- int VectorIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const;
- int VectorStrictIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const;
+ bool IsIn (const Point<3> & p, double eps = 1e-6) const;
+ bool IsStrictIn (const Point<3> & p, double eps = 1e-6) const;
+ bool VectorIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const;
+ bool VectorStrictIn (const Point<3> & p, const Vec<3> & v, double eps = 1e-6) const;
- int VectorIn2 (const Point<3> & p, const Vec<3> & v1, const Vec<3> & v2,
- double eps = 1e-6) const;
- int VectorIn2Rec (const Point<3> & p, const Vec<3> & v1, const Vec<3> & v2,
- double eps = 1e-6) const;
+ bool VectorIn2 (const Point<3> & p, const Vec<3> & v1, const Vec<3> & v2,
+ double eps = 1e-6) const;
+ bool VectorIn2Rec (const Point<3> & p, const Vec<3> & v1, const Vec<3> & v2,
+ double eps = 1e-6) const;
///
@@ -93,7 +96,7 @@ public:
///
int OnFace (const Point<3> & p, const Vec<3> & v) const;
///
- virtual void Print (ostream & str) const;
+ void Print (ostream & str) const;
///
void CalcSurfaceInverse ();
///
@@ -110,8 +113,16 @@ public:
static BlockAllocator ball;
- void * operator new(size_t);
- void operator delete (void *);
+ void * operator new(size_t /* s */)
+ {
+ return ball.Alloc();
+ }
+
+ void operator delete (void * p)
+ {
+ ball.Free (p);
+ }
+
protected:
///
@@ -130,7 +141,7 @@ protected:
///
void CalcSurfaceInverseRec (int inv);
///
- Solid * RecGetReducedSolid (const BoxSphere<3> & box, int & in) const;
+ Solid * RecGetReducedSolid (const BoxSphere<3> & box, INSOLID_TYPE & in) const;
///
void RecGetSurfaceIndices (ARRAY<int> & surfind) const;
void RecGetSurfaceIndices (IndexSet & iset) const;
@@ -142,22 +153,43 @@ protected:
};
+inline ostream & operator<< (ostream & ost, const Solid & sol)
+{
+ sol.Print (ost);
+ return ost;
+}
+
+
+
+
+
+
class ReducePrimitiveIterator : public SolidIterator
{
const BoxSphere<3> & box;
public:
- ReducePrimitiveIterator (const BoxSphere<3> & abox);
- virtual ~ReducePrimitiveIterator ();
- virtual void Do (Solid * sol);
+ ReducePrimitiveIterator (const BoxSphere<3> & abox)
+ : SolidIterator(), box(abox) { ; }
+ virtual ~ReducePrimitiveIterator () { ; }
+ virtual void Do (Solid * sol)
+ {
+ if (sol -> GetPrimitive())
+ sol -> GetPrimitive() -> Reduce (box);
+ }
};
class UnReducePrimitiveIterator : public SolidIterator
{
public:
- UnReducePrimitiveIterator ();
- virtual ~UnReducePrimitiveIterator ();
- virtual void Do (Solid * sol);
+ UnReducePrimitiveIterator () { ; }
+ virtual ~UnReducePrimitiveIterator () { ; }
+ virtual void Do (Solid * sol)
+ {
+ if (sol -> GetPrimitive())
+ sol -> GetPrimitive() -> UnReduce ();
+ }
};
+
#endif
diff --git a/Netgen/libsrc/csg/specpoin.cpp b/Netgen/libsrc/csg/specpoin.cpp
index 12fe79966a..c9b2477bb0 100644
--- a/Netgen/libsrc/csg/specpoin.cpp
+++ b/Netgen/libsrc/csg/specpoin.cpp
@@ -4,1366 +4,1228 @@
/*
-
- Special Point calculation uses the global Flags:
-
-
- size .. 500 cube = [-size, size]^3
- relydegtest when to rely on degeneration ?
- calccp calculate points of intersection ?
- cpeps1 eps for degenerated poi
- calcep calculate points of extreme coordinates ?
- epeps1 eps for degenerated edge
- epeps2 eps for axis parallel pec
- epspointdist eps for distance of special points
+ Special Point calculation uses the global Flags:
+
+ relydegtest when to rely on degeneration ?
+ calccp calculate points of intersection ?
+ cpeps1 eps for degenerated poi
+ calcep calculate points of extreme coordinates ?
+ epeps1 eps for degenerated edge
+ epeps2 eps for axis parallel pec
+ epspointdist eps for distance of special points
*/
namespace netgen
{
-void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp);
+ void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp);
- /*
-SpecialPoint :: SpecialPoint ()
- : p(), v(), layer(0)
-{
- ;
-}
- */
+ SpecialPoint :: SpecialPoint (const SpecialPoint & sp)
+ {
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+ }
+
+ SpecialPoint & SpecialPoint :: operator= (const SpecialPoint & sp)
+ {
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+ return *this;
+ }
-SpecialPoint :: SpecialPoint (const SpecialPoint & sp)
-{
- p = sp.p;
- v = sp.v;
- s1 = sp.s1;
- s2 = sp.s2;
- layer = sp.layer;
- unconditional = sp.unconditional;
-}
-
-SpecialPoint & SpecialPoint :: operator= (const SpecialPoint & sp)
-{
- p = sp.p;
- v = sp.v;
- s1 = sp.s1;
- s2 = sp.s2;
- layer = sp.layer;
- unconditional = sp.unconditional;
- return *this;
-}
+ void SpecialPoint :: Print (ostream & str)
+ {
+ str << "p = " << p << " v = " << v
+ << " s1/s2 = " << s1 << "/" << s2
+ << " layer = " << layer
+ << endl;
+ }
-bool SpecialPoint :: HasSurfaces (int as1, int as2) const
-{
- return (s1 == as1 && s2 == as2 || s1 == as2 && s2 == as1);
-}
-void SpecialPoint :: Print (ostream & str)
-{
- str << "p = " << p << " v = " << v
- << " s1/s2 = " << s1 << "/" << s2
- << " layer = " << layer
- << endl;
-}
+ static ARRAY<int> numprim_hist;
+ SpecialPointCalculation :: SpecialPointCalculation ()
+ {
+ ;
+ }
+ void SpecialPointCalculation ::
+ CalcSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints)
+ {
+ geometry = &ageometry;
+ points = &apoints;
+ size = geometry->MaxSize();
+ (*testout) << "Find Special Points" << endl;
+ (*testout) << "maxsize = " << size << endl;
-SpecialPointCalculation :: SpecialPointCalculation ()
-{
- ;
-}
+ cpeps1 = 1e-6;
+ epeps1 = 1e-3;
+ epeps2 = 1e-6;
-void SpecialPointCalculation ::
-CalcSpecialPoints (const CSGeometry & ageometry,
- ARRAY<MeshPoint> & apoints)
-{
- int i;
+ epspointdist2 = sqr (size * 1e-8);
+ relydegtest = size * 1e-4;
- geometry = &ageometry;
- points = &apoints;
- size = geometry->MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
- (*testout) << "Find Special Points" << endl;
- (*testout) << "maxsize = " << size << endl;
+ BoxSphere<3> box (Point<3> (-size, -size, -size),
+ Point<3> ( size, size, size));
- cpeps1 = 1e-6;
- epeps1 = 1e-3;
- epeps2 = 1e-6;
+ box.CalcDiamCenter();
+ PrintMessage (3, "main-solids: ", geometry->GetNTopLevelObjects());
- epspointdist2 = sqr (size * 1e-8);
- relydegtest = size * 1e-4;
+ numprim_hist.SetSize (geometry->GetNSurf()+1);
+ numprim_hist = 0;
+ for (int i = 0; i < geometry->GetNTopLevelObjects(); i++)
+ {
+ const TopLevelObject * tlo = geometry->GetTopLevelObject(i);
- BoxSphere<3> box (Point<3> (-size, -size, -size),
- Point<3> ( size, size, size));
- box.CalcDiamCenter();
- PrintMessage (3, "main-solids: ", geometry->GetNTopLevelObjects());
+ (*testout) << "tlo " << i << ":" << endl
+ << *tlo->GetSolid() << endl;
- for (i = 0; i < geometry->GetNTopLevelObjects(); i++)
- {
- (*testout) << "tlo " << i << ":" << endl;
- const TopLevelObject * tlo = geometry->GetTopLevelObject(i);
- tlo->GetSolid()->Print (*testout);
- (*testout) << endl;
- CalcSpecialPointsRec (tlo->GetSolid(), tlo->GetLayer(),
- box, 1, 1, 1);
- }
+ CalcSpecialPointsRec (tlo->GetSolid(), tlo->GetLayer(),
+ box, 1, 1, 1);
+ }
- PrintDot ('\n');
+ // add user point:
+ for (int i = 0; i < geometry->GetNUserPoints(); i++)
+ AddPoint (geometry->GetUserPoint(i), 1);
+ PrintMessage (3, "Found points ", apoints.Size());
- // add user point:
- int found = 0;
- for (i = 0; i < geometry->GetNUserPoints(); i++)
- AddPoint (geometry->GetUserPoint(i), 1);
+ for (int i = 0; i < boxesinlevel.Size(); i++)
+ (*testout) << "level " << i << " has "
+ << boxesinlevel[i] << " boxes" << endl;
+ (*testout) << "numprim_histogramm = " << endl << numprim_hist << endl;
+ }
- PrintMessage (3, apoints.Size(), " special points");
- for (i = 0; i < boxesinlevel.Size(); i++)
- (*testout) << "level " << i << " has "
- << boxesinlevel[i] << " boxes" << endl;
-}
+ void SpecialPointCalculation ::
+ CalcSpecialPointsRec (const Solid * sol, int layer,
+ const BoxSphere<3> & box,
+ int level, bool calccp, bool calcep)
+ {
+ if (multithread.terminate)
+ throw NgException ("Meshing stopped");
-int debug;
-void SpecialPointCalculation ::
-CalcSpecialPointsRec (const Solid * sol, int layer,
- const BoxSphere<3> & box,
- int level, bool calccp, bool calcep)
-{
- if (multithread.terminate)
- return;
+ if (!sol) return;
- int i;
- BoxSphere<3> sbox;
- Solid * redsol;
+ if (level >= 100)
+ {
+ MyStr err =
+ MyStr("Problems in CalcSpecialPoints\nPoint: ") + MyStr (box.Center());
+ throw NgException (err.c_str());
+ }
- int numprim;
- bool decision;
- bool possiblecrossp, possibleexp; // possible cross or extremalpoint
- bool surecrossp, sureexp; // sure ...
+ bool decision;
+ bool possiblecrossp, possibleexp; // possible cross or extremalpoint
+ bool surecrossp, sureexp; // sure ...
- static ARRAY<int> locsurf; // attention: array is static
-
-
- Point<3> p;
- int k1, k2, k3;
- int extremdir;
- double hd;
-
- if (!sol) return;
-
-
- if (level >= 100)
- {
- cerr << "Problems in CalcSpecialPoints" << endl;
- cerr << "Point: " << box.Center() << endl;
- exit (1);
- }
+ static ARRAY<int> locsurf; // attention: array is static
- static int cntbox = 0;
- cntbox++;
- if (cntbox % 10000 == 0)
- PrintDot ();
+ static int cntbox = 0;
+ cntbox++;
- if (level <= boxesinlevel.Size())
- boxesinlevel.Elem(level)++;
- else
- boxesinlevel.Append (1);
+ if (level <= boxesinlevel.Size())
+ boxesinlevel.Elem(level)++;
+ else
+ boxesinlevel.Append (1);
- /*
- numprim = sol -> NumPrimitives();
- sol -> GetSurfaceIndices (locsurf);
- */
+ /*
+ numprim = sol -> NumPrimitives();
+ sol -> GetSurfaceIndices (locsurf);
+ */
- debug = 0;
- // box.IsIn (Point<3> (4.9, 1.279, 2.8));
+ geometry -> GetIndependentSurfaceIndices (sol, box, locsurf);
+ int numprim = locsurf.Size();
+ numprim_hist[numprim]++;
- geometry -> GetIndependentSurfaceIndices (sol, box, locsurf);
- numprim = locsurf.Size();
-
- if (debug)
- {
- (*testout) << "box = " << box.PMin() << "-" << box.PMax()
- << " np = " << numprim << " : ";
- for (i = 1; i <= locsurf.Size(); i++)
- (*testout) << " " << locsurf.Get(i);
- (*testout) << " diam = " << box.Diam();
- (*testout) << " numprim = " << numprim;
- (*testout) << endl;
- }
-
- p = box.Center();
-
- /*
- (*testout) << "box = " << box.PMin() << " - " << box.PMax()
- << ", lev = " << level
- << ", nprim = " << sol->NumPrimitives()
- << ", lsurf = " << locsurf.Size() << endl;
-
- for (i = 1; i <= locsurf.Size(); i++)
- geometry->GetSurface (locsurf.Get(i)) -> Print (*testout);
- sol -> Print (*testout);
- */
+ Point<3> p = box.Center();
- /*
- for (i = 1; i <= locsurf.Size(); i++)
- (*testout) << locsurf.Get(i) << " ";
- (*testout) << "C = " << box.Center() << " diam = " << box.Diam() << endl;
- */
- possiblecrossp = (numprim >= 3) && calccp;
- surecrossp = 0;
+ possiblecrossp = (numprim >= 3) && calccp;
+ surecrossp = 0;
- if (possiblecrossp && (locsurf.Size() <= 10))
- {
- decision = 1;
- surecrossp = 0;
+ if (possiblecrossp && (locsurf.Size() <= 5 || level > 50))
+ {
+ decision = 1;
+ surecrossp = 0;
- for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
- for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
- for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
- {
- int nc, deg;
- nc = CrossPointNewtonConvergence
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- geometry->GetSurface(locsurf.Get(k3)), p );
+ for (int k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (int k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (int k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ int nc, deg;
+ nc = CrossPointNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), p );
- deg = CrossPointDegenerated
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- geometry->GetSurface(locsurf.Get(k3)), box );
+ deg = CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), box );
- if (!nc && !deg) decision = 0;
- if (nc) surecrossp = 1;
- }
+ if (!nc && !deg) decision = 0;
+ if (nc) surecrossp = 1;
+ }
- if (decision && surecrossp)
- {
- for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
- for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
- for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
- {
- if (CrossPointNewtonConvergence
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- geometry->GetSurface(locsurf.Get(k3)), p ) )
- {
- Point<3> pp = p;
- CrossPointNewton
+ if (decision && surecrossp)
+ {
+ for (int k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (int k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (int k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ if (CrossPointNewtonConvergence
(geometry->GetSurface(locsurf.Get(k1)),
geometry->GetSurface(locsurf.Get(k2)),
- geometry->GetSurface(locsurf.Get(k3)), pp);
-
- BoxSphere<3> hbox (pp, pp);
- hbox.Increase (1e-8);
-
- if (pp(0) > box.PMin()(0) - 1e-5 &&
- pp(0) < box.PMax()(0) + 1e-5 &&
- pp(1) > box.PMin()(1) - 1e-5 &&
- pp(1) < box.PMax()(1) + 1e-5 &&
- pp(2) > box.PMin()(2) - 1e-5 &&
- pp(2) < box.PMax()(2) + 1e-5 &&
- sol -> IsIn (pp) && !sol->IsStrictIn (pp) &&
- !CrossPointDegenerated
+ geometry->GetSurface(locsurf.Get(k3)), p ) )
+ {
+ Point<3> pp = p;
+ CrossPointNewton
(geometry->GetSurface(locsurf.Get(k1)),
geometry->GetSurface(locsurf.Get(k2)),
- geometry->GetSurface(locsurf.Get(k3)), hbox ))
-
- {
- // AddCrossPoint (locsurf, sol, p);
- BoxSphere<3> boxp (pp, pp);
- boxp.Increase (1e-3);
- boxp.CalcDiamCenter();
- ARRAY<int> locsurf2;
-
- geometry -> GetIndependentSurfaceIndices (sol, boxp, locsurf2);
-
- /*
- ReducePrimitiveIterator rpi(boxp);
- UnReducePrimitiveIterator urpi;
-
- ((Solid*)sol) -> IterateSolid (rpi);
- sol -> GetIndependentSurfaceIndices (locsurf2);
- ((Solid*)sol) -> IterateSolid (urpi);
- */
- bool found1 = 0, found2 = 0, found3 = 0;
- for (i = 1; i <= locsurf2.Size(); i++)
- {
- if (locsurf2.Get(i) == locsurf.Get(k1))
- found1 = 1;
- if (locsurf2.Get(i) == locsurf.Get(k2))
- found2 = 1;
- if (locsurf2.Get(i) == locsurf.Get(k3))
- found3 = 1;
- }
+ geometry->GetSurface(locsurf.Get(k3)), pp);
+
+ BoxSphere<3> hbox (pp, pp);
+ hbox.Increase (1e-8);
+
+ if (pp(0) > box.PMin()(0) - 1e-5 &&
+ pp(0) < box.PMax()(0) + 1e-5 &&
+ pp(1) > box.PMin()(1) - 1e-5 &&
+ pp(1) < box.PMax()(1) + 1e-5 &&
+ pp(2) > box.PMin()(2) - 1e-5 &&
+ pp(2) < box.PMax()(2) + 1e-5 &&
+ sol -> IsIn (pp) && !sol->IsStrictIn (pp) &&
+ !CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), hbox ))
+
+ {
+ // AddCrossPoint (locsurf, sol, p);
+ BoxSphere<3> boxp (pp, pp);
+ boxp.Increase (1e-3);
+ boxp.CalcDiamCenter();
+ ARRAY<int> locsurf2;
+
+ geometry -> GetIndependentSurfaceIndices (sol, boxp, locsurf2);
- if (found1 && found2 && found3)
- if (AddPoint (pp, layer))
+ bool found1 = 0, found2 = 0, found3 = 0;
+ for (int i = 0; i < locsurf2.Size(); i++)
{
- (*testout) << "Crosspoint found: " << pp
- << " diam = " << box.Diam() << endl;
- (*testout) << "surfs: "
- << locsurf.Get(k1) << ","
- << locsurf.Get(k2) << ","
- << locsurf.Get(k3) << endl;
+ if (locsurf2[i] == locsurf.Get(k1)) found1 = 1;
+ if (locsurf2[i] == locsurf.Get(k2)) found2 = 1;
+ if (locsurf2[i] == locsurf.Get(k3)) found3 = 1;
}
- }
- }
- }
- }
+
+ if (found1 && found2 && found3)
+ if (AddPoint (pp, layer))
+ {
+ (*testout) << "Crosspoint found: " << pp
+ << " diam = " << box.Diam()
+ << ", surfs: "
+ << locsurf.Get(k1) << ","
+ << locsurf.Get(k2) << ","
+ << locsurf.Get(k3) << endl;
+ }
+ }
+ }
+ }
+ }
- if (decision)
- possiblecrossp = 0;
- }
+ if (decision)
+ possiblecrossp = 0;
+ }
- possibleexp = (numprim >= 2) && calcep;
-
- if (possibleexp && (locsurf.Size() <= 10))
- {
- decision = 1;
- sureexp = 0;
+ possibleexp = (numprim >= 2) && calcep;
- for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
- for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
- {
- bool nc, deg;
-
- nc = EdgeNewtonConvergence
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- p);
-
- deg = EdgeDegenerated
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- box);
-
- if (!nc && !deg) decision = 0;
- if (nc) sureexp = 1;
- if (debug)
+ if (numprim == 2)
+ {
+ const Surface * surf1 = geometry->GetSurface(locsurf[0]);
+ const Surface * surf2 = geometry->GetSurface(locsurf[1]);
+
+ const Plane * plane1 = dynamic_cast<const Plane*> (surf1);
+ const Plane * plane2 = dynamic_cast<const Plane*> (surf2);
+ const QuadraticSurface * quadric1 = dynamic_cast<const QuadraticSurface*> (surf1);
+ const QuadraticSurface * quadric2 = dynamic_cast<const QuadraticSurface*> (surf2);
+
+ if (plane1 && plane2)
+ possibleexp = 0;
+ else
+ {
+ ARRAY<Point<3> > pts;
+ if (plane1 && quadric2)
{
- (*testout) << "p = " << p << " s1,2 = " << locsurf.Get(k1) << ", " << locsurf.Get(k2)
- << " nc = " << nc << " deg = " << deg << endl;
- }
+ ComputeExtremalPoints (plane1, quadric2, pts);
+ possibleexp = 0;
+ }
+ else if (plane2 && quadric1)
+ {
+ ComputeExtremalPoints (plane2, quadric1, pts);
+ possibleexp = 0;
+ }
+
+ for (int j = 0; j < pts.Size(); j++)
+ if (Dist (pts[j], box.Center()) < box.Diam()/2 &&
+ sol -> IsIn (pts[j]) && !sol->IsStrictIn (pts[j]) )
+ {
+ if (AddPoint (pts[j], layer))
+ (*testout) << "Extremal point found: " << pts[j] << endl;
+ }
}
+ }
- if (decision && sureexp)
- {
- for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
- for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
- {
- if (
- EdgeNewtonConvergence
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- p) )
- {
- EdgeNewton
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- p);
+
+ if (possibleexp && (locsurf.Size() <= 5 || level >= 50))
+ {
+ decision = 1;
+ sureexp = 0;
+
+ /*
+ (*testout) << "extremal surfs = ";
+ for (int k5 = 0; k5 < locsurf.Size(); k5++)
+ (*testout) << typeid(*geometry->GetSurface(locsurf[k5])).name() << " ";
+ (*testout) << "\n";
+ */
+
+ for (int k1 = 0; k1 < locsurf.Size() - 1; k1++)
+ for (int k2 = k1+1; k2 < locsurf.Size(); k2++)
+ {
+ const Surface * surf1 = geometry->GetSurface(locsurf[k1]);
+ const Surface * surf2 = geometry->GetSurface(locsurf[k2]);
+ /*
+ (*testout) << "edgecheck, types = " << typeid(*surf1).name() << ", " << typeid(*surf2).name()
+ << "edge-newton-conv = " << EdgeNewtonConvergence (surf1, surf2, p)
+ << "edge-deg = " << EdgeDegenerated (surf1, surf2, box)
+ << "\n";
+ */
+ if (EdgeNewtonConvergence (surf1, surf2, p) )
+ sureexp = 1;
+ else
+ {
+ if (!EdgeDegenerated (surf1, surf2, box))
+ decision = 0;
+ }
+ }
+
+ if (decision && sureexp)
+ {
+ for (int k1 = 0; k1 < locsurf.Size() - 1; k1++)
+ for (int k2 = k1+1; k2 < locsurf.Size(); k2++)
+ {
+ const Surface * surf1 = geometry->GetSurface(locsurf[k1]);
+ const Surface * surf2 = geometry->GetSurface(locsurf[k2]);
+
+ if (EdgeNewtonConvergence (surf1, surf2, p))
+ {
+ EdgeNewton (surf1, surf2, p);
- Point<3> pp;
- if (IsEdgeExtremalPoint
- (geometry->GetSurface(locsurf.Get(k1)),
- geometry->GetSurface(locsurf.Get(k2)),
- p, pp, box.Diam()/2))
+ Point<3> pp;
+ if (IsEdgeExtremalPoint (surf1, surf2, p, pp, box.Diam()/2))
{
- (*testout) << "extremalpoint (nearly) found:"
- << pp
- << endl;
+ (*testout) << "extremalpoint (nearly) found:" << pp << endl;
+
if (Dist (pp, box.Center()) < box.Diam()/2 &&
sol -> IsIn (pp) && !sol->IsStrictIn (pp) )
{
- // AddExtremalPoint (locsurf.Get(k1), locsurf.Get(k2), p);
if (AddPoint (pp, layer))
(*testout) << "Extremal point found: " << pp << endl;
}
}
- }
- }
- }
- if (decision)
- possibleexp = 0;
- }
+ }
+ }
+ }
+ if (decision)
+ possibleexp = 0;
+ }
- if (possiblecrossp || possibleexp)
- {
- for (i = 0; i < 8; i++)
- {
- box.GetSubBox (i, sbox);
- sbox.Increase (1e-4 * sbox.Diam());
+ if (possiblecrossp || possibleexp)
+ {
+ BoxSphere<3> sbox;
+ for (int i = 0; i < 8; i++)
+ {
+ box.GetSubBox (i, sbox);
+ sbox.Increase (1e-4 * sbox.Diam());
- redsol = sol -> GetReducedSolid (sbox);
-
- if (redsol)
- {
- CalcSpecialPointsRec (redsol, layer, sbox, level+1, calccp, calcep);
- delete redsol;
- }
- }
- }
-}
+ Solid * redsol = sol -> GetReducedSolid (sbox);
+ if (redsol)
+ {
+ CalcSpecialPointsRec (redsol, layer, sbox, level+1, calccp, calcep);
+ delete redsol;
+ }
+ }
+ }
+ }
-/******* Tests for Point of intersection **********************/
+ /******* Tests for Point of intersection **********************/
-bool SpecialPointCalculation ::
-CrossPointNewtonConvergence (const Surface * f1,
- const Surface * f2,
- const Surface * f3,
- const Point<3> & p)
-{
- int i;
- Vec<3> grad;
- Vec<3> rs, x;
- Mat<3> jacobi, inv;
- double alpha, beta, gamma, eta;
- double sum;
- int j;
-
-
- rs(0) = f1->CalcFunctionValue (p);
- rs(1) = f2->CalcFunctionValue (p);
- rs(2) = f3->CalcFunctionValue (p);
-
- f1->CalcGradient (p, grad);
- jacobi(0,0) = grad(0);
- jacobi(0,1) = grad(1);
- jacobi(0,2) = grad(2);
-
- f2->CalcGradient (p, grad);
- jacobi(1,0) = grad(0);
- jacobi(1,1) = grad(1);
- jacobi(1,2) = grad(2);
-
- f3->CalcGradient (p, grad);
- jacobi(2,0) = grad(0);
- jacobi(2,1) = grad(1);
- jacobi(2,2) = grad(2);
-
- alpha = 1;
- if (fabs (Det (jacobi)) > 1e-8)
- {
- CalcInverse (jacobi, inv);
- x = inv * rs;
- gamma = f1 -> HesseNorm() + f2 -> HesseNorm() + f3 -> HesseNorm();
- beta = 0;
- for (i = 0; i < 3; i++)
- {
- sum = 0;
- for (j = 0; j < 3; j++)
- sum += fabs (inv(i,j));
- beta = max2 (beta, sum);
- }
- eta = Abs (x);
+ bool SpecialPointCalculation ::
+ CrossPointNewtonConvergence (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const Point<3> & p)
+ {
+ Vec<3> grad, rs, x;
+ Mat<3> jacobi, inv;
- alpha = beta * gamma * eta;
- }
+ f1->CalcGradient (p, grad);
+ jacobi(0,0) = grad(0);
+ jacobi(0,1) = grad(1);
+ jacobi(0,2) = grad(2);
- return (alpha < 0.1);
-}
+ f2->CalcGradient (p, grad);
+ jacobi(1,0) = grad(0);
+ jacobi(1,1) = grad(1);
+ jacobi(1,2) = grad(2);
+ f3->CalcGradient (p, grad);
+ jacobi(2,0) = grad(0);
+ jacobi(2,1) = grad(1);
+ jacobi(2,2) = grad(2);
+ if (fabs (Det (jacobi)) > 1e-8)
+ {
+ double gamma = f1 -> HesseNorm() + f2 -> HesseNorm() + f3 -> HesseNorm();
+ if (gamma == 0.0) return 1;
+ CalcInverse (jacobi, inv);
-bool SpecialPointCalculation ::
-CrossPointDegenerated (const Surface * f1,
- const Surface * f2,
- const Surface * f3,
- const BoxSphere<3> & box) const
-{
- Mat<3> mat;
- Vec<3> grad, g1, g2, g3;
- double normprod;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
- if (box.Diam() > relydegtest) return 0;
+ x = inv * rs;
- f1->CalcGradient (box.Center(), g1);
- normprod = Abs (g1);
+ double beta = 0;
+ for (int i = 0; i < 3; i++)
+ {
+ double sum = 0;
+ for (int j = 0; j < 3; j++)
+ sum += fabs (inv(i,j));
+ if (sum > beta) beta = sum;
+ }
+ double eta = Abs (x);
- f2->CalcGradient (box.Center(), g2);
- normprod *= Abs (g2);
-
- f3->CalcGradient (box.Center(), g3);
- normprod *= Abs (g3);
+ return (beta * gamma * eta < 0.1);
+ }
+ return 0;
- for (int i = 0; i < 3; i++)
- {
- mat(i,0) = g1(i);
- mat(i,1) = g2(i);
- mat(i,2) = g3(i);
- }
+ }
- if (fabs (Det (mat)) < cpeps1 * normprod)
- return 1;
- else
- return 0;
-}
-
+ bool SpecialPointCalculation ::
+ CrossPointDegenerated (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const BoxSphere<3> & box) const
+ {
+ Mat<3> mat;
+ Vec<3> g1, g2, g3;
+ double normprod;
-void SpecialPointCalculation :: CrossPointNewton (const Surface * f1,
- const Surface * f2,
- const Surface * f3, Point<3> & p)
-{
- int i;
- Vec<3> g1, g2, g3;
- Vec<3> rs, sol;
- Mat<3> mat;
+ if (box.Diam() > relydegtest) return 0;
- i = 10;
- while (i > 0)
- {
- i--;
- rs(0) = f1->CalcFunctionValue (p);
- rs(1) = f2->CalcFunctionValue (p);
- rs(2) = f3->CalcFunctionValue (p);
+ f1->CalcGradient (box.Center(), g1);
+ normprod = Abs2 (g1);
- f1->CalcGradient (p, g1);
- f2->CalcGradient (p, g2);
- f3->CalcGradient (p, g3);
+ f2->CalcGradient (box.Center(), g2);
+ normprod *= Abs2 (g2);
+
+ f3->CalcGradient (box.Center(), g3);
+ normprod *= Abs2 (g3);
- for (int j = 0; j < 3; j++)
- {
- mat(0, j) = g1(j);
- mat(1, j) = g2(j);
- mat(2, j) = g3(j);
- }
- mat.Solve (rs, sol);
- /*
- Transpose (g1, g2, g3);
- SolveLinearSystem (g1, g2, g3, rs, sol);
- */
- if (sol.Length() < 1e-12 && i > 1) i = 1;
-
- p -= sol;
- }
-}
+ for (int i = 0; i < 3; i++)
+ {
+ mat(i,0) = g1(i);
+ mat(i,1) = g2(i);
+ mat(i,2) = g3(i);
+ }
+ return sqr (Det (mat)) < sqr(cpeps1) * normprod;
+ }
+
-/******* Tests for Point on edges **********************/
+ void SpecialPointCalculation :: CrossPointNewton (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3, Point<3> & p)
+ {
+ Vec<3> g1, g2, g3;
+ Vec<3> rs, sol;
+ Mat<3> mat;
+ int i = 10;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+ f3->CalcGradient (p, g3);
-bool SpecialPointCalculation ::
-EdgeNewtonConvergence (const Surface * f1, const Surface * f2,
- const Point<3> & p)
-{
- int i;
- Vec<3> g1, g2, sol;
- Vec<2> vrs;
- double alpha, beta, gamma, eta;
- double sum;
- Mat<2,3> mat;
- Mat<3,2> inv;
- int j;
-
- vrs(0) = f1->CalcFunctionValue (p);
- vrs(1) = f2->CalcFunctionValue (p);
-
- f1->CalcGradient (p, g1);
- f2->CalcGradient (p, g2);
-
- for (i = 0; i < 3; i++)
- {
- mat(0,i) = g1(i);
- mat(1,i) = g2(i);
- }
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0, j) = g1(j);
+ mat(1, j) = g2(j);
+ mat(2, j) = g3(j);
+ }
+ mat.Solve (rs, sol);
+ if (sol.Length2() < 1e-24 && i > 1) i = 1;
- alpha = 1;
+ p -= sol;
+ }
+ }
- if ( fabs(g1 * g2) < (1 - 1e-8) * Abs (g1) * Abs (g2))
- {
- CalcInverse (mat, inv);
- sol = inv * vrs;
- // SolveLinearSystemLS (g1, g2, vrs, sol);
- gamma = f1 -> HesseNorm() + f2 -> HesseNorm();
- /*
- Vec<3> inv1, inv2;
- PseudoInverse (g1, g2, inv1, inv2);
- */
-
- beta = 0;
- for (i = 0; i < 3; i++)
- for (j = 0; j < 2; j++)
- beta += inv(i,j) * inv(i,j);
- beta = sqrt (beta);
-
- // beta = inv1.Length() + inv2.Length();
- eta = Abs (sol);
- alpha = beta * gamma * eta;
- }
- return (alpha < 0.1);
-}
+ /******* Tests for Point on edges **********************/
-bool SpecialPointCalculation ::
-EdgeDegenerated (const Surface * f1,
- const Surface * f2,
- const BoxSphere<3> & box) const
-{
- // perform newton steps. normals parallel ?
- // if not decideable: return 0
-
-
- Point<3> p = box.Center();
- int i;
- Vec<3> grad, g1, g2, sol;
- Vec<2> vrs;
- Mat<2,3> mat;
-
- i = 20;
- while (i > 0)
- {
- if (Dist (p, box.Center()) > box.Diam())
- return 0;
+ bool SpecialPointCalculation ::
+ EdgeNewtonConvergence (const Surface * f1, const Surface * f2,
+ const Point<3> & p)
+ {
+ Vec<3> g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+ Mat<3,2> inv;
- i--;
- vrs(0) = f1->CalcFunctionValue (p);
- vrs(1) = f2->CalcFunctionValue (p);
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
- f1->CalcGradient (p, g1);
- f2->CalcGradient (p, g2);
+ if ( sqr(g1 * g2) < (1 - 1e-8) * Abs2 (g1) * Abs2 (g2))
+ {
+ double gamma = f1 -> HesseNorm() + f2 -> HesseNorm();
+ if (gamma < 1e-32) return 1;
+ gamma = sqr (gamma);
+
+ for (int i = 0; i < 3; i++)
+ {
+ mat(0,i) = g1(i);
+ mat(1,i) = g2(i);
+ }
- if ( fabs (g1 * g2) > (1 - 1e-10) * Abs (g1) * Abs (g2))
- return 1;
+ CalcInverse (mat, inv);
- for (int j = 0; j < 3; j++)
- {
- mat(0,j) = g1(j);
- mat(1,j) = g2(j);
- }
- mat.Solve (vrs, sol);
- // SolveLinearSystemLS (g1, g2, vrs, sol);
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+ sol = inv * vrs;
- if (Abs (sol) < 1e-12 && i > 1) i = 1;
- p -= sol;
- }
+ double beta = 0;
+ for (int i = 0; i < 3; i++)
+ for (int j = 0; j < 2; j++)
+ beta += inv(i,j) * inv(i,j);
+ // beta = sqrt (beta);
- return 0;
- /*
- return 0;
+ double eta = Abs2 (sol);
- static DenseMatrix jacobi(3);
- Vec<3> grad, g1, g2, g3;
- double normprod;
-
- if (box.Diam() > relydegtest) return 0;
-
- f1->CalcGradient (box.Center(), g1);
- normprod = g1.Length();
-
- f2->CalcGradient (box.Center(), g2);
- normprod *= g2.Length();
-
- if (fabs (g1 * g2) < 1e-8 * normprod)
- return 1;
- else
+ // alpha = beta * gamma * eta;
+ return (beta * gamma * eta < 0.01);
+ }
return 0;
- */
-}
+ }
+ bool SpecialPointCalculation ::
+ EdgeDegenerated (const Surface * f1,
+ const Surface * f2,
+ const BoxSphere<3> & box) const
+ {
+ // perform newton steps. normals parallel ?
+ // if not decideable: return 0
+
+ Point<3> p = box.Center();
+ Vec<3> g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+ int i = 20;
+ while (i > 0)
+ {
+ if (Dist2 (p, box.Center()) > sqr(box.Diam()))
+ return 0;
-void SpecialPointCalculation :: EdgeNewton (const Surface * f1,
- const Surface * f2, Point<3> & p)
-{
- int i;
- Vec<3> grad, g1, g2, sol;
- Vec<2> vrs;
- Mat<2,3> mat;
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
- i = 10;
- while (i > 0)
- {
- i--;
- vrs(0) = f1->CalcFunctionValue (p);
- vrs(1) = f2->CalcFunctionValue (p);
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
- f1->CalcGradient (p, g1);
- f2->CalcGradient (p, g2);
+ if ( sqr (g1 * g2) > (1 - 1e-10) * Abs2 (g1) * Abs2 (g2))
+ return 1;
- for (int j = 0; j < 3; j++)
- {
- mat(0,j) = g1(j);
- mat(1,j) = g2(j);
- }
- mat.Solve (vrs, sol);
- // SolveLinearSystemLS (g1, g2, vrs, sol);
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
- if (Abs (sol) < 1e-12 && i > 1) i = 1;
- p -= sol;
- }
-}
+ if (Abs2 (sol) < 1e-24 && i > 1) i = 1;
+ p -= sol;
+ }
+ return 0;
+ }
-bool SpecialPointCalculation ::
-IsEdgeExtremalPoint (const Surface * f1, const Surface * f2,
- const Point<3> & p, Point<3> & pp, double rad)
-{
- Vec<3> g1, g2, t, t1, t2;
- int j;
- f1->CalcGradient (p, g1);
- f2->CalcGradient (p, g2);
-
- t = Cross (g1, g2);
- t.Normalize();
-
- Point<3> p1 = p + rad * t;
- Point<3> p2 = p - rad * t;
- EdgeNewton (f1, f2, p1);
- EdgeNewton (f1, f2, p2);
-
- f1->CalcGradient (p1, g1);
- f2->CalcGradient (p1, g2);
- t1 = Cross (g1, g2);
- t1.Normalize();
-
- f1->CalcGradient (p2, g1);
- f2->CalcGradient (p2, g2);
- t2 = Cross (g1, g2);
- t2.Normalize();
-
- double val = 1e-8 * rad * rad;
- for (j = 0; j < 3; j++)
- if ( (t1(j) * t2(j) < -val) )
- {
- pp = p;
- ExtremalPointNewton (f1, f2, j+1, pp);
- return 1;
- }
- return 0;
-}
+ void SpecialPointCalculation :: EdgeNewton (const Surface * f1,
+ const Surface * f2, Point<3> & p)
+ {
+ Vec<3> g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+ int i = 10;
+ while (i > 0)
+ {
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
+ if (Abs2 (sol) < 1e-24 && i > 1) i = 1;
+ p -= sol;
+ }
+ }
+ bool SpecialPointCalculation ::
+ IsEdgeExtremalPoint (const Surface * f1, const Surface * f2,
+ const Point<3> & p, Point<3> & pp, double rad)
+ {
+ Vec<3> g1, g2, t, t1, t2;
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ t = Cross (g1, g2);
+ t.Normalize();
-/********** Tests of Points of extremal coordinates ****************/
+ Point<3> p1 = p + rad * t;
+ Point<3> p2 = p - rad * t;
+ EdgeNewton (f1, f2, p1);
+ EdgeNewton (f1, f2, p2);
+
+ f1->CalcGradient (p1, g1);
+ f2->CalcGradient (p1, g2);
+ t1 = Cross (g1, g2);
+ t1.Normalize();
+
+ f1->CalcGradient (p2, g1);
+ f2->CalcGradient (p2, g2);
+ t2 = Cross (g1, g2);
+ t2.Normalize();
+
+ double val = 1e-8 * rad * rad;
+ for (int j = 0; j < 3; j++)
+ if ( (t1(j) * t2(j) < -val) )
+ {
+ pp = p;
+ ExtremalPointNewton (f1, f2, j+1, pp);
+ return 1;
+ }
-void SpecialPointCalculation :: ExtremalPointNewton (const Surface * f1,
- const Surface * f2,
- int dir, Point<3> & p)
-{
- int i;
+ return 0;
+ }
- Vec<3> g1, g2, v, curv;
- Vec<3> rs, x, y1, y2, y;
- Mat<3> h1, h2;
- Mat<3> jacobi;
- if (dir < 1 || dir > 3)
- {
- cerr << "Error: Illegal extremdir" << endl;
- return;
- }
- i = 50;
- while (i > 0)
- {
- i--;
- rs(0) = f1->CalcFunctionValue (p);
- rs(1) = f2->CalcFunctionValue (p);
- f1 -> CalcGradient (p, g1);
- f2 -> CalcGradient (p, g2);
- f1 -> CalcHesse (p, h1);
- f2 -> CalcHesse (p, h2);
- v = Cross (g1, g2);
- rs(2) = v(dir-1);
+ /********** Tests of Points of extremal coordinates ****************/
- jacobi(0,0) = g1(0);
- jacobi(0,1) = g1(1);
- jacobi(0,2) = g1(2);
- jacobi(1,0) = g2(0);
- jacobi(1,1) = g2(1);
- jacobi(1,2) = g2(2);
+ void SpecialPointCalculation :: ExtremalPointNewton (const Surface * f1,
+ const Surface * f2,
+ int dir, Point<3> & p)
+ {
+ Vec<3> g1, g2, v, curv;
+ Vec<3> rs, x, y1, y2, y;
+ Mat<3> h1, h2;
+ Mat<3> jacobi;
+
+ int i = 50;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
- switch (dir)
- {
- case 1:
- {
- y1(0) = 0;
- y1(1) = g2(2);
- y1(2) = -g2(1);
- y2(0) = 0;
- y2(1) = -g1(2);
- y2(2) = g1(1);
- break;
- }
- case 2:
- {
- y1(0) = -g2(2);
- y1(1) = 0;
- y1(2) = g2(0);
- y2(0) = g1(2);
- y2(1) = 0;
- y2(2) = -g1(0);
- break;
- }
- case 3:
- {
- y1(0) = g2(1);
- y1(1) = -g2(0);
- y1(2) = 0;
- y2(0) = -g1(1);
- y2(1) = g1(0);
- y2(2) = 0;
- break;
- }
- }
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
- y = h1 * y1 + h2 * y2;
+ v = Cross (g1, g2);
- jacobi(2,0) = y(0);
- jacobi(2,1) = y(1);
- jacobi(2,2) = y(2);
+ rs(2) = v(dir-1);
- jacobi.Solve (rs, x);
- /*
- CalcInverse (jacobi, inv);
- inv.Mult (rs, x);
- */
- // (*testout) << "err = " << x.L2Norm() << endl;
+ jacobi(0,0) = g1(0);
+ jacobi(0,1) = g1(1);
+ jacobi(0,2) = g1(2);
- if (Abs (x) < 1e-12 && i > 1)
- {
- // (*testout) << "convergent in " << (10 - i) << " steps " << endl;
+ jacobi(1,0) = g2(0);
+ jacobi(1,1) = g2(1);
+ jacobi(1,2) = g2(2);
- i = 1;
- }
-
- p -= x;
- }
- if (Abs (x) > 1e-10)
- {
- (*testout) << "Error: extremum Newton not convergent" << endl;
- (*testout) << "dir = " << dir << endl;
- (*testout) << "p = " << p << endl;
- (*testout) << "x = " << x << endl;
- }
-}
+ switch (dir)
+ {
+ case 1:
+ {
+ y1(0) = 0;
+ y1(1) = g2(2);
+ y1(2) = -g2(1);
+ y2(0) = 0;
+ y2(1) = -g1(2);
+ y2(2) = g1(1);
+ break;
+ }
+ case 2:
+ {
+ y1(0) = -g2(2);
+ y1(1) = 0;
+ y1(2) = g2(0);
+ y2(0) = g1(2);
+ y2(1) = 0;
+ y2(2) = -g1(0);
+ break;
+ }
+ case 3:
+ {
+ y1(0) = g2(1);
+ y1(1) = -g2(0);
+ y1(2) = 0;
+ y2(0) = -g1(1);
+ y2(1) = g1(0);
+ y2(2) = 0;
+ break;
+ }
+ }
+ y = h1 * y1 + h2 * y2;
+ jacobi(2,0) = y(0);
+ jacobi(2,1) = y(1);
+ jacobi(2,2) = y(2);
+ jacobi.Solve (rs, x);
-bool SpecialPointCalculation :: ExtremalPointPossible (const Surface * f1,
- const Surface * f2,
- int dir,
- const BoxSphere<3> & box)
-{
- double hn1, hn2, gn1, gn2;
- Point<3> p;
- Vec<3> g1, g2, v;
- double f3;
- double r = box.Diam()/2;
+ if (Abs2 (x) < 1e-24 && i > 1)
+ {
+ i = 1;
+ }
+
+ p -= x;
+ }
- p = box.Center();
- f1 -> CalcGradient (p, g1);
- f2 -> CalcGradient (p, g2);
+ if (Abs2 (x) > 1e-20)
+ {
+ (*testout) << "Error: extremum Newton not convergent" << endl;
+ (*testout) << "dir = " << dir << endl;
+ (*testout) << "p = " << p << endl;
+ (*testout) << "x = " << x << endl;
+ }
+ }
- gn1 = g1.Length();
- gn2 = g2.Length();
- hn1 = f1 -> HesseNorm ();
- hn2 = f2 -> HesseNorm ();
- v = Cross (g1, g2);
- f3 = fabs (v(dir-1));
+ void SpecialPointCalculation ::
+ ComputeExtremalPoints (const Plane * plane,
+ const QuadraticSurface * quadric,
+ ARRAY<Point<3> > & pts)
+ {
+ // 3 equations:
+ // surf1 = 0 <===> plane_a + plane_b x = 0;
+ // surf2 = 0 <===> quad_a + quad_b x + x^T quad_c x = 0
+ // (grad 1 x grad 2)(i) = 0 <====> (grad 1 x e_i) . grad_2 = 0
- // (*testout) << "f3 = " << f3 << " r = " << r
- // << "normbound = "
- // << (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)) << endl;
-
- return (f3 <= 3 * r * (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)));
-}
+ pts.SetSize (0);
+ Point<3> p0(0,0,0);
+ double plane_a, quad_a;
+ Vec<3> plane_b, quad_b, ei;
+ Mat<3> quad_c;
+ plane_a = plane -> CalcFunctionValue(p0);
+ plane -> CalcGradient (p0, plane_b);
-bool SpecialPointCalculation ::
-ExtremalPointNewtonConvergence (const Surface * f1, const Surface * f2,
- int dir,
- const BoxSphere<3> & box)
-{
- return box.Diam() < 1e-8;
-}
+ quad_a = quadric -> CalcFunctionValue(p0);
+ quadric -> CalcGradient (p0, quad_b);
+ quadric -> CalcHesse (p0, quad_c);
+ for (int i = 0; i < 3; i++)
+ for (int j = 0; j < 3; j++)
+ quad_c(i,j) *= 0.5;
+ for (int dir = 0; dir <= 2; dir++)
+ {
+ ei = 0.0; ei(dir) = 1;
+ Vec<3> v1 = Cross (plane_b, ei);
+
+ // grad_2 . v1 ... linear:
+ double g2v1_c = v1 * quad_b;
+ Vec<3> g2v1_l = 2.0 * (quad_c * v1);
+
+ // find line of two linear equations:
+
+ Vec<2> rhs;
+ Vec<3> sol;
+ Mat<2,3> mat;
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = plane_b(j);
+ mat(1,j) = g2v1_l(j);
+ }
+ rhs(0) = -plane_a;
+ rhs(1) = -g2v1_c;
-bool SpecialPointCalculation ::
-ExtremalPointDegenerated (const Surface * f1, const Surface * f2,
- int dir, const BoxSphere<3> & box)
-{
- double gn1, gn2;
- Point<3> p;
- Vec<3> g1, g2, v;
- double maxderiv;
- double minv;
- Vec<3> curv, t;
- Vec<2> rs, x;
- Mat<3> h1, h2;
- Mat<2> a, inv;
- double leftside;
-
- if (box.Diam() > relydegtest) return 0;
-
- p = box.Center();
-
- f1 -> CalcGradient (p, g1);
- f2 -> CalcGradient (p, g2);
- gn1 = g1.Length();
- gn2 = g2.Length();
-
- v = Cross (g1, g2);
- if (Abs (v) < epeps1 * gn1 * gn2) return 1; // irregular edge
-
- f1 -> CalcHesse (p, h1);
- f2 -> CalcHesse (p, h2);
-
- // hn1 = f1 -> HesseNorm ();
- // hn2 = f2 -> HesseNorm ();
-
- t = v;
- a(0, 0) = g1 * g1;
- a(0, 1) =
- a(1, 0) = g1 * g2;
- a(1, 1) = g2 * g2;
-
- rs(0) = g1(dir-1);
- rs(1) = g2(dir-1);
+ Vec<3> t = Cross (plane_b, g2v1_l);
+ if (Abs2(t) > 0)
+ {
+ mat.Solve (rhs, sol);
+
+ // solve quadratic equation along line sol + alpha t ....
+ double a = quad_a + quad_b * sol + sol * (quad_c * sol);
+ double b = quad_b * t + 2 * (sol * (quad_c * t));
+ double c = t * (quad_c * t);
- a.Solve (rs, x);
+ // solve a + b alpha + c alpha^2:
- /*
- CalcInverse (a, inv);
- inv.Mult (rs, x); // x .. Lagrangeparameter
- */
- // (*testout) << "g1 = " << g1 << " g2 = " << g2 << endl;
- // (*testout) << "lam = " << x << endl;
- // (*testout) << "h2 = " << h2 << endl;
+ if (fabs (c) > 1e-32)
+ {
+ double disc = sqr (0.5*b/c) - a/c;
+ if (disc > 0)
+ {
+ disc = sqrt (disc);
+ double alpha1 = -0.5*b/c + disc;
+ double alpha2 = -0.5*b/c - disc;
+
+ pts.Append (Point<3> (sol+alpha1*t));
+ pts.Append (Point<3> (sol+alpha2*t));
+ /*
+ cout << "sol1 = " << sol + alpha1 * t
+ << ", sol2 = " << sol + alpha2 * t << endl;
+ */
+ }
+ }
+ }
+ }
+ }
- leftside = fabs (x(0) * ( t * (h1 * t)) +
- x(1) * ( t * (h2 * t)));
- // (*testout) << "leftside = " << leftside << endl;
- if (leftside < epeps2 * Abs2 (v)) return 1;
- return 0;
-}
-
-bool SpecialPointCalculation :: AddPoint (const Point<3> & p, int layer)
-{
- for (int i = 0; i < points->Size(); i++)
- if (Dist2 ( (*points)[i], p) < epspointdist2 &&
- (*points)[i].GetLayer() == layer)
- return 0;
+ /*
+ bool SpecialPointCalculation :: ExtremalPointPossible (const Surface * f1,
+ const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
+ {
+ double hn1, hn2, gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double f3;
+ double r = box.Diam()/2;
- points->Append (MeshPoint(p, layer));
- return 1;
-}
+ p = box.Center();
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+ hn1 = f1 -> HesseNorm ();
+ hn2 = f2 -> HesseNorm ();
+ v = Cross (g1, g2);
+ f3 = fabs (v(dir-1));
+ // (*testout) << "f3 = " << f3 << " r = " << r
+ // << "normbound = "
+ // << (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)) << endl;
+
+ return (f3 <= 3 * r * (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)));
+ }
-/*
-void SpecialPointCalculation ::
-AnalyzeSpecialPoints (const CSGeometry & ageometry,
- ARRAY<Point<3> > & apoints,
- ARRAY<SpecialPoint> & specpoints)
-{
- int si, i, j, k, l, m, spi;
- Solid * locsol;
- ARRAY<int> surfind;
- ARRAY<Vec<3>> normalvecs;
- const Solid * sol;
- Vec<3> t;
- Point<3> p;
-
- ARRAY<int> specpoint2point;
- specpoints.SetSize (0);
-
- (*testout) << "AnalyzeSpecialPoints" << endl;
- for (si = 1; si <= ageometry.GetNTopLevelObjects(); si++)
+ bool SpecialPointCalculation ::
+ ExtremalPointNewtonConvergence (const Surface * f1, const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
{
- (*testout) << "main solid " << si << endl;
-
- sol = ageometry.GetTopLevelObject(si)->GetSolid();
- for (i = 1; i <= apoints.Size(); i++)
- {
- p = apoints.Get(i);
+ return box.Diam() < 1e-8;
+ }
- sol -> TangentialSolid (p, locsol);
- if (!locsol) continue;
-
- (*testout) << "Point " << apoints.Get(i) << endl;
- locsol -> GetSurfaceIndices (surfind);
- for (j = surfind.Size(); j >= 1; j--)
- if (fabs (ageometry.GetSurface(surfind.Get(j))->
- CalcFunctionValue (p)) > 1e-6)
- surfind.DeleteElement (j);
+ bool SpecialPointCalculation ::
+ ExtremalPointDegenerated (const Surface * f1, const Surface * f2,
+ int dir, const BoxSphere<3> & box)
+ {
+ double gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double maxderiv;
+ double minv;
+ Vec<3> curv, t;
+ Vec<2> rs, x;
+ Mat<3> h1, h2;
+ Mat<2> a, inv;
+ double leftside;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ p = box.Center();
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+
+ v = Cross (g1, g2);
+ if (Abs (v) < epeps1 * gn1 * gn2) return 1; // irregular edge
+
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
+
+ // hn1 = f1 -> HesseNorm ();
+ // hn2 = f2 -> HesseNorm ();
+
+ t = v;
+ a(0, 0) = g1 * g1;
+ a(0, 1) =
+ a(1, 0) = g1 * g2;
+ a(1, 1) = g2 * g2;
+
+ rs(0) = g1(dir-1);
+ rs(1) = g2(dir-1);
+ a.Solve (rs, x);
+ // (*testout) << "g1 = " << g1 << " g2 = " << g2 << endl;
+ // (*testout) << "lam = " << x << endl;
+ // (*testout) << "h2 = " << h2 << endl;
- (*testout) << "Surfaces: ";
- for (j = 1; j <= surfind.Size(); j++)
- (*testout) << surfind.Get(j) << " ";
- (*testout) << endl;
+ leftside = fabs (x(0) * ( t * (h1 * t)) +
+ x(1) * ( t * (h2 * t)));
- normalvecs.SetSize(surfind.Size());
- for (j = 1; j <= surfind.Size(); j++)
- ageometry.GetSurface(surfind.Get(j)) ->
- GetNormalVector(apoints.Get(i), normalvecs.Elem(j));
+ // (*testout) << "leftside = " << leftside << endl;
- for (j = 1; j <= normalvecs.Size() - 1; j ++)
- for (k = j+1; k <= normalvecs.Size(); k++)
- for (l = 1; l <= 2; l++)
- {
- t = Cross (normalvecs.Get(j), normalvecs.Get(k));
- if (t.Length2() < 1e-8)
- {
- cerr << "AnalyzePoint: Surfaces degenerated" << endl;
- break;
- }
- t /= t.Length();
- if (l == 2) t *= -1;
+ if (leftside < epeps2 * Abs2 (v)) return 1;
- if (locsol -> Edge (apoints.Get(i), t))
- {
- spi = 0;
- for (m = 1; m <= specpoints.Size(); m++)
- if (Dist2 (specpoints.Get(m).p, apoints.Get(i)) < 1e-8
- && (specpoints.Get(m).v - t).Length2() < 1e-8)
- {
- spi = m;
- break;
- }
- if (!spi)
- {
- spi = specpoints.Append (SpecialPoint());
- specpoint2point.Append (i);
- specpoints.Last().unconditional = 0;
- }
- specpoints.Elem(spi).p = apoints.Get(i);
- specpoints.Elem(spi).v = t;
- if (surfind.Size() >= 3)
- specpoints.Elem(spi).unconditional = 1;
- specpoints.Elem(spi).s1 = surfind.Get(j);
- specpoints.Elem(spi).s2 = surfind.Get(k);
- (*testout) << "spi = " << spi
- << " uncond = " << specpoints.Get(spi).unconditional
- << " t = " << t << endl;
- }
-
- }
- delete locsol;
- }
+ return 0;
}
+ */
+
- // if special point is unconditional on some solid,
- // it must be unconditional everywhere:
+ bool SpecialPointCalculation :: AddPoint (const Point<3> & p, int layer)
+ {
+ for (int i = 0; i < points->Size(); i++)
+ if (Dist2 ( (*points)[i], p) < epspointdist2 &&
+ (*points)[i].GetLayer() == layer)
+ return 0;
- BitArray uncond (apoints.Size());
- uncond.Clear();
+ points->Append (MeshPoint(p, layer));
+ PrintMessageCR (3, "Found points ", points->Size());
+ return 1;
+ }
- for (i = 1; i <= specpoints.Size(); i++)
- if (specpoints.Get(i).unconditional)
- uncond.Set (specpoint2point.Get(i));
- for (i = 1; i <= specpoints.Size(); i++)
- specpoints.Elem(i).unconditional =
- uncond.Test (specpoint2point.Get(i)) ? 1 : 0;
-}
-*/
-void SpecialPointCalculation ::
-AnalyzeSpecialPoints (const CSGeometry & ageometry,
- ARRAY<MeshPoint> & apoints,
- ARRAY<SpecialPoint> & specpoints)
-{
- int si, i, j, k, l, m, spi;
- Solid * locsol;
- ARRAY<int> surfind;
- ARRAY<int> surfind2;
- ARRAY<Vec<3> > normalvecs;
- const Solid * sol;
- const Surface * surf;
+ void SpecialPointCalculation ::
+ AnalyzeSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints,
+ ARRAY<SpecialPoint> & specpoints)
+ {
+ ARRAY<int> surfind;
+ ARRAY<int> surfind2;
- Vec<3> t, nsurf;
- Point<3> p;
+ ARRAY<Vec<3> > normalvecs;
+ Vec<3> t, nsurf;
+ Point<3> p;
- ARRAY<int> specpoint2point;
- specpoints.SetSize (0);
+ ARRAY<int> specpoint2point;
+ specpoints.SetSize (0);
- geometry = &ageometry;
+ geometry = &ageometry;
- (*testout) << "AnalyzeSpecialPoints\n";
-
- for (si = 0; si < ageometry.GetNTopLevelObjects(); si++)
- {
- (*testout) << "main solid " << si << "\n";
+ (*testout) << "AnalyzeSpecialPoints\n";
- sol = ageometry.GetTopLevelObject(si)->GetSolid();
- surf = ageometry.GetTopLevelObject(si)->GetSurface();
- for (i = 0; i < apoints.Size(); i++)
- {
- p = apoints[i];
- if (ageometry.GetTopLevelObject(si)->GetLayer() !=
- apoints[i].GetLayer())
- continue;
-
- // (*testout) << "Point " << apoints[i] << "\n";
-
- sol -> TangentialSolid (p, locsol);
- if (!locsol) continue;
-
- // get all surface indices,
- if (surf)
- {
- locsol -> GetSurfaceIndices (surfind);
- bool hassurf = 0;
- for (m = 0; m < surfind.Size(); m++)
- if (ageometry.GetSurface(surfind[m]) == surf)
- hassurf = 1;
-
- if (!hassurf)
- continue;
+ Box<3> bbox;
+ if (apoints.Size())
+ bbox.Set (apoints[0]);
+ else
+ { bbox.Set (Point<3> (0,0,0)); bbox.Add (Point<3> (1,1,1)); }
+ for (int i = 1; i < apoints.Size(); i++)
+ bbox.Add (apoints[i]);
+ bbox.Increase (0.1 * Dist (bbox.PMin(), bbox.PMax()));
- surf->GetNormalVector (p, nsurf);
- }
-
- // get independent surfaces of tangential solid
-
- BoxSphere<3> box(p,p);
- box.Increase (1e-6);
- box.CalcDiamCenter();
- ageometry.GetIndependentSurfaceIndices (locsol, box, surfind);
+ Point3dTree searchtree (bbox.PMin(), bbox.PMax());
+ ARRAY<int> locsearch;
+ for (int si = 0; si < ageometry.GetNTopLevelObjects(); si++)
+ {
+ // (*testout) << "main solid " << si << "\n";
+
+ const Solid * sol = ageometry.GetTopLevelObject(si)->GetSolid();
+ const Surface * surf = ageometry.GetTopLevelObject(si)->GetSurface();
- /*
- locsol -> GetSurfaceIndices (surfind);
- for (j = surfind.Size(); j >= 1; j--)
- if (fabs (ageometry.GetSurface(surfind.Get(j))->
- CalcFunctionValue (p)) > 1e-6)
- surfind.DeleteElement (j);
- */
+ for (int i = 0; i < apoints.Size(); i++)
+ {
+ p = apoints[i];
+ if (ageometry.GetTopLevelObject(si)->GetLayer() !=
+ apoints[i].GetLayer())
+ continue;
- /*
- (*testout) << "Surfaces: ";
- for (j = 0; j < surfind.Size(); j++)
- (*testout) << surfind[j] << " ";
- (*testout) << "\n";
- */
+ // (*testout) << "Point " << apoints[i] << "\n";
+ Solid * locsol;
+ sol -> TangentialSolid (p, locsol);
+ if (!locsol) continue;
+
+ // get all surface indices,
+ if (surf)
+ {
+ locsol -> GetSurfaceIndices (surfind);
+ bool hassurf = 0;
+ for (int m = 0; m < surfind.Size(); m++)
+ if (ageometry.GetSurface(surfind[m]) == surf)
+ hassurf = 1;
- normalvecs.SetSize(surfind.Size());
- for (j = 0; j < surfind.Size(); j++)
- ageometry.GetSurface(surfind[j]) ->
- GetNormalVector(apoints[i], normalvecs[j]);
+ if (!hassurf)
+ continue;
- for (j = 0; j < normalvecs.Size(); j++)
- for (k = j+1; k < normalvecs.Size(); k++)
- for (l = 1; l <= 2; l++)
- {
- t = Cross (normalvecs[j], normalvecs[k]);
- if (Abs2 (t) < 1e-8)
- {
- cerr << "AnalyzePoint: Surfaces degenerated" << "\n";
- break;
- }
- t.Normalize();
- if (l == 2) t *= -1;
+ nsurf = surf->GetNormalVector (p);
+ }
- // try tangential direction t
+ // get independent surfaces of tangential solid
- // (*testout) << "check tangential " << t << "\n";
+ BoxSphere<3> box(p,p);
+ box.Increase (1e-6);
+ box.CalcDiamCenter();
+ ageometry.GetIndependentSurfaceIndices (locsol, box, surfind);
- if (surf && fabs (nsurf * t) > 1e-6)
- continue;
+ normalvecs.SetSize(surfind.Size());
+ for (int j = 0; j < surfind.Size(); j++)
+ normalvecs[j] =
+ ageometry.GetSurface(surfind[j]) -> GetNormalVector(apoints[i]);
- if (!surf)
- {
- ageometry.GetIndependentSurfaceIndices
- (locsol, p, t, surfind2);
+ for (int j = 0; j < normalvecs.Size(); j++)
+ for (int k = j+1; k < normalvecs.Size(); k++)
+ for (int l = 1; l <= 2; l++)
+ {
+ t = Cross (normalvecs[j], normalvecs[k]);
+ if (Abs2 (t) < 1e-8)
+ {
+ cerr << "AnalyzePoint: Surfaces degenerated" << "\n";
+ break;
+ }
+ t.Normalize();
+ if (l == 2) t *= -1;
+
+ // try tangential direction t
+
+ // (*testout) << "check tangential " << t << "\n";
+
+ if (surf && fabs (nsurf * t) > 1e-6)
+ continue;
+
+ if (!surf)
+ {
+ ageometry.GetIndependentSurfaceIndices
+ (locsol, p, t, surfind2);
- bool found1 = 0, found2 = 0;
- for (int ii = 0; ii < surfind2.Size(); ii++)
- {
- if (surfind2[ii] == surfind[j])
- found1 = 1;
- if (surfind2[ii] == surfind[k])
- found2 = 1;
- }
- if (!found1 || !found2)
- continue;
- }
+ bool found1 = 0, found2 = 0;
+ for (int ii = 0; ii < surfind2.Size(); ii++)
+ {
+ if (surfind2[ii] == surfind[j])
+ found1 = 1;
+ if (surfind2[ii] == surfind[k])
+ found2 = 1;
+ }
+ if (!found1 || !found2)
+ continue;
+ }
- bool isedge;
+ bool isedge;
- // isedge = locsol -> Edge (apoints.Get(i), t);
+ // isedge = locsol -> Edge (apoints.Get(i), t);
- // edge must be on tangential surface
- isedge =
- locsol->VectorIn (p, t) &&
- !locsol->VectorStrictIn (p, t);
+ // edge must be on tangential surface
+ isedge =
+ locsol->VectorIn (p, t) &&
+ !locsol->VectorStrictIn (p, t);
- // (*testout) << "isedge,1 = " << isedge << "\n";
+ // (*testout) << "isedge,1 = " << isedge << "\n";
- // there must exist at least two different faces on edge
- if (isedge)
- {
- int cnts = 0;
- for (m = 0; m < surfind.Size(); m++)
- {
- if (fabs (normalvecs[m] * t) > 1e-6)
- continue;
-
- Vec<3> s = Cross (normalvecs[m], t);
- Vec<3> t2a = t + 0.01 *s;
- Vec<3> t2b = t - 0.01 *s;
-
- /*
- (*testout) << "nv = " << normalvecs[m] << ", s = " << s << "\n";
- (*testout) << "t2a = " << t2a << ", t2b = " << t2b << "\n";
- (*testout) << "via = "
- << locsol->VectorIn (p, t2a) << "/"
- << locsol->VectorStrictIn (p, t2a);
- (*testout) << "vib = "
- << locsol->VectorIn (p, t2b) << "/"
- << locsol->VectorStrictIn (p, t2b) << "\n";
- */
-
- bool isface =
- (locsol->VectorIn (p, t2a) &&
- !locsol->VectorStrictIn (p, t2a))
- ||
- (locsol->VectorIn (p, t2b) &&
- !locsol->VectorStrictIn (p, t2b));
+ // there must exist at least two different faces on edge
+ if (isedge)
+ {
+ int cnts = 0;
+ for (int m = 0; m < surfind.Size(); m++)
+ {
+ if (fabs (normalvecs[m] * t) > 1e-6)
+ continue;
+
+ Vec<3> s = Cross (normalvecs[m], t);
+ Vec<3> t2a = t + 0.01 *s;
+ Vec<3> t2b = t - 0.01 *s;
+
+ /*
+ (*testout) << "nv = " << normalvecs[m] << ", s = " << s << "\n";
+ (*testout) << "t2a = " << t2a << ", t2b = " << t2b << "\n";
+ (*testout) << "via = "
+ << locsol->VectorIn (p, t2a) << "/"
+ << locsol->VectorStrictIn (p, t2a);
+ (*testout) << "vib = "
+ << locsol->VectorIn (p, t2b) << "/"
+ << locsol->VectorStrictIn (p, t2b) << "\n";
+ */
+
+ bool isface =
+ (locsol->VectorIn (p, t2a) &&
+ !locsol->VectorStrictIn (p, t2a))
+ ||
+ (locsol->VectorIn (p, t2b) &&
+ !locsol->VectorStrictIn (p, t2b));
- if (isface)
+ if (isface)
+ {
+ cnts++;
+ }
+ }
+ if (cnts < 2) isedge = 0;
+ }
+
+ if (isedge)
+ {
+ int spi = -1;
+
+ searchtree.GetIntersecting (apoints[i]-Vec3d(1e-4,1e-4,1e-4),
+ apoints[i]+Vec3d(1e-4,1e-4,1e-4),
+ locsearch);
+
+ for (int m = 0; m < locsearch.Size(); m++)
+ if (Dist2 (specpoints[locsearch[m]].p, apoints[i]) < 1e-8
+ && Abs2(specpoints[locsearch[m]].v - t) < 1e-8)
{
- cnts++;
+ spi = locsearch[m];
+ break;
}
- }
- if (cnts < 2) isedge = 0;
- }
- if (isedge)
- {
- spi = -1;
- for (m = 0; m < specpoints.Size(); m++)
- if (Dist2 (specpoints[m].p, apoints[i]) < 1e-8
- && Abs2(specpoints[m].v - t) < 1e-8)
+
+ if (spi == -1)
{
- spi = m;
- break;
+ spi = specpoints.Append (SpecialPoint()) - 1;
+ specpoint2point.Append (i);
+ specpoints.Last().unconditional = 0;
+ searchtree.Insert (apoints[i], spi);
}
- if (spi == -1)
- {
- spi = specpoints.Append (SpecialPoint()) - 1;
- specpoint2point.Append (i);
- specpoints.Last().unconditional = 0;
- }
- specpoints[spi].p = apoints[i];
- specpoints[spi].v = t;
- if (surfind.Size() >= 3)
- specpoints[spi].unconditional = 1;
- specpoints[spi].s1 = surfind[j];
- specpoints[spi].s2 = surfind[k];
- specpoints[spi].layer = apoints[i].GetLayer();
- for (int up = 0; up < geometry->GetNUserPoints(); up++)
- if (Dist (geometry->GetUserPoint(up), apoints[i]) < 1e-10)
+
+ specpoints[spi].p = apoints[i];
+ specpoints[spi].v = t;
+ if (surfind.Size() >= 3)
specpoints[spi].unconditional = 1;
-
- /*
- (*testout) << "spi = " << spi
- << " uncond = " << specpoints[spi].unconditional
- << " t = " << t << "\n";
- */
- }
+ specpoints[spi].s1 = surfind[j];
+ specpoints[spi].s2 = surfind[k];
+ specpoints[spi].layer = apoints[i].GetLayer();
+ for (int up = 0; up < geometry->GetNUserPoints(); up++)
+ if (Dist (geometry->GetUserPoint(up), apoints[i]) < 1e-10)
+ specpoints[spi].unconditional = 1;
+ }
- }
- delete locsol;
- }
- }
+ }
+ delete locsol;
+ }
+ }
- // if special point is unconditional on some solid,
- // it must be unconditional everywhere:
+ // if special point is unconditional on some solid,
+ // it must be unconditional everywhere:
- BitArray uncond (apoints.Size());
- uncond.Clear();
+ BitArray uncond (apoints.Size());
+ uncond.Clear();
- for (i = 0; i < specpoints.Size(); i++)
- if (specpoints[i].unconditional)
- uncond.Set (specpoint2point[i]);
+ for (int i = 0; i < specpoints.Size(); i++)
+ if (specpoints[i].unconditional)
+ uncond.Set (specpoint2point[i]);
- for (i = 0; i < specpoints.Size(); i++)
- specpoints[i].unconditional =
- uncond.Test (specpoint2point[i]) ? 1 : 0;
-}
+ for (int i = 0; i < specpoints.Size(); i++)
+ specpoints[i].unconditional =
+ uncond.Test (specpoint2point[i]) ? 1 : 0;
+ }
}
diff --git a/Netgen/libsrc/csg/specpoin.hpp b/Netgen/libsrc/csg/specpoin.hpp
index 244361e652..8fd26f3207 100644
--- a/Netgen/libsrc/csg/specpoin.hpp
+++ b/Netgen/libsrc/csg/specpoin.hpp
@@ -3,7 +3,7 @@
/**************************************************************************/
-/* File: specpoin.hh */
+/* File: specpoin.hpp */
/* Author: Joachim Schoeberl */
/* Date: 01. Okt. 95 */
/**************************************************************************/
@@ -21,7 +21,6 @@ class Solid;
class SpecialPoint
{
public:
-
/// coordinates
Point<3> p;
/// tangential to edge
@@ -35,7 +34,7 @@ public:
int s1, s2;
///
- SpecialPoint () : p(), v(), layer(0)
+ SpecialPoint () : p(0,0,0), v(0,0,0), layer(0), unconditional(0), s1(0), s2(0)
{ ; }
///
@@ -51,7 +50,10 @@ public:
int GetLayer() const { return layer; }
///
- bool HasSurfaces (int as1, int as2) const;
+ bool HasSurfaces (int as1, int as2) const
+ {
+ return (s1 == as1 && s2 == as2 || s1 == as2 && s2 == as1);
+ }
};
@@ -119,7 +121,7 @@ protected:
-
+ /*
///
bool ExtremalPointPossible (const Surface * f1, const Surface * f2,
int dir, const BoxSphere<3> & box);
@@ -129,6 +131,7 @@ protected:
///
bool ExtremalPointNewtonConvergence (const Surface * f1, const Surface * f2,
int dir, const BoxSphere<3> & box);
+ */
///
void ExtremalPointNewton (const Surface * f1, const Surface * f2,
int dir, Point<3> & p);
@@ -136,6 +139,10 @@ protected:
///
bool AddPoint (const Point<3> & p, int layer);
+
+ void ComputeExtremalPoints (const Plane * plane,
+ const QuadraticSurface * quadric,
+ ARRAY<Point<3> > & pts);
};
#endif
diff --git a/Netgen/libsrc/csg/specpoin_new.cpp b/Netgen/libsrc/csg/specpoin_new.cpp
new file mode 100644
index 0000000000..4ac2c130fa
--- /dev/null
+++ b/Netgen/libsrc/csg/specpoin_new.cpp
@@ -0,0 +1,1367 @@
+#include <mystdlib.h>
+#include <meshing.hpp>
+#include <csg.hpp>
+
+
+/*
+ Special Point calculation uses the global Flags:
+
+ size .. 500 cube = [-size, size]^3
+ relydegtest when to rely on degeneration ?
+ calccp calculate points of intersection ?
+ cpeps1 eps for degenerated poi
+ calcep calculate points of extreme coordinates ?
+ epeps1 eps for degenerated edge
+ epeps2 eps for axis parallel pec
+ epspointdist eps for distance of special points
+*/
+
+
+namespace netgen
+{
+void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp);
+
+
+
+SpecialPoint :: SpecialPoint (const SpecialPoint & sp)
+{
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+}
+
+SpecialPoint & SpecialPoint :: operator= (const SpecialPoint & sp)
+{
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+ return *this;
+}
+
+
+void SpecialPoint :: Print (ostream & str)
+{
+ str << "p = " << p << " v = " << v
+ << " s1/s2 = " << s1 << "/" << s2
+ << " layer = " << layer
+ << endl;
+}
+
+
+
+
+SpecialPointCalculation :: SpecialPointCalculation ()
+{
+ ;
+}
+
+void SpecialPointCalculation ::
+CalcSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints)
+{
+ int i;
+
+ geometry = &ageometry;
+ points = &apoints;
+
+ size = geometry->MaxSize();
+ (*testout) << "Find Special Points" << endl;
+ (*testout) << "maxsize = " << size << endl;
+
+ cpeps1 = 1e-6;
+ epeps1 = 1e-3;
+ epeps2 = 1e-6;
+
+ epspointdist2 = sqr (size * 1e-8);
+ relydegtest = size * 1e-4;
+
+
+ BoxSphere<3> box (Point<3> (-size, -size, -size),
+ Point<3> ( size, size, size));
+
+ box.CalcDiamCenter();
+ PrintMessage (3, "main-solids: ", geometry->GetNTopLevelObjects());
+
+ for (i = 0; i < geometry->GetNTopLevelObjects(); i++)
+ {
+ (*testout) << "tlo " << i << ":" << endl;
+ const TopLevelObject * tlo = geometry->GetTopLevelObject(i);
+ tlo->GetSolid()->Print (*testout);
+ (*testout) << endl;
+ CalcSpecialPointsRec (tlo->GetSolid(), tlo->GetLayer(),
+ box, 1, 1, 1);
+ }
+
+ PrintDot ('\n');
+
+
+ // add user point:
+ for (i = 0; i < geometry->GetNUserPoints(); i++)
+ AddPoint (geometry->GetUserPoint(i), 1);
+
+ PrintMessage (3, apoints.Size(), " special points");
+
+ for (i = 0; i < boxesinlevel.Size(); i++)
+ (*testout) << "level " << i << " has "
+ << boxesinlevel[i] << " boxes" << endl;
+}
+
+
+
+// int debug;
+void SpecialPointCalculation ::
+CalcSpecialPointsRec (const Solid * sol, int layer,
+ const BoxSphere<3> & box,
+ int level, bool calccp, bool calcep)
+{
+ if (multithread.terminate)
+ return;
+
+ int i;
+ BoxSphere<3> sbox;
+ Solid * redsol;
+
+ int numprim;
+
+ bool decision;
+ bool possiblecrossp, possibleexp; // possible cross or extremalpoint
+ bool surecrossp, sureexp; // sure ...
+
+ static ARRAY<int> locsurf; // attention: array is static
+
+
+ Point<3> p;
+ int k1, k2, k3;
+ int extremdir;
+ double hd;
+
+ if (!sol) return;
+
+ if (level >= 100)
+ {
+ cerr << "Problems in CalcSpecialPoints" << endl;
+ cerr << "Point: " << box.Center() << endl;
+ exit (1);
+ }
+
+ static int cntbox = 0;
+ cntbox++;
+ if (cntbox % 10000 == 0)
+ PrintDot ();
+
+ if (level <= boxesinlevel.Size())
+ boxesinlevel.Elem(level)++;
+ else
+ boxesinlevel.Append (1);
+
+ /*
+ numprim = sol -> NumPrimitives();
+ sol -> GetSurfaceIndices (locsurf);
+ */
+
+ // debug = 0;
+ // box.IsIn (Point<3> (4.9, 1.279, 2.8));
+
+
+ geometry -> GetIndependentSurfaceIndices (sol, box, locsurf);
+ numprim = locsurf.Size();
+
+ /*
+ if (debug)
+ {
+ (*testout) << "box = " << box.PMin() << "-" << box.PMax()
+ << " np = " << numprim << " : ";
+ for (i = 1; i <= locsurf.Size(); i++)
+ (*testout) << " " << locsurf.Get(i);
+ (*testout) << " diam = " << box.Diam();
+ (*testout) << " numprim = " << numprim;
+ (*testout) << endl;
+ }
+ */
+
+
+ p = box.Center();
+
+ /*
+ (*testout) << "box = " << box.PMin() << " - " << box.PMax()
+ << ", lev = " << level
+ << ", nprim = " << sol->NumPrimitives()
+ << ", lsurf = " << locsurf.Size() << endl;
+
+ for (i = 1; i <= locsurf.Size(); i++)
+ geometry->GetSurface (locsurf.Get(i)) -> Print (*testout);
+ sol -> Print (*testout);
+ */
+
+ /*
+ for (i = 1; i <= locsurf.Size(); i++)
+ (*testout) << locsurf.Get(i) << " ";
+ (*testout) << "C = " << box.Center() << " diam = " << box.Diam() << endl;
+ */
+
+ possiblecrossp = (numprim >= 3) && calccp;
+ surecrossp = 0;
+
+ if (possiblecrossp && (locsurf.Size() <= 10))
+ {
+ decision = 1;
+ surecrossp = 0;
+
+ for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ int nc, deg;
+ nc = CrossPointNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), p );
+
+ deg = CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), box );
+
+ if (!nc && !deg) decision = 0;
+ if (nc) surecrossp = 1;
+ }
+
+ if (decision && surecrossp)
+ {
+ for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ if (CrossPointNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), p ) )
+ {
+ Point<3> pp = p;
+ CrossPointNewton
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), pp);
+
+ BoxSphere<3> hbox (pp, pp);
+ hbox.Increase (1e-8);
+
+ if (pp(0) > box.PMin()(0) - 1e-5 &&
+ pp(0) < box.PMax()(0) + 1e-5 &&
+ pp(1) > box.PMin()(1) - 1e-5 &&
+ pp(1) < box.PMax()(1) + 1e-5 &&
+ pp(2) > box.PMin()(2) - 1e-5 &&
+ pp(2) < box.PMax()(2) + 1e-5 &&
+ sol -> IsIn (pp) && !sol->IsStrictIn (pp) &&
+ !CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), hbox ))
+
+ {
+ // AddCrossPoint (locsurf, sol, p);
+ BoxSphere<3> boxp (pp, pp);
+ boxp.Increase (1e-3);
+ boxp.CalcDiamCenter();
+ ARRAY<int> locsurf2;
+
+ geometry -> GetIndependentSurfaceIndices (sol, boxp, locsurf2);
+
+ /*
+ ReducePrimitiveIterator rpi(boxp);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)sol) -> IterateSolid (rpi);
+ sol -> GetIndependentSurfaceIndices (locsurf2);
+ ((Solid*)sol) -> IterateSolid (urpi);
+ */
+ bool found1 = 0, found2 = 0, found3 = 0;
+ for (i = 1; i <= locsurf2.Size(); i++)
+ {
+ if (locsurf2.Get(i) == locsurf.Get(k1))
+ found1 = 1;
+ if (locsurf2.Get(i) == locsurf.Get(k2))
+ found2 = 1;
+ if (locsurf2.Get(i) == locsurf.Get(k3))
+ found3 = 1;
+ }
+
+ if (found1 && found2 && found3)
+ if (AddPoint (pp, layer))
+ {
+ (*testout) << "Crosspoint found: " << pp
+ << " diam = " << box.Diam() << endl;
+ (*testout) << "surfs: "
+ << locsurf.Get(k1) << ","
+ << locsurf.Get(k2) << ","
+ << locsurf.Get(k3) << endl;
+ }
+ }
+ }
+ }
+ }
+
+ if (decision)
+ possiblecrossp = 0;
+ }
+
+
+
+
+ possibleexp = (numprim >= 2) && calcep;
+
+ if (possibleexp && (locsurf.Size() <= 10))
+ {
+ decision = 1;
+ sureexp = 0;
+
+ for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
+ for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
+ {
+ bool nc, deg;
+
+ nc = EdgeNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p);
+
+ deg = EdgeDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ box);
+
+ if (!nc && !deg) decision = 0;
+ if (nc) sureexp = 1;
+
+ /*
+ if (debug)
+ {
+ (*testout) << "p = " << p << " s1,2 = " << locsurf.Get(k1) << ", " << locsurf.Get(k2)
+ << " nc = " << nc << " deg = " << deg << endl;
+ }
+ */
+ }
+
+ if (decision && sureexp)
+ {
+ for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
+ for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
+ {
+ if (
+ EdgeNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p) )
+ {
+ EdgeNewton
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p);
+
+ Point<3> pp;
+ if (IsEdgeExtremalPoint
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p, pp, box.Diam()/2))
+ {
+ (*testout) << "extremalpoint (nearly) found:"
+ << pp
+ << endl;
+ if (Dist (pp, box.Center()) < box.Diam()/2 &&
+ sol -> IsIn (pp) && !sol->IsStrictIn (pp) )
+ {
+ // AddExtremalPoint (locsurf.Get(k1), locsurf.Get(k2), p);
+ if (AddPoint (pp, layer))
+ (*testout) << "Extremal point found: " << pp << endl;
+ }
+ }
+ }
+ }
+ }
+ if (decision)
+ possibleexp = 0;
+ }
+
+
+
+ if (possiblecrossp || possibleexp)
+ {
+ for (i = 0; i < 8; i++)
+ {
+ box.GetSubBox (i, sbox);
+ sbox.Increase (1e-4 * sbox.Diam());
+
+ redsol = sol -> GetReducedSolid (sbox);
+
+ if (redsol)
+ {
+ CalcSpecialPointsRec (redsol, layer, sbox, level+1, calccp, calcep);
+ delete redsol;
+ }
+ }
+ }
+}
+
+
+
+
+
+/******* Tests for Point of intersection **********************/
+
+
+
+bool SpecialPointCalculation ::
+CrossPointNewtonConvergence (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const Point<3> & p)
+{
+ int i;
+ Vec<3> grad;
+ Vec<3> rs, x;
+ Mat<3> jacobi, inv;
+ double alpha, beta, gamma, eta;
+ double sum;
+ int j;
+
+
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, grad);
+ jacobi(0,0) = grad(0);
+ jacobi(0,1) = grad(1);
+ jacobi(0,2) = grad(2);
+
+ f2->CalcGradient (p, grad);
+ jacobi(1,0) = grad(0);
+ jacobi(1,1) = grad(1);
+ jacobi(1,2) = grad(2);
+
+ f3->CalcGradient (p, grad);
+ jacobi(2,0) = grad(0);
+ jacobi(2,1) = grad(1);
+ jacobi(2,2) = grad(2);
+
+ alpha = 1;
+ if (fabs (Det (jacobi)) > 1e-8)
+ {
+ CalcInverse (jacobi, inv);
+ x = inv * rs;
+
+ gamma = f1 -> HesseNorm() + f2 -> HesseNorm() + f3 -> HesseNorm();
+ beta = 0;
+ for (i = 0; i < 3; i++)
+ {
+ sum = 0;
+ for (j = 0; j < 3; j++)
+ sum += fabs (inv(i,j));
+ beta = max2 (beta, sum);
+ }
+ eta = Abs (x);
+
+ alpha = beta * gamma * eta;
+ }
+
+ return (alpha < 0.1);
+}
+
+
+
+
+bool SpecialPointCalculation ::
+CrossPointDegenerated (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const BoxSphere<3> & box) const
+{
+ Mat<3> mat;
+ Vec<3> grad, g1, g2, g3;
+ double normprod;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ f1->CalcGradient (box.Center(), g1);
+ normprod = Abs (g1);
+
+ f2->CalcGradient (box.Center(), g2);
+ normprod *= Abs (g2);
+
+ f3->CalcGradient (box.Center(), g3);
+ normprod *= Abs (g3);
+
+ for (int i = 0; i < 3; i++)
+ {
+ mat(i,0) = g1(i);
+ mat(i,1) = g2(i);
+ mat(i,2) = g3(i);
+ }
+
+ if (fabs (Det (mat)) < cpeps1 * normprod)
+ return 1;
+ else
+ return 0;
+}
+
+
+
+
+
+void SpecialPointCalculation :: CrossPointNewton (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3, Point<3> & p)
+{
+ int i;
+ Vec<3> g1, g2, g3;
+ Vec<3> rs, sol;
+ Mat<3> mat;
+
+ i = 10;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+ f3->CalcGradient (p, g3);
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0, j) = g1(j);
+ mat(1, j) = g2(j);
+ mat(2, j) = g3(j);
+ }
+ mat.Solve (rs, sol);
+ /*
+ Transpose (g1, g2, g3);
+ SolveLinearSystem (g1, g2, g3, rs, sol);
+ */
+ if (sol.Length() < 1e-12 && i > 1) i = 1;
+
+ p -= sol;
+ }
+}
+
+
+
+
+/******* Tests for Point on edges **********************/
+
+
+
+
+bool SpecialPointCalculation ::
+EdgeNewtonConvergence (const Surface * f1, const Surface * f2,
+ const Point<3> & p)
+{
+ int i;
+ Vec<3> g1, g2, sol;
+ Vec<2> vrs;
+ double alpha, beta, gamma, eta;
+ double sum;
+ Mat<2,3> mat;
+ Mat<3,2> inv;
+ int j;
+
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ for (i = 0; i < 3; i++)
+ {
+ mat(0,i) = g1(i);
+ mat(1,i) = g2(i);
+ }
+
+ alpha = 1;
+
+ if ( fabs(g1 * g2) < (1 - 1e-8) * Abs (g1) * Abs (g2))
+ {
+ CalcInverse (mat, inv);
+ sol = inv * vrs;
+
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ gamma = f1 -> HesseNorm() + f2 -> HesseNorm();
+
+ /*
+ Vec<3> inv1, inv2;
+ PseudoInverse (g1, g2, inv1, inv2);
+ */
+
+ beta = 0;
+ for (i = 0; i < 3; i++)
+ for (j = 0; j < 2; j++)
+ beta += inv(i,j) * inv(i,j);
+ beta = sqrt (beta);
+
+ // beta = inv1.Length() + inv2.Length();
+ eta = Abs (sol);
+ alpha = beta * gamma * eta;
+ }
+ return (alpha < 0.1);
+}
+
+
+
+
+bool SpecialPointCalculation ::
+EdgeDegenerated (const Surface * f1,
+ const Surface * f2,
+ const BoxSphere<3> & box) const
+{
+ // perform newton steps. normals parallel ?
+ // if not decideable: return 0
+
+
+ Point<3> p = box.Center();
+ int i;
+ Vec<3> grad, g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+
+ i = 20;
+ while (i > 0)
+ {
+ if (Dist (p, box.Center()) > box.Diam())
+ return 0;
+
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ if ( fabs (g1 * g2) > (1 - 1e-10) * Abs (g1) * Abs (g2))
+ return 1;
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ if (Abs (sol) < 1e-12 && i > 1) i = 1;
+ p -= sol;
+ }
+
+ return 0;
+}
+
+
+
+
+
+
+void SpecialPointCalculation :: EdgeNewton (const Surface * f1,
+ const Surface * f2, Point<3> & p)
+{
+ int i;
+ Vec<3> grad, g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+
+ i = 10;
+ while (i > 0)
+ {
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ if (Abs (sol) < 1e-12 && i > 1) i = 1;
+ p -= sol;
+ }
+}
+
+
+
+bool SpecialPointCalculation ::
+IsEdgeExtremalPoint (const Surface * f1, const Surface * f2,
+ const Point<3> & p, Point<3> & pp, double rad)
+{
+ Vec<3> g1, g2, t, t1, t2;
+ int j;
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ t = Cross (g1, g2);
+ t.Normalize();
+
+ Point<3> p1 = p + rad * t;
+ Point<3> p2 = p - rad * t;
+
+ EdgeNewton (f1, f2, p1);
+ EdgeNewton (f1, f2, p2);
+
+
+ f1->CalcGradient (p1, g1);
+ f2->CalcGradient (p1, g2);
+ t1 = Cross (g1, g2);
+ t1.Normalize();
+
+ f1->CalcGradient (p2, g1);
+ f2->CalcGradient (p2, g2);
+ t2 = Cross (g1, g2);
+ t2.Normalize();
+
+ double val = 1e-8 * rad * rad;
+ for (j = 0; j < 3; j++)
+ if ( (t1(j) * t2(j) < -val) )
+ {
+ pp = p;
+ ExtremalPointNewton (f1, f2, j+1, pp);
+ return 1;
+ }
+
+ return 0;
+}
+
+
+
+
+
+
+
+
+
+/********** Tests of Points of extremal coordinates ****************/
+
+
+void SpecialPointCalculation :: ExtremalPointNewton (const Surface * f1,
+ const Surface * f2,
+ int dir, Point<3> & p)
+{
+ int i;
+
+ Vec<3> g1, g2, v, curv;
+ Vec<3> rs, x, y1, y2, y;
+ Mat<3> h1, h2;
+ Mat<3> jacobi;
+
+
+ if (dir < 1 || dir > 3)
+ {
+ cerr << "Error: Illegal extremdir" << endl;
+ return;
+ }
+
+ i = 50;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
+
+
+ v = Cross (g1, g2);
+
+ rs(2) = v(dir-1);
+
+ jacobi(0,0) = g1(0);
+ jacobi(0,1) = g1(1);
+ jacobi(0,2) = g1(2);
+
+ jacobi(1,0) = g2(0);
+ jacobi(1,1) = g2(1);
+ jacobi(1,2) = g2(2);
+
+
+ switch (dir)
+ {
+ case 1:
+ {
+ y1(0) = 0;
+ y1(1) = g2(2);
+ y1(2) = -g2(1);
+ y2(0) = 0;
+ y2(1) = -g1(2);
+ y2(2) = g1(1);
+ break;
+ }
+ case 2:
+ {
+ y1(0) = -g2(2);
+ y1(1) = 0;
+ y1(2) = g2(0);
+ y2(0) = g1(2);
+ y2(1) = 0;
+ y2(2) = -g1(0);
+ break;
+ }
+ case 3:
+ {
+ y1(0) = g2(1);
+ y1(1) = -g2(0);
+ y1(2) = 0;
+ y2(0) = -g1(1);
+ y2(1) = g1(0);
+ y2(2) = 0;
+ break;
+ }
+ }
+
+ y = h1 * y1 + h2 * y2;
+
+ jacobi(2,0) = y(0);
+ jacobi(2,1) = y(1);
+ jacobi(2,2) = y(2);
+
+ jacobi.Solve (rs, x);
+ /*
+ CalcInverse (jacobi, inv);
+ inv.Mult (rs, x);
+ */
+ // (*testout) << "err = " << x.L2Norm() << endl;
+
+ if (Abs (x) < 1e-12 && i > 1)
+ {
+ // (*testout) << "convergent in " << (10 - i) << " steps " << endl;
+
+ i = 1;
+ }
+
+ p -= x;
+ }
+
+ if (Abs (x) > 1e-10)
+ {
+ (*testout) << "Error: extremum Newton not convergent" << endl;
+ (*testout) << "dir = " << dir << endl;
+ (*testout) << "p = " << p << endl;
+ (*testout) << "x = " << x << endl;
+ }
+}
+
+
+
+
+bool SpecialPointCalculation :: ExtremalPointPossible (const Surface * f1,
+ const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
+{
+ double hn1, hn2, gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double f3;
+ double r = box.Diam()/2;
+
+ p = box.Center();
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+
+ hn1 = f1 -> HesseNorm ();
+ hn2 = f2 -> HesseNorm ();
+
+ v = Cross (g1, g2);
+ f3 = fabs (v(dir-1));
+
+ // (*testout) << "f3 = " << f3 << " r = " << r
+ // << "normbound = "
+ // << (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)) << endl;
+
+ return (f3 <= 3 * r * (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)));
+}
+
+
+
+bool SpecialPointCalculation ::
+ExtremalPointNewtonConvergence (const Surface * f1, const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
+{
+ return box.Diam() < 1e-8;
+}
+
+
+bool SpecialPointCalculation ::
+ExtremalPointDegenerated (const Surface * f1, const Surface * f2,
+ int dir, const BoxSphere<3> & box)
+{
+ double gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double maxderiv;
+ double minv;
+ Vec<3> curv, t;
+ Vec<2> rs, x;
+ Mat<3> h1, h2;
+ Mat<2> a, inv;
+ double leftside;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ p = box.Center();
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+
+ v = Cross (g1, g2);
+ if (Abs (v) < epeps1 * gn1 * gn2) return 1; // irregular edge
+
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
+
+ // hn1 = f1 -> HesseNorm ();
+ // hn2 = f2 -> HesseNorm ();
+
+ t = v;
+ a(0, 0) = g1 * g1;
+ a(0, 1) =
+ a(1, 0) = g1 * g2;
+ a(1, 1) = g2 * g2;
+
+ rs(0) = g1(dir-1);
+ rs(1) = g2(dir-1);
+
+ a.Solve (rs, x);
+
+ /*
+ CalcInverse (a, inv);
+ inv.Mult (rs, x); // x .. Lagrangeparameter
+ */
+ // (*testout) << "g1 = " << g1 << " g2 = " << g2 << endl;
+ // (*testout) << "lam = " << x << endl;
+ // (*testout) << "h2 = " << h2 << endl;
+
+ leftside = fabs (x(0) * ( t * (h1 * t)) +
+ x(1) * ( t * (h2 * t)));
+
+ // (*testout) << "leftside = " << leftside << endl;
+
+ if (leftside < epeps2 * Abs2 (v)) return 1;
+
+ return 0;
+}
+
+
+
+bool SpecialPointCalculation :: AddPoint (const Point<3> & p, int layer)
+{
+ for (int i = 0; i < points->Size(); i++)
+ if (Dist2 ( (*points)[i], p) < epspointdist2 &&
+ (*points)[i].GetLayer() == layer)
+ return 0;
+
+ points->Append (MeshPoint(p, layer));
+ return 1;
+}
+
+
+
+
+
+
+
+/*
+void SpecialPointCalculation ::
+AnalyzeSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<Point<3> > & apoints,
+ ARRAY<SpecialPoint> & specpoints)
+{
+ int si, i, j, k, l, m, spi;
+ Solid * locsol;
+ ARRAY<int> surfind;
+ ARRAY<Vec<3>> normalvecs;
+ const Solid * sol;
+ Vec<3> t;
+ Point<3> p;
+
+ ARRAY<int> specpoint2point;
+ specpoints.SetSize (0);
+
+ (*testout) << "AnalyzeSpecialPoints" << endl;
+
+ for (si = 1; si <= ageometry.GetNTopLevelObjects(); si++)
+ {
+ (*testout) << "main solid " << si << endl;
+
+ sol = ageometry.GetTopLevelObject(si)->GetSolid();
+ for (i = 1; i <= apoints.Size(); i++)
+ {
+ p = apoints.Get(i);
+
+ sol -> TangentialSolid (p, locsol);
+ if (!locsol) continue;
+
+ (*testout) << "Point " << apoints.Get(i) << endl;
+
+ locsol -> GetSurfaceIndices (surfind);
+ for (j = surfind.Size(); j >= 1; j--)
+ if (fabs (ageometry.GetSurface(surfind.Get(j))->
+ CalcFunctionValue (p)) > 1e-6)
+ surfind.DeleteElement (j);
+
+
+
+ (*testout) << "Surfaces: ";
+ for (j = 1; j <= surfind.Size(); j++)
+ (*testout) << surfind.Get(j) << " ";
+ (*testout) << endl;
+
+ normalvecs.SetSize(surfind.Size());
+ for (j = 1; j <= surfind.Size(); j++)
+ ageometry.GetSurface(surfind.Get(j)) ->
+ GetNormalVector(apoints.Get(i), normalvecs.Elem(j));
+
+ for (j = 1; j <= normalvecs.Size() - 1; j ++)
+ for (k = j+1; k <= normalvecs.Size(); k++)
+ for (l = 1; l <= 2; l++)
+ {
+ t = Cross (normalvecs.Get(j), normalvecs.Get(k));
+ if (t.Length2() < 1e-8)
+ {
+ cerr << "AnalyzePoint: Surfaces degenerated" << endl;
+ break;
+ }
+ t /= t.Length();
+ if (l == 2) t *= -1;
+
+ if (locsol -> Edge (apoints.Get(i), t))
+ {
+ spi = 0;
+ for (m = 1; m <= specpoints.Size(); m++)
+ if (Dist2 (specpoints.Get(m).p, apoints.Get(i)) < 1e-8
+ && (specpoints.Get(m).v - t).Length2() < 1e-8)
+ {
+ spi = m;
+ break;
+ }
+ if (!spi)
+ {
+ spi = specpoints.Append (SpecialPoint());
+ specpoint2point.Append (i);
+ specpoints.Last().unconditional = 0;
+ }
+ specpoints.Elem(spi).p = apoints.Get(i);
+ specpoints.Elem(spi).v = t;
+ if (surfind.Size() >= 3)
+ specpoints.Elem(spi).unconditional = 1;
+ specpoints.Elem(spi).s1 = surfind.Get(j);
+ specpoints.Elem(spi).s2 = surfind.Get(k);
+ (*testout) << "spi = " << spi
+ << " uncond = " << specpoints.Get(spi).unconditional
+ << " t = " << t << endl;
+ }
+
+ }
+ delete locsol;
+ }
+ }
+
+ // if special point is unconditional on some solid,
+ // it must be unconditional everywhere:
+
+ BitArray uncond (apoints.Size());
+ uncond.Clear();
+
+ for (i = 1; i <= specpoints.Size(); i++)
+ if (specpoints.Get(i).unconditional)
+ uncond.Set (specpoint2point.Get(i));
+
+ for (i = 1; i <= specpoints.Size(); i++)
+ specpoints.Elem(i).unconditional =
+ uncond.Test (specpoint2point.Get(i)) ? 1 : 0;
+}
+*/
+
+
+
+void SpecialPointCalculation ::
+AnalyzeSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints,
+ ARRAY<SpecialPoint> & specpoints)
+{
+ int si, i, j, k, l, m, spi;
+
+ Solid * locsol;
+ ARRAY<int> surfind;
+ ARRAY<int> surfind2;
+
+ ARRAY<Vec<3> > normalvecs;
+ const Solid * sol;
+ const Surface * surf;
+
+ Vec<3> t, nsurf;
+ Point<3> p;
+
+ ARRAY<int> specpoint2point;
+ specpoints.SetSize (0);
+
+ geometry = &ageometry;
+
+ (*testout) << "AnalyzeSpecialPoints\n";
+
+
+ Box<3> bbox;
+ if (apoints.Size())
+ bbox.Set (apoints[0]);
+ for (int i = 1; i < apoints.Size(); i++)
+ bbox.Add (apoints[i]);
+ bbox.Increase (0.1 * Dist (bbox.PMin(), bbox.PMax()));
+
+ Point3dTree searchtree (bbox.PMin(), bbox.PMax());
+ ARRAY<int> locsearch;
+
+ for (si = 0; si < ageometry.GetNTopLevelObjects(); si++)
+ {
+ (*testout) << "main solid " << si << "\n";
+
+ sol = ageometry.GetTopLevelObject(si)->GetSolid();
+ surf = ageometry.GetTopLevelObject(si)->GetSurface();
+
+ for (i = 0; i < apoints.Size(); i++)
+ {
+ p = apoints[i];
+ if (ageometry.GetTopLevelObject(si)->GetLayer() !=
+ apoints[i].GetLayer())
+ continue;
+
+ (*testout) << "Point " << apoints[i] << "\n";
+
+ sol -> TangentialSolid (p, locsol);
+ if (!locsol) continue;
+
+ // get all surface indices,
+ if (surf)
+ {
+ locsol -> GetSurfaceIndices (surfind);
+ bool hassurf = 0;
+ for (m = 0; m < surfind.Size(); m++)
+ if (ageometry.GetSurface(surfind[m]) == surf)
+ hassurf = 1;
+
+ if (!hassurf)
+ continue;
+
+ surf->GetNormalVector (p, nsurf);
+ }
+
+ // get independent surfaces of tangential solid
+
+ BoxSphere<3> box(p,p);
+ box.Increase (1e-6);
+ box.CalcDiamCenter();
+ ageometry.GetIndependentSurfaceIndices (locsol, box, surfind);
+
+
+ (*testout) << "surfind.size = " << surfind.Size() << endl;
+
+ /*
+ locsol -> GetSurfaceIndices (surfind);
+ for (j = surfind.Size(); j >= 1; j--)
+ if (fabs (ageometry.GetSurface(surfind.Get(j))->
+ CalcFunctionValue (p)) > 1e-6)
+ surfind.DeleteElement (j);
+ */
+
+ /*
+ (*testout) << "Surfaces: ";
+ for (j = 0; j < surfind.Size(); j++)
+ (*testout) << surfind[j] << " ";
+ (*testout) << "\n";
+ */
+
+
+ normalvecs.SetSize(surfind.Size());
+ for (j = 0; j < surfind.Size(); j++)
+ ageometry.GetSurface(surfind[j]) ->
+ GetNormalVector(apoints[i], normalvecs[j]);
+
+ for (j = 0; j < normalvecs.Size(); j++)
+ for (k = j+1; k < normalvecs.Size(); k++)
+ for (l = 1; l <= 2; l++)
+ {
+ t = Cross (normalvecs[j], normalvecs[k]);
+ if (Abs2 (t) < 1e-8)
+ {
+ cerr << "AnalyzePoint: Surfaces degenerated" << "\n";
+ break;
+ }
+ t.Normalize();
+ if (l == 2) t *= -1;
+
+ // try tangential direction t
+
+ // (*testout) << "check tangential " << t << "\n";
+
+ if (surf && fabs (nsurf * t) > 1e-6)
+ continue;
+
+ if (!surf)
+ {
+ ageometry.GetIndependentSurfaceIndices
+ (locsol, p, t, surfind2);
+
+ bool found1 = 0, found2 = 0;
+ for (int ii = 0; ii < surfind2.Size(); ii++)
+ {
+ if (surfind2[ii] == surfind[j])
+ found1 = 1;
+ if (surfind2[ii] == surfind[k])
+ found2 = 1;
+ }
+ if (!found1 || !found2)
+ continue;
+ }
+
+
+ bool isedge;
+
+ // isedge = locsol -> Edge (apoints.Get(i), t);
+
+ // edge must be on tangential surface
+ isedge =
+ locsol->VectorIn (p, t) &&
+ !locsol->VectorStrictIn (p, t);
+
+ // (*testout) << "isedge,1 = " << isedge << "\n";
+
+ // there must exist at least two different faces on edge
+ if (isedge)
+ {
+ int cnts = 0;
+ for (m = 0; m < surfind.Size(); m++)
+ {
+ if (fabs (normalvecs[m] * t) > 1e-6)
+ continue;
+
+ Vec<3> s = Cross (normalvecs[m], t);
+ Vec<3> t2a = t + 0.01 *s;
+ Vec<3> t2b = t - 0.01 *s;
+
+ /*
+ (*testout) << "nv = " << normalvecs[m] << ", s = " << s << "\n";
+ (*testout) << "t2a = " << t2a << ", t2b = " << t2b << "\n";
+ (*testout) << "via = "
+ << locsol->VectorIn (p, t2a) << "/"
+ << locsol->VectorStrictIn (p, t2a);
+ (*testout) << "vib = "
+ << locsol->VectorIn (p, t2b) << "/"
+ << locsol->VectorStrictIn (p, t2b) << "\n";
+ */
+
+ bool isface =
+ (locsol->VectorIn (p, t2a) &&
+ !locsol->VectorStrictIn (p, t2a))
+ ||
+ (locsol->VectorIn (p, t2b) &&
+ !locsol->VectorStrictIn (p, t2b));
+
+ if (isface)
+ {
+ cnts++;
+ }
+ }
+ if (cnts < 2) isedge = 0;
+ }
+
+ if (isedge)
+ {
+ spi = -1;
+
+ searchtree.GetIntersecting (apoints[i]-Vec3d(1e-4,1e-4,1e-4),
+ apoints[i]+Vec3d(1e-4,1e-4,1e-4),
+ locsearch);
+
+ for (m = 0; m < locsearch.Size(); m++)
+ if (Dist2 (specpoints[locsearch[m]].p, apoints[i]) < 1e-8
+ && Abs2(specpoints[locsearch[m]].v - t) < 1e-8)
+ {
+ spi = locsearch[m];
+ break;
+ }
+
+ /*
+ for (m = 0; m < specpoints.Size(); m++)
+ if (Dist2 (specpoints[m].p, apoints[i]) < 1e-8
+ && Abs2(specpoints[m].v - t) < 1e-8)
+ {
+ spi = m;
+ break;
+ }
+ */
+ if (spi == -1)
+ {
+ spi = specpoints.Append (SpecialPoint()) - 1;
+ specpoint2point.Append (i);
+ specpoints.Last().unconditional = 0;
+ searchtree.Insert (apoints[i], spi);
+ }
+ specpoints[spi].p = apoints[i];
+ specpoints[spi].v = t;
+ if (surfind.Size() >= 3)
+ specpoints[spi].unconditional = 1;
+ specpoints[spi].s1 = surfind[j];
+ specpoints[spi].s2 = surfind[k];
+ specpoints[spi].layer = apoints[i].GetLayer();
+ for (int up = 0; up < geometry->GetNUserPoints(); up++)
+ if (Dist (geometry->GetUserPoint(up), apoints[i]) < 1e-10)
+ specpoints[spi].unconditional = 1;
+
+ /*
+ (*testout) << "spi = " << spi
+ << " uncond = " << specpoints[spi].unconditional
+ << " t = " << t << "\n";
+ */
+ }
+
+ }
+ delete locsol;
+ }
+ }
+
+ // if special point is unconditional on some solid,
+ // it must be unconditional everywhere:
+
+ BitArray uncond (apoints.Size());
+ uncond.Clear();
+
+ for (i = 0; i < specpoints.Size(); i++)
+ if (specpoints[i].unconditional)
+ uncond.Set (specpoint2point[i]);
+
+ for (i = 0; i < specpoints.Size(); i++)
+ specpoints[i].unconditional =
+ uncond.Test (specpoint2point[i]) ? 1 : 0;
+}
+}
diff --git a/Netgen/libsrc/csg/specpoin_old.cpp b/Netgen/libsrc/csg/specpoin_old.cpp
new file mode 100644
index 0000000000..0f30ef7298
--- /dev/null
+++ b/Netgen/libsrc/csg/specpoin_old.cpp
@@ -0,0 +1,1370 @@
+#include <mystdlib.h>
+#include <meshing.hpp>
+#include <csg.hpp>
+
+
+/*
+
+ Special Point calculation uses the global Flags:
+
+
+ size .. 500 cube = [-size, size]^3
+ relydegtest when to rely on degeneration ?
+ calccp calculate points of intersection ?
+ cpeps1 eps for degenerated poi
+ calcep calculate points of extreme coordinates ?
+ epeps1 eps for degenerated edge
+ epeps2 eps for axis parallel pec
+ epspointdist eps for distance of special points
+*/
+
+
+namespace netgen
+{
+void ProjectToEdge (const Surface * f1, const Surface * f2, Point<3> & hp);
+
+
+
+ /*
+SpecialPoint :: SpecialPoint ()
+ : p(), v(), layer(0)
+{
+ ;
+}
+ */
+
+
+SpecialPoint :: SpecialPoint (const SpecialPoint & sp)
+{
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+}
+
+SpecialPoint & SpecialPoint :: operator= (const SpecialPoint & sp)
+{
+ p = sp.p;
+ v = sp.v;
+ s1 = sp.s1;
+ s2 = sp.s2;
+ layer = sp.layer;
+ unconditional = sp.unconditional;
+ return *this;
+}
+
+/*
+bool SpecialPoint :: HasSurfaces (int as1, int as2) const
+{
+ return (s1 == as1 && s2 == as2 || s1 == as2 && s2 == as1);
+}
+*/
+void SpecialPoint :: Print (ostream & str)
+{
+ str << "p = " << p << " v = " << v
+ << " s1/s2 = " << s1 << "/" << s2
+ << " layer = " << layer
+ << endl;
+}
+
+
+
+
+SpecialPointCalculation :: SpecialPointCalculation ()
+{
+ ;
+}
+
+void SpecialPointCalculation ::
+CalcSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints)
+{
+ int i;
+
+ geometry = &ageometry;
+ points = &apoints;
+
+ size = geometry->MaxSize(); // globflags.GetNumFlag ("maxsize", 500);
+ (*testout) << "Find Special Points" << endl;
+ (*testout) << "maxsize = " << size << endl;
+
+ cpeps1 = 1e-6;
+ epeps1 = 1e-3;
+ epeps2 = 1e-6;
+
+ epspointdist2 = sqr (size * 1e-8);
+ relydegtest = size * 1e-4;
+
+
+ BoxSphere<3> box (Point<3> (-size, -size, -size),
+ Point<3> ( size, size, size));
+ box.CalcDiamCenter();
+ PrintMessage (3, "main-solids: ", geometry->GetNTopLevelObjects());
+
+ for (i = 0; i < geometry->GetNTopLevelObjects(); i++)
+ {
+ (*testout) << "tlo " << i << ":" << endl;
+ const TopLevelObject * tlo = geometry->GetTopLevelObject(i);
+ tlo->GetSolid()->Print (*testout);
+ (*testout) << endl;
+ CalcSpecialPointsRec (tlo->GetSolid(), tlo->GetLayer(),
+ box, 1, 1, 1);
+ }
+
+ PrintDot ('\n');
+
+
+ // add user point:
+ int found = 0;
+ for (i = 0; i < geometry->GetNUserPoints(); i++)
+ AddPoint (geometry->GetUserPoint(i), 1);
+
+ PrintMessage (3, apoints.Size(), " special points");
+
+ for (i = 0; i < boxesinlevel.Size(); i++)
+ (*testout) << "level " << i << " has "
+ << boxesinlevel[i] << " boxes" << endl;
+}
+
+
+
+int debug;
+void SpecialPointCalculation ::
+CalcSpecialPointsRec (const Solid * sol, int layer,
+ const BoxSphere<3> & box,
+ int level, bool calccp, bool calcep)
+{
+ if (multithread.terminate)
+ return;
+
+ int i;
+ BoxSphere<3> sbox;
+ Solid * redsol;
+
+ int numprim;
+
+ bool decision;
+ bool possiblecrossp, possibleexp; // possible cross or extremalpoint
+ bool surecrossp, sureexp; // sure ...
+
+ static ARRAY<int> locsurf; // attention: array is static
+
+
+ Point<3> p;
+ int k1, k2, k3;
+ int extremdir;
+ double hd;
+
+ if (!sol) return;
+
+
+ if (level >= 100)
+ {
+ cerr << "Problems in CalcSpecialPoints" << endl;
+ cerr << "Point: " << box.Center() << endl;
+ exit (1);
+ }
+
+ static int cntbox = 0;
+ cntbox++;
+ if (cntbox % 10000 == 0)
+ PrintDot ();
+
+ if (level <= boxesinlevel.Size())
+ boxesinlevel.Elem(level)++;
+ else
+ boxesinlevel.Append (1);
+
+ /*
+ numprim = sol -> NumPrimitives();
+ sol -> GetSurfaceIndices (locsurf);
+ */
+
+ debug = 0;
+ // box.IsIn (Point<3> (4.9, 1.279, 2.8));
+
+
+ geometry -> GetIndependentSurfaceIndices (sol, box, locsurf);
+ numprim = locsurf.Size();
+
+ if (debug)
+ {
+ (*testout) << "box = " << box.PMin() << "-" << box.PMax()
+ << " np = " << numprim << " : ";
+ for (i = 1; i <= locsurf.Size(); i++)
+ (*testout) << " " << locsurf.Get(i);
+ (*testout) << " diam = " << box.Diam();
+ (*testout) << " numprim = " << numprim;
+ (*testout) << endl;
+ }
+
+ p = box.Center();
+
+ /*
+ (*testout) << "box = " << box.PMin() << " - " << box.PMax()
+ << ", lev = " << level
+ << ", nprim = " << sol->NumPrimitives()
+ << ", lsurf = " << locsurf.Size() << endl;
+
+ for (i = 1; i <= locsurf.Size(); i++)
+ geometry->GetSurface (locsurf.Get(i)) -> Print (*testout);
+ sol -> Print (*testout);
+ */
+
+ /*
+ for (i = 1; i <= locsurf.Size(); i++)
+ (*testout) << locsurf.Get(i) << " ";
+ (*testout) << "C = " << box.Center() << " diam = " << box.Diam() << endl;
+ */
+
+ possiblecrossp = (numprim >= 3) && calccp;
+ surecrossp = 0;
+
+ if (possiblecrossp && (locsurf.Size() <= 10))
+ {
+ decision = 1;
+ surecrossp = 0;
+
+ for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ int nc, deg;
+ nc = CrossPointNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), p );
+
+ deg = CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), box );
+
+ if (!nc && !deg) decision = 0;
+ if (nc) surecrossp = 1;
+ }
+
+ if (decision && surecrossp)
+ {
+ for (k1 = 1; k1 <= locsurf.Size() - 2; k1++)
+ for (k2 = k1 + 1; k2 <= locsurf.Size() - 1; k2++)
+ for (k3 = k2 + 1; k3 <= locsurf.Size(); k3++)
+ {
+ if (CrossPointNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), p ) )
+ {
+ Point<3> pp = p;
+ CrossPointNewton
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), pp);
+
+ BoxSphere<3> hbox (pp, pp);
+ hbox.Increase (1e-8);
+
+ if (pp(0) > box.PMin()(0) - 1e-5 &&
+ pp(0) < box.PMax()(0) + 1e-5 &&
+ pp(1) > box.PMin()(1) - 1e-5 &&
+ pp(1) < box.PMax()(1) + 1e-5 &&
+ pp(2) > box.PMin()(2) - 1e-5 &&
+ pp(2) < box.PMax()(2) + 1e-5 &&
+ sol -> IsIn (pp) && !sol->IsStrictIn (pp) &&
+ !CrossPointDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ geometry->GetSurface(locsurf.Get(k3)), hbox ))
+
+ {
+ // AddCrossPoint (locsurf, sol, p);
+ BoxSphere<3> boxp (pp, pp);
+ boxp.Increase (1e-3);
+ boxp.CalcDiamCenter();
+ ARRAY<int> locsurf2;
+
+ geometry -> GetIndependentSurfaceIndices (sol, boxp, locsurf2);
+
+ /*
+ ReducePrimitiveIterator rpi(boxp);
+ UnReducePrimitiveIterator urpi;
+
+ ((Solid*)sol) -> IterateSolid (rpi);
+ sol -> GetIndependentSurfaceIndices (locsurf2);
+ ((Solid*)sol) -> IterateSolid (urpi);
+ */
+ bool found1 = 0, found2 = 0, found3 = 0;
+ for (i = 1; i <= locsurf2.Size(); i++)
+ {
+ if (locsurf2.Get(i) == locsurf.Get(k1))
+ found1 = 1;
+ if (locsurf2.Get(i) == locsurf.Get(k2))
+ found2 = 1;
+ if (locsurf2.Get(i) == locsurf.Get(k3))
+ found3 = 1;
+ }
+
+ if (found1 && found2 && found3)
+ if (AddPoint (pp, layer))
+ {
+ (*testout) << "Crosspoint found: " << pp
+ << " diam = " << box.Diam() << endl;
+ (*testout) << "surfs: "
+ << locsurf.Get(k1) << ","
+ << locsurf.Get(k2) << ","
+ << locsurf.Get(k3) << endl;
+ }
+ }
+ }
+ }
+ }
+
+ if (decision)
+ possiblecrossp = 0;
+ }
+
+
+
+
+ possibleexp = (numprim >= 2) && calcep;
+
+ if (possibleexp && (locsurf.Size() <= 10))
+ {
+ decision = 1;
+ sureexp = 0;
+
+ for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
+ for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
+ {
+ bool nc, deg;
+
+ nc = EdgeNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p);
+
+ deg = EdgeDegenerated
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ box);
+
+ if (!nc && !deg) decision = 0;
+ if (nc) sureexp = 1;
+
+ if (debug)
+ {
+ (*testout) << "p = " << p << " s1,2 = " << locsurf.Get(k1) << ", " << locsurf.Get(k2)
+ << " nc = " << nc << " deg = " << deg << endl;
+ }
+ }
+
+ if (decision && sureexp)
+ {
+ for (k1 = 1; k1 <= locsurf.Size() - 1; k1++)
+ for (k2 = k1+1; k2 <= locsurf.Size(); k2++)
+ {
+ if (
+ EdgeNewtonConvergence
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p) )
+ {
+ EdgeNewton
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p);
+
+ Point<3> pp;
+ if (IsEdgeExtremalPoint
+ (geometry->GetSurface(locsurf.Get(k1)),
+ geometry->GetSurface(locsurf.Get(k2)),
+ p, pp, box.Diam()/2))
+ {
+ (*testout) << "extremalpoint (nearly) found:"
+ << pp
+ << endl;
+ if (Dist (pp, box.Center()) < box.Diam()/2 &&
+ sol -> IsIn (pp) && !sol->IsStrictIn (pp) )
+ {
+ // AddExtremalPoint (locsurf.Get(k1), locsurf.Get(k2), p);
+ if (AddPoint (pp, layer))
+ (*testout) << "Extremal point found: " << pp << endl;
+ }
+ }
+ }
+ }
+ }
+ if (decision)
+ possibleexp = 0;
+ }
+
+
+
+ if (possiblecrossp || possibleexp)
+ {
+ for (i = 0; i < 8; i++)
+ {
+ box.GetSubBox (i, sbox);
+ sbox.Increase (1e-4 * sbox.Diam());
+
+ redsol = sol -> GetReducedSolid (sbox);
+
+ if (redsol)
+ {
+ CalcSpecialPointsRec (redsol, layer, sbox, level+1, calccp, calcep);
+ delete redsol;
+ }
+ }
+ }
+}
+
+
+
+
+
+/******* Tests for Point of intersection **********************/
+
+
+
+bool SpecialPointCalculation ::
+CrossPointNewtonConvergence (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const Point<3> & p)
+{
+ int i;
+ Vec<3> grad;
+ Vec<3> rs, x;
+ Mat<3> jacobi, inv;
+ double alpha, beta, gamma, eta;
+ double sum;
+ int j;
+
+
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, grad);
+ jacobi(0,0) = grad(0);
+ jacobi(0,1) = grad(1);
+ jacobi(0,2) = grad(2);
+
+ f2->CalcGradient (p, grad);
+ jacobi(1,0) = grad(0);
+ jacobi(1,1) = grad(1);
+ jacobi(1,2) = grad(2);
+
+ f3->CalcGradient (p, grad);
+ jacobi(2,0) = grad(0);
+ jacobi(2,1) = grad(1);
+ jacobi(2,2) = grad(2);
+
+ alpha = 1;
+ if (fabs (Det (jacobi)) > 1e-8)
+ {
+ CalcInverse (jacobi, inv);
+ x = inv * rs;
+
+ gamma = f1 -> HesseNorm() + f2 -> HesseNorm() + f3 -> HesseNorm();
+ beta = 0;
+ for (i = 0; i < 3; i++)
+ {
+ sum = 0;
+ for (j = 0; j < 3; j++)
+ sum += fabs (inv(i,j));
+ beta = max2 (beta, sum);
+ }
+ eta = Abs (x);
+
+ alpha = beta * gamma * eta;
+ }
+
+ return (alpha < 0.1);
+}
+
+
+
+
+bool SpecialPointCalculation ::
+CrossPointDegenerated (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3,
+ const BoxSphere<3> & box) const
+{
+ Mat<3> mat;
+ Vec<3> grad, g1, g2, g3;
+ double normprod;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ f1->CalcGradient (box.Center(), g1);
+ normprod = Abs (g1);
+
+ f2->CalcGradient (box.Center(), g2);
+ normprod *= Abs (g2);
+
+ f3->CalcGradient (box.Center(), g3);
+ normprod *= Abs (g3);
+
+ for (int i = 0; i < 3; i++)
+ {
+ mat(i,0) = g1(i);
+ mat(i,1) = g2(i);
+ mat(i,2) = g3(i);
+ }
+
+ if (fabs (Det (mat)) < cpeps1 * normprod)
+ return 1;
+ else
+ return 0;
+}
+
+
+
+
+
+void SpecialPointCalculation :: CrossPointNewton (const Surface * f1,
+ const Surface * f2,
+ const Surface * f3, Point<3> & p)
+{
+ int i;
+ Vec<3> g1, g2, g3;
+ Vec<3> rs, sol;
+ Mat<3> mat;
+
+ i = 10;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+ rs(2) = f3->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+ f3->CalcGradient (p, g3);
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0, j) = g1(j);
+ mat(1, j) = g2(j);
+ mat(2, j) = g3(j);
+ }
+ mat.Solve (rs, sol);
+ /*
+ Transpose (g1, g2, g3);
+ SolveLinearSystem (g1, g2, g3, rs, sol);
+ */
+ if (sol.Length() < 1e-12 && i > 1) i = 1;
+
+ p -= sol;
+ }
+}
+
+
+
+
+/******* Tests for Point on edges **********************/
+
+
+
+
+bool SpecialPointCalculation ::
+EdgeNewtonConvergence (const Surface * f1, const Surface * f2,
+ const Point<3> & p)
+{
+ int i;
+ Vec<3> g1, g2, sol;
+ Vec<2> vrs;
+ double alpha, beta, gamma, eta;
+ double sum;
+ Mat<2,3> mat;
+ Mat<3,2> inv;
+ int j;
+
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ for (i = 0; i < 3; i++)
+ {
+ mat(0,i) = g1(i);
+ mat(1,i) = g2(i);
+ }
+
+ alpha = 1;
+
+ if ( fabs(g1 * g2) < (1 - 1e-8) * Abs (g1) * Abs (g2))
+ {
+ CalcInverse (mat, inv);
+ sol = inv * vrs;
+
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ gamma = f1 -> HesseNorm() + f2 -> HesseNorm();
+
+ /*
+ Vec<3> inv1, inv2;
+ PseudoInverse (g1, g2, inv1, inv2);
+ */
+
+ beta = 0;
+ for (i = 0; i < 3; i++)
+ for (j = 0; j < 2; j++)
+ beta += inv(i,j) * inv(i,j);
+ beta = sqrt (beta);
+
+ // beta = inv1.Length() + inv2.Length();
+ eta = Abs (sol);
+ alpha = beta * gamma * eta;
+ }
+ return (alpha < 0.1);
+}
+
+
+
+
+bool SpecialPointCalculation ::
+EdgeDegenerated (const Surface * f1,
+ const Surface * f2,
+ const BoxSphere<3> & box) const
+{
+ // perform newton steps. normals parallel ?
+ // if not decideable: return 0
+
+
+ Point<3> p = box.Center();
+ int i;
+ Vec<3> grad, g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+
+ i = 20;
+ while (i > 0)
+ {
+ if (Dist (p, box.Center()) > box.Diam())
+ return 0;
+
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ if ( fabs (g1 * g2) > (1 - 1e-10) * Abs (g1) * Abs (g2))
+ return 1;
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ if (Abs (sol) < 1e-12 && i > 1) i = 1;
+ p -= sol;
+ }
+
+ return 0;
+ /*
+ return 0;
+
+ static DenseMatrix jacobi(3);
+ Vec<3> grad, g1, g2, g3;
+ double normprod;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ f1->CalcGradient (box.Center(), g1);
+ normprod = g1.Length();
+
+ f2->CalcGradient (box.Center(), g2);
+ normprod *= g2.Length();
+
+ if (fabs (g1 * g2) < 1e-8 * normprod)
+ return 1;
+ else
+ return 0;
+ */
+}
+
+
+
+
+
+
+void SpecialPointCalculation :: EdgeNewton (const Surface * f1,
+ const Surface * f2, Point<3> & p)
+{
+ int i;
+ Vec<3> grad, g1, g2, sol;
+ Vec<2> vrs;
+ Mat<2,3> mat;
+
+ i = 10;
+ while (i > 0)
+ {
+ i--;
+ vrs(0) = f1->CalcFunctionValue (p);
+ vrs(1) = f2->CalcFunctionValue (p);
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ for (int j = 0; j < 3; j++)
+ {
+ mat(0,j) = g1(j);
+ mat(1,j) = g2(j);
+ }
+ mat.Solve (vrs, sol);
+ // SolveLinearSystemLS (g1, g2, vrs, sol);
+
+ if (Abs (sol) < 1e-12 && i > 1) i = 1;
+ p -= sol;
+ }
+}
+
+
+
+bool SpecialPointCalculation ::
+IsEdgeExtremalPoint (const Surface * f1, const Surface * f2,
+ const Point<3> & p, Point<3> & pp, double rad)
+{
+ Vec<3> g1, g2, t, t1, t2;
+ int j;
+
+ f1->CalcGradient (p, g1);
+ f2->CalcGradient (p, g2);
+
+ t = Cross (g1, g2);
+ t.Normalize();
+
+ Point<3> p1 = p + rad * t;
+ Point<3> p2 = p - rad * t;
+
+ EdgeNewton (f1, f2, p1);
+ EdgeNewton (f1, f2, p2);
+
+
+ f1->CalcGradient (p1, g1);
+ f2->CalcGradient (p1, g2);
+ t1 = Cross (g1, g2);
+ t1.Normalize();
+
+ f1->CalcGradient (p2, g1);
+ f2->CalcGradient (p2, g2);
+ t2 = Cross (g1, g2);
+ t2.Normalize();
+
+ double val = 1e-8 * rad * rad;
+ for (j = 0; j < 3; j++)
+ if ( (t1(j) * t2(j) < -val) )
+ {
+ pp = p;
+ ExtremalPointNewton (f1, f2, j+1, pp);
+ return 1;
+ }
+
+ return 0;
+}
+
+
+
+
+
+
+
+
+
+/********** Tests of Points of extremal coordinates ****************/
+
+
+void SpecialPointCalculation :: ExtremalPointNewton (const Surface * f1,
+ const Surface * f2,
+ int dir, Point<3> & p)
+{
+ int i;
+
+ Vec<3> g1, g2, v, curv;
+ Vec<3> rs, x, y1, y2, y;
+ Mat<3> h1, h2;
+ Mat<3> jacobi;
+
+
+ if (dir < 1 || dir > 3)
+ {
+ cerr << "Error: Illegal extremdir" << endl;
+ return;
+ }
+
+ i = 50;
+ while (i > 0)
+ {
+ i--;
+ rs(0) = f1->CalcFunctionValue (p);
+ rs(1) = f2->CalcFunctionValue (p);
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
+
+
+ v = Cross (g1, g2);
+
+ rs(2) = v(dir-1);
+
+ jacobi(0,0) = g1(0);
+ jacobi(0,1) = g1(1);
+ jacobi(0,2) = g1(2);
+
+ jacobi(1,0) = g2(0);
+ jacobi(1,1) = g2(1);
+ jacobi(1,2) = g2(2);
+
+
+ switch (dir)
+ {
+ case 1:
+ {
+ y1(0) = 0;
+ y1(1) = g2(2);
+ y1(2) = -g2(1);
+ y2(0) = 0;
+ y2(1) = -g1(2);
+ y2(2) = g1(1);
+ break;
+ }
+ case 2:
+ {
+ y1(0) = -g2(2);
+ y1(1) = 0;
+ y1(2) = g2(0);
+ y2(0) = g1(2);
+ y2(1) = 0;
+ y2(2) = -g1(0);
+ break;
+ }
+ case 3:
+ {
+ y1(0) = g2(1);
+ y1(1) = -g2(0);
+ y1(2) = 0;
+ y2(0) = -g1(1);
+ y2(1) = g1(0);
+ y2(2) = 0;
+ break;
+ }
+ }
+
+ y = h1 * y1 + h2 * y2;
+
+ jacobi(2,0) = y(0);
+ jacobi(2,1) = y(1);
+ jacobi(2,2) = y(2);
+
+ jacobi.Solve (rs, x);
+ /*
+ CalcInverse (jacobi, inv);
+ inv.Mult (rs, x);
+ */
+ // (*testout) << "err = " << x.L2Norm() << endl;
+
+ if (Abs (x) < 1e-12 && i > 1)
+ {
+ // (*testout) << "convergent in " << (10 - i) << " steps " << endl;
+
+ i = 1;
+ }
+
+ p -= x;
+ }
+
+ if (Abs (x) > 1e-10)
+ {
+ (*testout) << "Error: extremum Newton not convergent" << endl;
+ (*testout) << "dir = " << dir << endl;
+ (*testout) << "p = " << p << endl;
+ (*testout) << "x = " << x << endl;
+ }
+}
+
+
+
+
+bool SpecialPointCalculation :: ExtremalPointPossible (const Surface * f1,
+ const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
+{
+ double hn1, hn2, gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double f3;
+ double r = box.Diam()/2;
+
+ p = box.Center();
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+
+ hn1 = f1 -> HesseNorm ();
+ hn2 = f2 -> HesseNorm ();
+
+ v = Cross (g1, g2);
+ f3 = fabs (v(dir-1));
+
+ // (*testout) << "f3 = " << f3 << " r = " << r
+ // << "normbound = "
+ // << (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)) << endl;
+
+ return (f3 <= 3 * r * (hn1 * (gn2 + r * hn2) + hn2 * (gn1 + r * hn1)));
+}
+
+
+
+bool SpecialPointCalculation ::
+ExtremalPointNewtonConvergence (const Surface * f1, const Surface * f2,
+ int dir,
+ const BoxSphere<3> & box)
+{
+ return box.Diam() < 1e-8;
+}
+
+
+bool SpecialPointCalculation ::
+ExtremalPointDegenerated (const Surface * f1, const Surface * f2,
+ int dir, const BoxSphere<3> & box)
+{
+ double gn1, gn2;
+ Point<3> p;
+ Vec<3> g1, g2, v;
+ double maxderiv;
+ double minv;
+ Vec<3> curv, t;
+ Vec<2> rs, x;
+ Mat<3> h1, h2;
+ Mat<2> a, inv;
+ double leftside;
+
+ if (box.Diam() > relydegtest) return 0;
+
+ p = box.Center();
+
+ f1 -> CalcGradient (p, g1);
+ f2 -> CalcGradient (p, g2);
+ gn1 = g1.Length();
+ gn2 = g2.Length();
+
+ v = Cross (g1, g2);
+ if (Abs (v) < epeps1 * gn1 * gn2) return 1; // irregular edge
+
+ f1 -> CalcHesse (p, h1);
+ f2 -> CalcHesse (p, h2);
+
+ // hn1 = f1 -> HesseNorm ();
+ // hn2 = f2 -> HesseNorm ();
+
+ t = v;
+ a(0, 0) = g1 * g1;
+ a(0, 1) =
+ a(1, 0) = g1 * g2;
+ a(1, 1) = g2 * g2;
+
+ rs(0) = g1(dir-1);
+ rs(1) = g2(dir-1);
+
+ a.Solve (rs, x);
+
+ /*
+ CalcInverse (a, inv);
+ inv.Mult (rs, x); // x .. Lagrangeparameter
+ */
+ // (*testout) << "g1 = " << g1 << " g2 = " << g2 << endl;
+ // (*testout) << "lam = " << x << endl;
+ // (*testout) << "h2 = " << h2 << endl;
+
+ leftside = fabs (x(0) * ( t * (h1 * t)) +
+ x(1) * ( t * (h2 * t)));
+
+ // (*testout) << "leftside = " << leftside << endl;
+
+ if (leftside < epeps2 * Abs2 (v)) return 1;
+
+ return 0;
+}
+
+
+
+bool SpecialPointCalculation :: AddPoint (const Point<3> & p, int layer)
+{
+ for (int i = 0; i < points->Size(); i++)
+ if (Dist2 ( (*points)[i], p) < epspointdist2 &&
+ (*points)[i].GetLayer() == layer)
+ return 0;
+
+ points->Append (MeshPoint(p, layer));
+ return 1;
+}
+
+
+
+
+
+
+
+/*
+void SpecialPointCalculation ::
+AnalyzeSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<Point<3> > & apoints,
+ ARRAY<SpecialPoint> & specpoints)
+{
+ int si, i, j, k, l, m, spi;
+ Solid * locsol;
+ ARRAY<int> surfind;
+ ARRAY<Vec<3>> normalvecs;
+ const Solid * sol;
+ Vec<3> t;
+ Point<3> p;
+
+ ARRAY<int> specpoint2point;
+ specpoints.SetSize (0);
+
+ (*testout) << "AnalyzeSpecialPoints" << endl;
+
+ for (si = 1; si <= ageometry.GetNTopLevelObjects(); si++)
+ {
+ (*testout) << "main solid " << si << endl;
+
+ sol = ageometry.GetTopLevelObject(si)->GetSolid();
+ for (i = 1; i <= apoints.Size(); i++)
+ {
+ p = apoints.Get(i);
+
+ sol -> TangentialSolid (p, locsol);
+ if (!locsol) continue;
+
+ (*testout) << "Point " << apoints.Get(i) << endl;
+
+ locsol -> GetSurfaceIndices (surfind);
+ for (j = surfind.Size(); j >= 1; j--)
+ if (fabs (ageometry.GetSurface(surfind.Get(j))->
+ CalcFunctionValue (p)) > 1e-6)
+ surfind.DeleteElement (j);
+
+
+
+ (*testout) << "Surfaces: ";
+ for (j = 1; j <= surfind.Size(); j++)
+ (*testout) << surfind.Get(j) << " ";
+ (*testout) << endl;
+
+ normalvecs.SetSize(surfind.Size());
+ for (j = 1; j <= surfind.Size(); j++)
+ ageometry.GetSurface(surfind.Get(j)) ->
+ GetNormalVector(apoints.Get(i), normalvecs.Elem(j));
+
+ for (j = 1; j <= normalvecs.Size() - 1; j ++)
+ for (k = j+1; k <= normalvecs.Size(); k++)
+ for (l = 1; l <= 2; l++)
+ {
+ t = Cross (normalvecs.Get(j), normalvecs.Get(k));
+ if (t.Length2() < 1e-8)
+ {
+ cerr << "AnalyzePoint: Surfaces degenerated" << endl;
+ break;
+ }
+ t /= t.Length();
+ if (l == 2) t *= -1;
+
+ if (locsol -> Edge (apoints.Get(i), t))
+ {
+ spi = 0;
+ for (m = 1; m <= specpoints.Size(); m++)
+ if (Dist2 (specpoints.Get(m).p, apoints.Get(i)) < 1e-8
+ && (specpoints.Get(m).v - t).Length2() < 1e-8)
+ {
+ spi = m;
+ break;
+ }
+ if (!spi)
+ {
+ spi = specpoints.Append (SpecialPoint());
+ specpoint2point.Append (i);
+ specpoints.Last().unconditional = 0;
+ }
+ specpoints.Elem(spi).p = apoints.Get(i);
+ specpoints.Elem(spi).v = t;
+ if (surfind.Size() >= 3)
+ specpoints.Elem(spi).unconditional = 1;
+ specpoints.Elem(spi).s1 = surfind.Get(j);
+ specpoints.Elem(spi).s2 = surfind.Get(k);
+ (*testout) << "spi = " << spi
+ << " uncond = " << specpoints.Get(spi).unconditional
+ << " t = " << t << endl;
+ }
+
+ }
+ delete locsol;
+ }
+ }
+
+ // if special point is unconditional on some solid,
+ // it must be unconditional everywhere:
+
+ BitArray uncond (apoints.Size());
+ uncond.Clear();
+
+ for (i = 1; i <= specpoints.Size(); i++)
+ if (specpoints.Get(i).unconditional)
+ uncond.Set (specpoint2point.Get(i));
+
+ for (i = 1; i <= specpoints.Size(); i++)
+ specpoints.Elem(i).unconditional =
+ uncond.Test (specpoint2point.Get(i)) ? 1 : 0;
+}
+*/
+
+
+
+void SpecialPointCalculation ::
+AnalyzeSpecialPoints (const CSGeometry & ageometry,
+ ARRAY<MeshPoint> & apoints,
+ ARRAY<SpecialPoint> & specpoints)
+{
+ int si, i, j, k, l, m, spi;
+
+ Solid * locsol;
+ ARRAY<int> surfind;
+ ARRAY<int> surfind2;
+
+ ARRAY<Vec<3> > normalvecs;
+ const Solid * sol;
+ const Surface * surf;
+
+ Vec<3> t, nsurf;
+ Point<3> p;
+
+ ARRAY<int> specpoint2point;
+ specpoints.SetSize (0);
+
+ geometry = &ageometry;
+
+ (*testout) << "AnalyzeSpecialPoints\n";
+
+ for (si = 0; si < ageometry.GetNTopLevelObjects(); si++)
+ {
+ (*testout) << "main solid " << si << "\n";
+
+ sol = ageometry.GetTopLevelObject(si)->GetSolid();
+ surf = ageometry.GetTopLevelObject(si)->GetSurface();
+
+ for (i = 0; i < apoints.Size(); i++)
+ {
+ p = apoints[i];
+ if (ageometry.GetTopLevelObject(si)->GetLayer() !=
+ apoints[i].GetLayer())
+ continue;
+
+ // (*testout) << "Point " << apoints[i] << "\n";
+
+ sol -> TangentialSolid (p, locsol);
+ if (!locsol) continue;
+
+ // get all surface indices,
+ if (surf)
+ {
+ locsol -> GetSurfaceIndices (surfind);
+ bool hassurf = 0;
+ for (m = 0; m < surfind.Size(); m++)
+ if (ageometry.GetSurface(surfind[m]) == surf)
+ hassurf = 1;
+
+ if (!hassurf)
+ continue;
+
+ surf->GetNormalVector (p, nsurf);
+ }
+
+ // get independent surfaces of tangential solid
+
+ BoxSphere<3> box(p,p);
+ box.Increase (1e-6);
+ box.CalcDiamCenter();
+ ageometry.GetIndependentSurfaceIndices (locsol, box, surfind);
+
+
+ /*
+ locsol -> GetSurfaceIndices (surfind);
+ for (j = surfind.Size(); j >= 1; j--)
+ if (fabs (ageometry.GetSurface(surfind.Get(j))->
+ CalcFunctionValue (p)) > 1e-6)
+ surfind.DeleteElement (j);
+ */
+
+ /*
+ (*testout) << "Surfaces: ";
+ for (j = 0; j < surfind.Size(); j++)
+ (*testout) << surfind[j] << " ";
+ (*testout) << "\n";
+ */
+
+
+ normalvecs.SetSize(surfind.Size());
+ for (j = 0; j < surfind.Size(); j++)
+ ageometry.GetSurface(surfind[j]) ->
+ GetNormalVector(apoints[i], normalvecs[j]);
+
+ for (j = 0; j < normalvecs.Size(); j++)
+ for (k = j+1; k < normalvecs.Size(); k++)
+ for (l = 1; l <= 2; l++)
+ {
+ t = Cross (normalvecs[j], normalvecs[k]);
+ if (Abs2 (t) < 1e-8)
+ {
+ cerr << "AnalyzePoint: Surfaces degenerated" << "\n";
+ break;
+ }
+ t.Normalize();
+ if (l == 2) t *= -1;
+
+ // try tangential direction t
+
+ // (*testout) << "check tangential " << t << "\n";
+
+ if (surf && fabs (nsurf * t) > 1e-6)
+ continue;
+
+ if (!surf)
+ {
+ ageometry.GetIndependentSurfaceIndices
+ (locsol, p, t, surfind2);
+
+ bool found1 = 0, found2 = 0;
+ for (int ii = 0; ii < surfind2.Size(); ii++)
+ {
+ if (surfind2[ii] == surfind[j])
+ found1 = 1;
+ if (surfind2[ii] == surfind[k])
+ found2 = 1;
+ }
+ if (!found1 || !found2)
+ continue;
+ }
+
+
+ bool isedge;
+
+ // isedge = locsol -> Edge (apoints.Get(i), t);
+
+ // edge must be on tangential surface
+ isedge =
+ locsol->VectorIn (p, t) &&
+ !locsol->VectorStrictIn (p, t);
+
+ // (*testout) << "isedge,1 = " << isedge << "\n";
+
+ // there must exist at least two different faces on edge
+ if (isedge)
+ {
+ int cnts = 0;
+ for (m = 0; m < surfind.Size(); m++)
+ {
+ if (fabs (normalvecs[m] * t) > 1e-6)
+ continue;
+
+ Vec<3> s = Cross (normalvecs[m], t);
+ Vec<3> t2a = t + 0.01 *s;
+ Vec<3> t2b = t - 0.01 *s;
+
+ /*
+ (*testout) << "nv = " << normalvecs[m] << ", s = " << s << "\n";
+ (*testout) << "t2a = " << t2a << ", t2b = " << t2b << "\n";
+ (*testout) << "via = "
+ << locsol->VectorIn (p, t2a) << "/"
+ << locsol->VectorStrictIn (p, t2a);
+ (*testout) << "vib = "
+ << locsol->VectorIn (p, t2b) << "/"
+ << locsol->VectorStrictIn (p, t2b) << "\n";
+ */
+
+ bool isface =
+ (locsol->VectorIn (p, t2a) &&
+ !locsol->VectorStrictIn (p, t2a))
+ ||
+ (locsol->VectorIn (p, t2b) &&
+ !locsol->VectorStrictIn (p, t2b));
+
+ if (isface)
+ {
+ cnts++;
+ }
+ }
+ if (cnts < 2) isedge = 0;
+ }
+
+ if (isedge)
+ {
+ spi = -1;
+ for (m = 0; m < specpoints.Size(); m++)
+ if (Dist2 (specpoints[m].p, apoints[i]) < 1e-8
+ && Abs2(specpoints[m].v - t) < 1e-8)
+ {
+ spi = m;
+ break;
+ }
+ if (spi == -1)
+ {
+ spi = specpoints.Append (SpecialPoint()) - 1;
+ specpoint2point.Append (i);
+ specpoints.Last().unconditional = 0;
+ }
+ specpoints[spi].p = apoints[i];
+ specpoints[spi].v = t;
+ if (surfind.Size() >= 3)
+ specpoints[spi].unconditional = 1;
+ specpoints[spi].s1 = surfind[j];
+ specpoints[spi].s2 = surfind[k];
+ specpoints[spi].layer = apoints[i].GetLayer();
+ for (int up = 0; up < geometry->GetNUserPoints(); up++)
+ if (Dist (geometry->GetUserPoint(up), apoints[i]) < 1e-10)
+ specpoints[spi].unconditional = 1;
+
+ /*
+ (*testout) << "spi = " << spi
+ << " uncond = " << specpoints[spi].unconditional
+ << " t = " << t << "\n";
+ */
+ }
+
+ }
+ delete locsol;
+ }
+ }
+
+ // if special point is unconditional on some solid,
+ // it must be unconditional everywhere:
+
+ BitArray uncond (apoints.Size());
+ uncond.Clear();
+
+ for (i = 0; i < specpoints.Size(); i++)
+ if (specpoints[i].unconditional)
+ uncond.Set (specpoint2point[i]);
+
+ for (i = 0; i < specpoints.Size(); i++)
+ specpoints[i].unconditional =
+ uncond.Test (specpoint2point[i]) ? 1 : 0;
+}
+}
diff --git a/Netgen/libsrc/csg/surface.cpp b/Netgen/libsrc/csg/surface.cpp
index 2fd4064562..8b8d58127a 100644
--- a/Netgen/libsrc/csg/surface.cpp
+++ b/Netgen/libsrc/csg/surface.cpp
@@ -61,11 +61,19 @@ void Surface :: CalcHesse (const Point<3> & point, Mat<3> & hesse) const
}
}
+/*
void Surface :: GetNormalVector (const Point<3> & p, Vec<3> & n) const
{
CalcGradient (p, n);
n.Normalize();
- // if (Inverse()) n *= -1;
+}
+*/
+Vec<3> Surface :: GetNormalVector (const Point<3> & p) const
+{
+ Vec<3> n;
+ CalcGradient (p, n);
+ n.Normalize();
+ return n;
}
void Surface :: DefineTangentialPlane (const Point<3> & ap1,
@@ -74,7 +82,7 @@ void Surface :: DefineTangentialPlane (const Point<3> & ap1,
p1 = ap1;
p2 = ap2;
- GetNormalVector (p1, ez);
+ ez = GetNormalVector (p1);
ex = p2 - p1;
ex -= (ex * ez) * ez;
ex.Normalize();
@@ -86,7 +94,7 @@ void Surface :: ToPlane (const Point<3> & p3d, Point<2> & pplane,
{
Vec<3> p1p, n;
- GetNormalVector (p3d, n);
+ n = GetNormalVector (p3d);
if (n * ez < 0)
{
zone = -1;
@@ -254,7 +262,11 @@ VecInSolid2 (const Point<3> & p,
double eps) const
{
Point<3> hp = p + 1e-3 * v1 + 1e-5 * v2;
- return PointInSolid (hp, eps);
+
+ INSOLID_TYPE res = PointInSolid (hp, eps);
+ // (*testout) << "vectorin2, type = " << typeid(*this).name() << ", res = " << res << endl;
+
+ return res;
}
diff --git a/Netgen/libsrc/csg/surface.hpp b/Netgen/libsrc/csg/surface.hpp
index 2738d5222d..db0b4a74d2 100644
--- a/Netgen/libsrc/csg/surface.hpp
+++ b/Netgen/libsrc/csg/surface.hpp
@@ -90,8 +90,8 @@ public:
virtual void Project (Point<3> & p) const;
- virtual int IsIdentic (const Surface & s2, int & inv,
- double eps) const
+ virtual int IsIdentic (const Surface & /* s2 */, int & /* inv */,
+ double /* eps */) const
{ return 0; }
///
@@ -120,7 +120,8 @@ public:
/**
Returns outer normal vector.
*/
- virtual void GetNormalVector (const Point<3> & p, Vec<3> & n) const;
+ // virtual void GetNormalVector (const Point<3> & p, Vec<3> & n) const;
+ virtual Vec<3> GetNormalVector (const Point<3> & p) const;
/**
Upper bound for spectral norm of Hesse-matrix
@@ -181,9 +182,9 @@ public:
Gets Approximation by triangles,
where qual is about the number of triangles per radius
*/
- virtual void GetTriangleApproximation (TriangleApproximation & tas,
- const Box<3> & boundingbox,
- double facets) const { };
+ virtual void GetTriangleApproximation (TriangleApproximation & /* tas */,
+ const Box<3> & /* boundingbox */,
+ double /* facets */ ) const { };
#ifdef MYGRAPH
///
diff --git a/Netgen/libsrc/csg/triapprox.cpp b/Netgen/libsrc/csg/triapprox.cpp
index b314855dae..403716155b 100644
--- a/Netgen/libsrc/csg/triapprox.cpp
+++ b/Netgen/libsrc/csg/triapprox.cpp
@@ -8,55 +8,52 @@
namespace netgen
{
-TriangleApproximation :: TriangleApproximation ()
-{
- ;
-}
-
-int TriangleApproximation ::
-AddTriangle (const TATriangle & tri, bool invert)
-{
- trias.Append (tri);
- if (invert)
- {
- trias.Last()[1] = tri[2];
- trias.Last()[2] = tri[1];
- }
- return trias.Size()-1;
-}
-
-
-void TriangleApproximation :: RemoveUnusedPoints ()
-{
- BitArray used(GetNP());
- ARRAY<int> map (GetNP());
- int i, j;
- int cnt = 0;
-
- used.Clear();
- for (i = 0; i < GetNT(); i++)
- for (j = 0; j < 3; j++)
- used.Set (GetTriangle (i)[j]);
-
- for (i = 0; i < GetNP(); i++)
- if (used.Test(i))
+ TriangleApproximation :: TriangleApproximation ()
+ {
+ ;
+ }
+
+ int TriangleApproximation ::
+ AddTriangle (const TATriangle & tri, bool invert)
+ {
+ trigs.Append (tri);
+ if (invert)
{
- map[i] = cnt;
- cnt++;
+ trigs.Last()[1] = tri[2];
+ trigs.Last()[2] = tri[1];
}
-
- for (i = 0; i < GetNT(); i++)
- for (j = 0; j < 3; j++)
- trias[i][j] = map[trias[i][j]];
+ return trigs.Size()-1;
+ }
- for (i = 0; i < GetNP(); i++)
- if (used.Test(i))
- {
- points[map[i]] = points[i];
- normals[map[i]] = normals[i];
- }
- points.SetSize (cnt);
- normals.SetSize (cnt);
-}
+ void TriangleApproximation :: RemoveUnusedPoints ()
+ {
+ BitArray used(GetNP());
+ ARRAY<int> map (GetNP());
+ int i, j;
+ int cnt = 0;
+
+ used.Clear();
+ for (i = 0; i < GetNT(); i++)
+ for (j = 0; j < 3; j++)
+ used.Set (GetTriangle (i)[j]);
+
+ for (i = 0; i < GetNP(); i++)
+ if (used.Test(i))
+ map[i] = cnt++;
+
+ for (i = 0; i < GetNT(); i++)
+ for (j = 0; j < 3; j++)
+ trigs[i][j] = map[trigs[i][j]];
+
+ for (i = 0; i < GetNP(); i++)
+ if (used.Test(i))
+ {
+ points[map[i]] = points[i];
+ normals[map[i]] = normals[i];
+ }
+
+ points.SetSize (cnt);
+ normals.SetSize (cnt);
+ }
}
diff --git a/Netgen/libsrc/csg/triapprox.hpp b/Netgen/libsrc/csg/triapprox.hpp
index d7192a9a02..7b2db16b09 100644
--- a/Netgen/libsrc/csg/triapprox.hpp
+++ b/Netgen/libsrc/csg/triapprox.hpp
@@ -25,9 +25,6 @@ public:
int SurfaceIndex() const { return surfind; }
int & SurfaceIndex() { return surfind; }
- // int PNum (int i) const { return pi[i-1]; }
- // int & PNum (int i) { return pi[i-1]; }
-
int & operator[] (int i) { return pi[i]; }
const int & operator[] (int i) const { return pi[i]; }
};
@@ -37,19 +34,19 @@ class TriangleApproximation
{
ARRAY<Point<3> > points;
ARRAY<Vec<3> > normals;
- ARRAY<TATriangle> trias;
+ ARRAY<TATriangle> trigs;
public:
TriangleApproximation();
int GetNP () const { return points.Size(); }
- int GetNT () const { return trias.Size(); }
+ int GetNT () const { return trigs.Size(); }
int AddPoint (const Point<3> & p) { points.Append (p); return points.Size()-1; }
int AddNormal (const Vec<3> & n) { normals.Append (n); return normals.Size()-1; }
int AddTriangle (const TATriangle & tri, bool invert = 0);
const Point<3> & GetPoint (int i) const { return points[i]; }
- const TATriangle & GetTriangle (int i) const { return trias[i]; }
+ const TATriangle & GetTriangle (int i) const { return trigs[i]; }
const Vec<3> & GetNormal (int i) const { return normals[i]; }
void RemoveUnusedPoints ();
diff --git a/Netgen/libsrc/general/array.hpp b/Netgen/libsrc/general/array.hpp
index 020a15ac34..c953cedeff 100644
--- a/Netgen/libsrc/general/array.hpp
+++ b/Netgen/libsrc/general/array.hpp
@@ -27,15 +27,15 @@ protected:
public:
/// provide size and memory
- FlatArray (int asize, T * adata)
+ inline FlatArray (int asize, T * adata)
: size(asize), data(adata) { ; }
/// the size
- int Size() const { return size; }
+ inline int Size() const { return size; }
/// access array.
- T & operator[] (int i)
+ inline T & operator[] (int i)
{
#ifdef DEBUG
if (i-BASE < 0 || i-BASE >= size)
@@ -47,7 +47,7 @@ public:
/// Access array.
- const T & operator[] (int i) const
+ inline const T & operator[] (int i) const
{
#ifdef DEBUG
if (i-BASE < 0 || i-BASE >= size)
@@ -215,7 +215,13 @@ public:
/// Delete element i (0-based). Move last element to position i.
void Delete (int i)
{
- DeleteElement (i+1);
+#ifdef CHECK_ARRAY_RANGE
+ RangeCheck (i+1);
+#endif
+
+ this->data[i] = this->data[this->size-1];
+ this->size--;
+ // DeleteElement (i+1);
}
@@ -297,7 +303,8 @@ template <class T, int S>
class ArrayMem : public ARRAY<T>
{
// T mem[S];
- char mem[S*sizeof(T)];
+ // char mem[S*sizeof(T)];
+ double mem[(S*sizeof(T)+7) / 8];
public:
/// Generate array of logical and physical size asize
explicit ArrayMem(int asize = 0)
diff --git a/Netgen/libsrc/general/bitarray.hpp b/Netgen/libsrc/general/bitarray.hpp
index 380b78987e..1b7042fa5a 100644
--- a/Netgen/libsrc/general/bitarray.hpp
+++ b/Netgen/libsrc/general/bitarray.hpp
@@ -194,10 +194,10 @@ private:
template <int BASE>
inline ostream & operator<< (ostream & s, const BitArrayChar<BASE> & a)
{
- for (int i = 0; i < a.Size(); i++)
+ for (int i = BASE; i < a.Size()+BASE; i++)
{
s << a.Test(i);
- if (i % 40 == 0) s << "\n";
+ if ( (i-BASE) % 40 == 39) s << "\n";
}
if (a.Size() % 40 != 0) s << "\n";
return s;
diff --git a/Netgen/libsrc/general/dynamicmem.cpp b/Netgen/libsrc/general/dynamicmem.cpp
index 9cd1f3ad62..66b22cb4a7 100644
--- a/Netgen/libsrc/general/dynamicmem.cpp
+++ b/Netgen/libsrc/general/dynamicmem.cpp
@@ -34,12 +34,12 @@ BaseDynamicMem :: ~BaseDynamicMem ()
if (prev) prev->next = next;
else first = next;
- delete name;
+ delete [] name;
}
void BaseDynamicMem :: SetName (const char * aname)
{
- delete name;
+ delete [] name;
if (aname)
{
name = new char[strlen(aname)+1];
diff --git a/Netgen/libsrc/general/flags.cpp b/Netgen/libsrc/general/flags.cpp
index 962c8152e8..9cce0cef2f 100644
--- a/Netgen/libsrc/general/flags.cpp
+++ b/Netgen/libsrc/general/flags.cpp
@@ -27,10 +27,10 @@ namespace netgen
void Flags :: DeleteFlags ()
{
- int i;
-
- for (i = 1; i <= strflags.Size(); i++)
- delete strflags.Elem(i);
+ for (int i = 0; i < strflags.Size(); i++)
+ delete [] strflags[i];
+ for (int i = 0; i < numlistflags.Size(); i++)
+ delete numlistflags[i];
strflags.DeleteAll();
numflags.DeleteAll();
defflags.DeleteAll();
diff --git a/Netgen/libsrc/general/hashtabl.cpp b/Netgen/libsrc/general/hashtabl.cpp
index 3081298e24..0485ab6045 100644
--- a/Netgen/libsrc/general/hashtabl.cpp
+++ b/Netgen/libsrc/general/hashtabl.cpp
@@ -8,6 +8,7 @@
Abstract data type HASHTABLE
*/
+#include <algorithm>
#include <mystdlib.h>
#include <myadt.hpp>
diff --git a/Netgen/libsrc/general/hashtabl.hpp b/Netgen/libsrc/general/hashtabl.hpp
index 99d3257b84..b3e0e93f7e 100644
--- a/Netgen/libsrc/general/hashtabl.hpp
+++ b/Netgen/libsrc/general/hashtabl.hpp
@@ -48,7 +48,7 @@ public:
///
inline const T & Get (const INDEX & ahash) const;
///
- inline int Used (const INDEX & ahash) const;
+ inline bool Used (const INDEX & ahash) const;
///
inline int GetNBags () const;
///
@@ -112,13 +112,21 @@ class INDEX_2_HASHTABLE : public BASE_INDEX_2_HASHTABLE
public:
///
- inline INDEX_2_HASHTABLE (int size);
+ INDEX_2_HASHTABLE (int size)
+ : BASE_INDEX_2_HASHTABLE (size), cont(size)
+ { ; }
+
///
- void SetSize(int s) {cont.SetSize(s); BaseSetSize(s);}
+ void SetSize(int s)
+ {
+ cont.SetSize(s);
+ BaseSetSize(s);
+ }
+
///
- inline void Set (const INDEX_2 & ahash, const T & acont)
- {
- int bnr = HashValue (ahash);
+ void Set (const INDEX_2 & ahash, const T & acont)
+ {
+ int bnr = HashValue (ahash);
int pos = Position (bnr, ahash);
if (pos)
cont.Set (bnr, pos, acont);
@@ -127,24 +135,140 @@ public:
hash.Add1 (bnr, ahash);
cont.Add1 (bnr, acont);
}
- }
+ }
+
///
- inline const T & Get (const INDEX_2 & ahash) const;
+ const T & Get (const INDEX_2 & ahash) const
+ {
+ int bnr = HashValue (ahash);
+ int pos = Position (bnr, ahash);
+ return cont.Get (bnr, pos);
+ }
+
///
- inline int Used (const INDEX_2 & ahash) const;
+ bool Used (const INDEX_2 & ahash) const
+ {
+ return (Position (HashValue (ahash), ahash)) ? 1 : 0;
+ }
+
///
- inline int GetNBags () const;
+ int GetNBags () const
+ {
+ return cont.Size();
+ }
+
///
- inline int GetBagSize (int bnr) const;
+ int GetBagSize (int bnr) const
+ {
+ return cont.EntrySize (bnr);
+ }
+
///
- inline void GetData (int bnr, int colnr,
- INDEX_2 & ahash, T & acont) const;
+ void GetData (int bnr, int colnr,
+ INDEX_2 & ahash, T & acont) const
+ {
+ ahash = hash.Get(bnr, colnr);
+ acont = cont.Get(bnr, colnr);
+ }
+
///
- inline void PrintMemInfo (ostream & ost) const;
+ void SetData (int bnr, int colnr,
+ const INDEX_2 & ahash, const T & acont)
+ {
+ hash.Set(bnr, colnr, ahash);
+ cont.Set(bnr, colnr, acont);
+ }
+
+ ///
+ void PrintMemInfo (ostream & ost) const
+ {
+ ost << "Hash: " << endl;
+ hash.PrintMemInfo (ost);
+ ost << "Cont: " << endl;
+ cont.PrintMemInfo (ost);
+ }
+
+
+
+ class Iterator
+ {
+ const INDEX_2_HASHTABLE & ht;
+ int bagnr, pos;
+ public:
+ Iterator (const INDEX_2_HASHTABLE & aht,
+ int abagnr, int apos)
+ : ht(aht), bagnr(abagnr), pos(apos)
+ { ; }
+
+ int BagNr() const { return bagnr; }
+ int Pos() const { return pos; }
+
+ void operator++ (int)
+ {
+ // cout << "begin Operator ++: bagnr = " << bagnr << " - pos = " << pos << endl;
+ pos++;
+ while (bagnr < ht.GetNBags() &&
+ pos == ht.GetBagSize(bagnr+1))
+ {
+ pos = 0;
+ bagnr++;
+ }
+ // cout << "end Operator ++: bagnr = " << bagnr << " - pos = " << pos << endl;
+ }
+
+ bool operator != (int i) const
+ {
+ return bagnr != i;
+ }
+
+ };
+
+ Iterator Begin () const
+ {
+ Iterator it(*this, 0, -1);
+ it++;
+ return it;
+ }
+
+ int End() const
+ {
+ return GetNBags();
+ }
+
+ void GetData (const Iterator & it,
+ INDEX_2 & ahash, T & acont) const
+ {
+ ahash = hash[it.BagNr()][it.Pos()];
+ acont = cont[it.BagNr()][it.Pos()];
+ }
+
+ const INDEX_2 & GetHash (const Iterator & it) const
+ { return hash[it.BagNr()][it.Pos()]; }
+
+ const T & GetData (const Iterator & it) const
+ { return cont[it.BagNr()][it.Pos()]; }
};
+template <typename T>
+inline ostream & operator<< (ostream & ost, const INDEX_2_HASHTABLE<T> & ht)
+{
+ for (typename INDEX_2_HASHTABLE<T>::Iterator it = ht.Begin();
+ it != ht.End(); it++)
+ {
+ ost << ht.GetHash(it) << ": " << ht.GetData(it) << endl;
+ }
+
+ return ost;
+}
+
+
+
+
+
+
+
///
class BASE_INDEX_3_HASHTABLE
{
@@ -197,7 +321,7 @@ public:
///
inline const T & Get (const INDEX_3 & ahash) const;
///
- inline int Used (const INDEX_3 & ahash) const;
+ inline bool Used (const INDEX_3 & ahash) const;
///
inline int GetNBags () const;
///
@@ -311,7 +435,7 @@ public:
///
inline const T & Get (const INDEX_2 & ahash) const;
///
- inline int Used (const INDEX_2 & ahash) const;
+ inline bool Used (const INDEX_2 & ahash) const;
///
inline void SetData (int pos, const INDEX_2 & ahash, const T & acont);
///
@@ -321,6 +445,8 @@ public:
///
inline void GetData (int pos, T & acont) const;
///
+ const T & GetData (int pos) { return cont.Get(pos); }
+ ///
inline void SetSize (int size);
///
inline void PrintMemInfo (ostream & ost) const;
@@ -359,20 +485,30 @@ public:
BASE_INDEX_3_CLOSED_HASHTABLE (int size);
int Size() const { return hash.Size(); }
- int UsedPos (int pos) const { return ! (hash.Get(pos).I1() == invalid); }
+ bool UsedPos (int pos) const { return ! (hash.Get(pos).I1() == invalid); }
int UsedElements () const;
///
int HashValue (const INDEX_3 & ind) const
- {
- return (ind.I1() + 15 * ind.I2() + 41 * ind.I3()) % hash.Size() + 1;
- }
-
+ {
+ return (ind.I1() + 15 * ind.I2() + 41 * ind.I3()) % hash.Size() + 1;
+ }
+
int Position (const INDEX_3 & ind) const
{
+ int i = HashValue(ind);
+ while (1)
+ {
+ if (hash.Get(i) == ind) return i;
+ if (hash.Get(i).I1() == invalid) return 0;
+ i++;
+ if (i > hash.Size()) i = 1;
+ }
+ /*
int pos = HashValue (ind);
if (hash.Get(pos) == ind) return pos;
return Position2 (ind);
+ */
}
// returns 1, if new postion is created
@@ -417,7 +553,7 @@ public:
///
inline const T & Get (const INDEX_3 & ahash) const;
///
- inline int Used (const INDEX_3 & ahash) const;
+ inline bool Used (const INDEX_3 & ahash) const;
///
inline void SetData (int pos, const INDEX_3 & ahash, const T & acont);
///
@@ -427,6 +563,8 @@ public:
///
inline void GetData (int pos, T & acont) const;
///
+ inline const T & GetData (int pos) const;
+ ///
inline void SetSize (int size);
///
inline void PrintMemInfo (ostream & ost) const;
@@ -502,7 +640,7 @@ inline const T & INDEX_3_HASHTABLE<T> :: Get (const INDEX_3 & ahash) const
}
template<class T>
-inline int INDEX_3_HASHTABLE<T> :: Used (const INDEX_3 & ahash) const
+inline bool INDEX_3_HASHTABLE<T> :: Used (const INDEX_3 & ahash) const
{
return (Position (HashValue (ahash), ahash)) ? 1 : 0;
}
@@ -609,7 +747,7 @@ inline const T & INDEX_HASHTABLE<T> :: Get (const INDEX & ahash) const
}
template<class T>
-inline int INDEX_HASHTABLE<T> :: Used (const INDEX & ahash) const
+inline bool INDEX_HASHTABLE<T> :: Used (const INDEX & ahash) const
{
return (Position (HashValue (ahash), ahash)) ? 1 : 0;
}
@@ -648,82 +786,6 @@ inline void INDEX_HASHTABLE<T> :: PrintMemInfo (ostream & ost) const
-
-
-/****************** INDEX_2_HASHTABLE ****************************/
-
-
-template<class T>
-inline INDEX_2_HASHTABLE<T> :: INDEX_2_HASHTABLE (int size)
- : BASE_INDEX_2_HASHTABLE (size), cont(size)
- {
- ;
- }
-
-/*
-template<class T>
-inline void INDEX_2_HASHTABLE<T> :: Set (const INDEX_2 & ahash, const T & acont)
- {
- int bnr = HashValue (ahash);
- int pos = Position (bnr, ahash);
- if (pos)
- cont.Set (bnr, pos, acont);
- else
- {
- hash.Add (bnr, ahash);
- cont.Add (bnr, acont);
- }
- }
-*/
-
-template<class T>
-inline const T & INDEX_2_HASHTABLE<T> :: Get (const INDEX_2 & ahash) const
- {
- int bnr = HashValue (ahash);
- int pos = Position (bnr, ahash);
- return cont.Get (bnr, pos);
- }
-
-template<class T>
-inline int INDEX_2_HASHTABLE<T> :: Used (const INDEX_2 & ahash) const
- {
- return (Position (HashValue (ahash), ahash)) ? 1 : 0;
- }
-
-template<class T>
-inline int INDEX_2_HASHTABLE<T> :: GetNBags () const
- {
- return cont.Size();
- }
-
-template<class T>
-inline int INDEX_2_HASHTABLE<T> :: GetBagSize (int bnr) const
- {
- return cont.EntrySize (bnr);
- }
-
-template<class T>
-inline void INDEX_2_HASHTABLE<T> :: GetData (int bnr, int colnr, INDEX_2 & ahash, T & acont) const
- {
- ahash = hash.Get(bnr, colnr);
- acont = cont.Get(bnr, colnr);
- }
-
-
-
-template<class T>
-inline void INDEX_2_HASHTABLE<T> :: PrintMemInfo (ostream & ost) const
- {
- ost << "Hash: " << endl;
- hash.PrintMemInfo (ost);
- ost << "Cont: " << endl;
- cont.PrintMemInfo (ost);
- }
-
-
-
-
-
@@ -764,7 +826,7 @@ Get (const INDEX_2 & ahash) const
}
template<class T>
-inline int INDEX_2_CLOSED_HASHTABLE<T> ::
+inline bool INDEX_2_CLOSED_HASHTABLE<T> ::
Used (const INDEX_2 & ahash) const
{
int pos = Position (ahash);
@@ -866,7 +928,7 @@ Get (const INDEX_3 & ahash) const
}
template<class T>
-inline int INDEX_3_CLOSED_HASHTABLE<T> ::
+inline bool INDEX_3_CLOSED_HASHTABLE<T> ::
Used (const INDEX_3 & ahash) const
{
int pos = Position (ahash);
@@ -903,6 +965,13 @@ GetData (int pos, T & acont) const
acont = cont.Get(pos);
}
+template<class T>
+inline const T & INDEX_3_CLOSED_HASHTABLE<T> ::
+GetData (int pos) const
+{
+ return cont.Get(pos);
+}
+
template<class T>
inline void INDEX_3_CLOSED_HASHTABLE<T> ::
diff --git a/Netgen/libsrc/general/moveablemem.cpp b/Netgen/libsrc/general/moveablemem.cpp
index 0e6f894dea..cdfac0e7b8 100644
--- a/Netgen/libsrc/general/moveablemem.cpp
+++ b/Netgen/libsrc/general/moveablemem.cpp
@@ -36,7 +36,7 @@ namespace netgen
pos = 0;
ptr = 0;
- name = 0;
+ name = NULL;
if (s) Alloc(s);
}
@@ -50,12 +50,20 @@ BaseMoveableMem :: ~BaseMoveableMem () throw()
if (prev) prev->next = next;
else first = next;
- delete name;
+ if(name != NULL)
+ {
+ delete [] name;
+ name = NULL;
+ }
}
void BaseMoveableMem :: SetName (const char * aname)
{
- delete name;
+ if(name != NULL)
+ {
+ delete [] name;
+ name = NULL;
+ }
if (aname)
{
name = new char[strlen(aname)+1];
@@ -192,7 +200,7 @@ void BaseMoveableMem :: Free () throw()
void BaseMoveableMem :: Swap (BaseMoveableMem & m2) throw()
{
int hi;
- BaseMoveableMem * hp;
+ // BaseMoveableMem * hp;
char * cp;
hi = size; size = m2.size; m2.size = hi;
hi = pos; pos = m2.pos; m2.pos = hi;
diff --git a/Netgen/libsrc/general/moveablemem.hpp b/Netgen/libsrc/general/moveablemem.hpp
index d156bb694c..92a67ad6da 100644
--- a/Netgen/libsrc/general/moveablemem.hpp
+++ b/Netgen/libsrc/general/moveablemem.hpp
@@ -90,8 +90,8 @@ public:
BaseMoveableMem::Swap (m2);
}
protected:
- MoveableMem (const MoveableMem & m);
- MoveableMem & operator= (const MoveableMem & m);
+ MoveableMem (const MoveableMem & m) { ; }
+ MoveableMem & operator= (const MoveableMem & m) { ; }
};
#endif
diff --git a/Netgen/libsrc/general/mystring.cpp b/Netgen/libsrc/general/mystring.cpp
index b586202ba8..6b0f0cee74 100644
--- a/Netgen/libsrc/general/mystring.cpp
+++ b/Netgen/libsrc/general/mystring.cpp
@@ -41,14 +41,15 @@ void DefaultStringErrHandler()
}
void (*MyStr::ErrHandler)() = DefaultStringErrHandler;
-
+
+ /*
MyStr::MyStr()
{
length = 0;
- // str = new char[1];
str = shortstr;
str[0] = 0;
}
+ */
MyStr::MyStr(const char *s)
{
@@ -61,6 +62,7 @@ MyStr::MyStr(const char *s)
strcpy(str, s);
}
+/*
MyStr::MyStr(char s)
{
length = 1;
@@ -68,6 +70,7 @@ MyStr::MyStr(char s)
str[0] = s;
str[1] = (char)0;
}
+*/
MyStr::MyStr(const MyStr& s)
{
diff --git a/Netgen/libsrc/general/mystring.hpp b/Netgen/libsrc/general/mystring.hpp
index 6517aad3fa..39851d1fad 100644
--- a/Netgen/libsrc/general/mystring.hpp
+++ b/Netgen/libsrc/general/mystring.hpp
@@ -93,6 +93,22 @@ private:
static void(*ErrHandler)();
};
+
+inline MyStr::MyStr()
+{
+ length = 0;
+ str = shortstr;
+ str[0] = 0;
+}
+
+inline MyStr::MyStr(char s)
+{
+ length = 1;
+ str = shortstr;
+ str[0] = s;
+ str[1] = (char)0;
+}
+
inline MyStr::~MyStr()
{
if (length > SHORTLEN)
diff --git a/Netgen/libsrc/general/optmem.cpp b/Netgen/libsrc/general/optmem.cpp
index 3247e7e38d..c8f961b12a 100644
--- a/Netgen/libsrc/general/optmem.cpp
+++ b/Netgen/libsrc/general/optmem.cpp
@@ -32,10 +32,10 @@ namespace netgen
delete [] bablocks[i];
}
- void * BlockAllocator :: Alloc ()
+ void BlockAllocator :: Alloc2 ()
{
// return new char[size];
- if (!freelist)
+ // if (!freelist)
{
// cout << "BlockAlloc: " << size*blocks << endl;
char * hcp = new char [size * blocks];
@@ -46,14 +46,18 @@ namespace netgen
*(void**)&(hcp[(blocks-1)*size]) = NULL;
freelist = hcp;
}
+ /*
void * p = freelist;
freelist = *(void**)freelist;
return p;
+ */
}
+ /*
void BlockAllocator :: Free (void * p)
{
*(void**)p = freelist;
freelist = p;
}
+ */
}
diff --git a/Netgen/libsrc/general/optmem.hpp b/Netgen/libsrc/general/optmem.hpp
index a7a136c7c5..d9e5e2137e 100644
--- a/Netgen/libsrc/general/optmem.hpp
+++ b/Netgen/libsrc/general/optmem.hpp
@@ -26,9 +26,25 @@ public:
///
~BlockAllocator ();
///
- void * Alloc ();
+ void * Alloc ()
+ {
+ if (!freelist)
+ Alloc2();
+
+ void * p = freelist;
+ freelist = *(void**)freelist;
+ return p;
+ }
///
- void Free (void * p);
+ void Free (void * p)
+ {
+ *(void**)p = freelist;
+ freelist = p;
+ }
+
+
+private:
+ void Alloc2 ();
};
diff --git a/Netgen/libsrc/general/sort.cpp b/Netgen/libsrc/general/sort.cpp
index b4f2c8c0b4..264a132a74 100644
--- a/Netgen/libsrc/general/sort.cpp
+++ b/Netgen/libsrc/general/sort.cpp
@@ -9,6 +9,7 @@
*/
+#include <algorithm>
#include <mystdlib.h>
#include <myadt.hpp>
diff --git a/Netgen/libsrc/general/sort.hpp b/Netgen/libsrc/general/sort.hpp
index 63a85dad45..99c3291000 100644
--- a/Netgen/libsrc/general/sort.hpp
+++ b/Netgen/libsrc/general/sort.hpp
@@ -7,6 +7,7 @@
/* Date: 07. Jan. 00 */
/**************************************************************************/
+
// order(i) is sorted index of element i
extern void Sort (const ARRAY<double> & values,
ARRAY<int> & order);
diff --git a/Netgen/libsrc/general/symbolta.hpp b/Netgen/libsrc/general/symbolta.hpp
index e429c7d19b..6b8916e8ea 100644
--- a/Netgen/libsrc/general/symbolta.hpp
+++ b/Netgen/libsrc/general/symbolta.hpp
@@ -9,9 +9,9 @@
/**************************************************************************/
/**
- Base class for the generic SYMBOLTABLE.
- An array of identifiers is maintained.
- */
+ Base class for the generic SYMBOLTABLE.
+ An array of identifiers is maintained.
+*/
class BASE_SYMBOLTABLE
{
protected:
@@ -31,14 +31,15 @@ public:
/**
- Abstract data type Symbol Table.
+ Abstract data type Symbol Table.
- To a string an value of the generic type T is associated.
- The string is not copied into the symbol table class!
+ To a string an value of the generic type T is associated.
+ The string is not copied into the symbol table class!
*/
template <class T>
class SYMBOLTABLE : public BASE_SYMBOLTABLE
{
+private:
/// Associated data
ARRAY <T> data;
@@ -51,7 +52,7 @@ public:
inline T & Elem (const char * name);
/// Returns reference to i-th element
inline T & Elem (int i)
- { return data.Elem(i); }
+ { return data.Elem(i); }
/// Returns element, error if not used
inline const T & Get (const char * name) const;
/// Returns i-th element
@@ -66,9 +67,9 @@ public:
inline void DeleteAll ();
inline T & operator[] (int i)
- { return data[i]; }
+ { return data[i]; }
inline const T & operator[] (int i) const
- { return data[i]; }
+ { return data[i]; }
private:
/// Prevents from copying symboltable by pointer assignment
@@ -80,79 +81,78 @@ private:
template <class T>
inline SYMBOLTABLE<T> :: SYMBOLTABLE ()
- {
- ;
- }
+{
+ ;
+}
template <class T>
inline INDEX SYMBOLTABLE<T> :: Size() const
- {
+{
return data.Size();
- }
+}
template <class T>
inline T & SYMBOLTABLE<T> :: Elem (const char * name)
- {
- int i;
- i = Index (name);
+{
+ int i = Index (name);
if (i)
return data.Elem (i);
else
return data.Elem(1);
- }
+}
template <class T>
inline const T & SYMBOLTABLE<T> :: Get (const char * name) const
- {
+{
int i;
i = Index (name);
if (i)
return data.Get(i);
else
return data.Get(1);
- }
+}
template <class T>
inline const T & SYMBOLTABLE<T> :: Get (int i) const
- {
+{
return data.Get(i);
- }
+}
template <class T>
inline const char* SYMBOLTABLE<T> :: GetName (int i) const
- {
+{
return names.Get(i);
- }
+}
template <class T>
inline void SYMBOLTABLE<T> :: Set (const char * name, const T & el)
- {
+{
int i;
i = Index (name);
if (i)
data.Set(i, el);
else
{
- data.Append (el);
- char * hname = new char [strlen (name) + 1];
- strcpy (hname, name);
- names.Append (hname);
+ data.Append (el);
+ char * hname = new char [strlen (name) + 1];
+ strcpy (hname, name);
+ names.Append (hname);
}
- }
+}
template <class T>
inline int SYMBOLTABLE<T> :: Used (const char * name) const
- {
+{
return (Index(name)) ? 1 : 0;
- }
+}
template <class T>
inline void SYMBOLTABLE<T> :: DeleteAll ()
- {
+{
DelNames();
data.DeleteAll();
- }
+}
#endif
diff --git a/Netgen/libsrc/general/table.cpp b/Netgen/libsrc/general/table.cpp
index 7dcd5557d3..ed84789bf9 100644
--- a/Netgen/libsrc/general/table.cpp
+++ b/Netgen/libsrc/general/table.cpp
@@ -62,12 +62,11 @@ namespace netgen
void BASE_TABLE :: SetSize (int size)
{
- int i;
- for (i = 0; i < data.Size(); i++)
+ for (int i = 0; i < data.Size(); i++)
delete [] (char*)data[i].col;
data.SetSize(size);
- for (i = 0; i < size; i++)
+ for (int i = 0; i < size; i++)
{
data[i].maxsize = 0;
data[i].size = 0;
@@ -77,37 +76,22 @@ namespace netgen
void BASE_TABLE :: IncSize2 (int i, int elsize)
{
- if (i < 1 || i > data.Size())
+#ifdef DEBUG
+ if (i < 0 || i >= data.Size())
{
MyError ("BASE_TABLE::Inc: Out of range");
return;
}
-
- linestruct & line = data.Elem (i);
-
+#endif
+
+ linestruct & line = data[i];
if (line.size == line.maxsize)
{
- /*
- static int totalloc = 0, cnt = 0;
- totalloc += (line.maxsize+5) * elsize;
- cnt ++;
-
- if (cnt % 100000 == 0)
- cout << "base_table: total alloc = " << totalloc << endl;
- */
-
void * p = new char [(line.maxsize+5) * elsize];
- // mem_total_alloc_table += (line.maxsize+5) * elsize;
-
-
- if (!p)
- {
- MyError ("BASE_TABLE::Inc: Out of memory");
- return;
- }
memcpy (p, line.col, line.maxsize * elsize);
delete [] (char*)line.col;
+
line.col = p;
line.maxsize += 5;
}
@@ -115,64 +99,55 @@ namespace netgen
line.size++;
}
+
+
+ /*
void BASE_TABLE :: DecSize (int i)
{
- if (i < 1 || i > data.Size())
+#ifdef DEBUG
+ if (i < 0 || i >= data.Size())
{
MyError ("BASE_TABLE::Dec: Out of range");
return;
}
+#endif
+
+ linestruct & line = data[i];
- linestruct & line = data.Elem (i);
-
+#ifdef DEBUG
if (line.size == 0)
{
MyError ("BASE_TABLE::Dec: EntrySize < 0");
return;
}
+#endif
line.size--;
}
-
-
- /*
- void BASE_TABLE :: IncSizePrepare (int i)
- {
- data.Elem(i).maxsize++;
- }
*/
+
void BASE_TABLE :: AllocateElementsOneBlock (int elemsize)
{
- int i, cnt = 0;
+ int cnt = 0;
int n = data.Size();
- for (i = 1; i <= n; i++)
- cnt += data.Get(i).maxsize;
+ for (int i = 0; i < n; i++)
+ cnt += data[i].maxsize;
oneblock = new char[elemsize * cnt];
- // mem_total_alloc_table += elemsize * cnt;
-
- // cout << "Allocate oneblock, mem = " << (elemsize * cnt) << endl;
cnt = 0;
- for (i = 1; i <= n; i++)
+ for (int i = 0; i < n; i++)
{
- data.Elem(i).size = 0;
-
- data.Elem(i).col = &oneblock[elemsize * cnt];
- cnt += data.Elem(i).maxsize;
+ data[i].size = 0;
+ data[i].col = &oneblock[elemsize * cnt];
+ cnt += data[i].maxsize;
}
-
}
-
-
-
-
-
int BASE_TABLE :: AllocatedElements () const
{
int els = 0;
@@ -180,7 +155,7 @@ namespace netgen
els += data[i].maxsize;
return els;
}
-
+
int BASE_TABLE :: UsedElements () const
{
int els = 0;
diff --git a/Netgen/libsrc/general/table.hpp b/Netgen/libsrc/general/table.hpp
index 21c6d41a60..b986049b00 100644
--- a/Netgen/libsrc/general/table.hpp
+++ b/Netgen/libsrc/general/table.hpp
@@ -37,18 +37,19 @@ public:
~BASE_TABLE ();
///
void SetSize (int size);
- ///
+
+ /// increment size of entry i by one, i is 0-based
void IncSize (int i, int elsize)
{
- if (data.Elem(i).size < data.Elem(i).maxsize)
- data.Elem(i).size++;
+ if (data[i].size < data[i].maxsize)
+ data[i].size++;
else
IncSize2 (i, elsize);
}
///
void IncSize2 (int i, int elsize);
- void DecSize (int i);
+ // void DecSize (int i);
///
void AllocateElementsOneBlock (int elemsize);
@@ -92,29 +93,37 @@ public:
}
- /// Inserts element acont into row i, 1-based. Does not test if already used.
+ /// Inserts element acont into row i, BASE-based. Does not test if already used.
inline void Add (int i, const T & acont)
{
- IncSize (i-BASE+1, sizeof (T));
+ IncSize (i-BASE, sizeof (T));
((T*)data[i-BASE].col)[data[i-BASE].size-1] = acont;
}
- ///
- void IncSizePrepare (int i)
- {
- data[i-BASE].maxsize++;
- }
-
/// Inserts element acont into row i, 1-based. Does not test if already used.
inline void Add1 (int i, const T & acont)
{
- IncSize (i, sizeof (T));
+ IncSize (i-1, sizeof (T));
((T*)data.Elem(i).col)[data.Elem(i).size-1] = acont;
}
- /// Inserts element acont into row i. Does not test if already used, assumes to have mem
+ ///
+ void IncSizePrepare (int i)
+ {
+ data[i-BASE].maxsize++;
+ }
+
+
+ /// Inserts element acont into row i. BASE-based. Does not test if already used, assumes to have mem
inline void AddSave (int i, const T & acont)
+ {
+ ((T*)data[i-BASE].col)[data[i-BASE].size] = acont;
+ data[i-BASE].size++;
+ }
+
+ /// Inserts element acont into row i. 1-based. Does not test if already used, assumes to have mem
+ inline void AddSave1 (int i, const T & acont)
{
((T*)data.Elem(i).col)[data.Elem(i).size] = acont;
data.Elem(i).size++;
@@ -123,7 +132,7 @@ public:
/// Inserts element acont into row i. Does not test if already used.
inline void AddEmpty (int i)
{
- IncSize (i, sizeof (T));
+ IncSize (i-BASE, sizeof (T));
}
/** Set the nr-th element in the i-th row to acont.
@@ -153,9 +162,10 @@ public:
inline int EntrySize (int i) const
{ return data.Get(i).size; }
+ /*
inline void DecEntrySize (int i)
{ DecSize(i); }
-
+ */
void AllocateElementsOneBlock ()
{ BASE_TABLE::AllocateElementsOneBlock (sizeof(T)); }
diff --git a/Netgen/libsrc/general/template.hpp b/Netgen/libsrc/general/template.hpp
index 47c7a1ad2e..4bf983c06b 100644
--- a/Netgen/libsrc/general/template.hpp
+++ b/Netgen/libsrc/general/template.hpp
@@ -142,15 +142,28 @@ public:
{ return i[0] == in2.i[0] && i[1] == in2.i[1]; }
///
- void Sort ()
- {
- if (i[0] > i[1])
- {
- INDEX hi = i[0];
- i[0] = i[1];
- i[1] = hi;
- }
- }
+
+
+ INDEX_2 Sort ()
+ {
+ if (i[0] > i[1])
+ {
+ INDEX hi = i[0];
+ i[0] = i[1];
+ i[1] = hi;
+ }
+ return *this;
+ }
+
+ static INDEX_2 Sort (int i1, int i2)
+ {
+ if (i1 > i2)
+ return INDEX_2 (i2,i1);
+ else
+ return INDEX_2 (i1,i2);
+ }
+
+
///
INDEX & I1 () { return i[0]; }
///
@@ -189,12 +202,25 @@ public:
INDEX_3 (const INDEX_3 & in2)
{ i[0] = in2.i[0]; i[1] = in2.i[1]; i[2] = in2.i[2]; }
+
+ static INDEX_3 Sort (INDEX_3 i3)
+ {
+ return i3.Sort();
+ }
+
+ static INDEX_3 Sort (int i1, int i2, int i3)
+ {
+ INDEX_3 i(i1, i2, i3);
+ return i.Sort();
+ }
+
///
- void Sort ()
+ INDEX_3 Sort ()
{
if (i[0] > i[1]) Swap (i[0], i[1]);
if (i[1] > i[2]) Swap (i[1], i[2]);
if (i[0] > i[1]) Swap (i[0], i[1]);
+ return *this;
}
///
diff --git a/Netgen/libsrc/geom2d/genmesh2d.cpp b/Netgen/libsrc/geom2d/genmesh2d.cpp
index db31208940..34f93b66ee 100644
--- a/Netgen/libsrc/geom2d/genmesh2d.cpp
+++ b/Netgen/libsrc/geom2d/genmesh2d.cpp
@@ -22,6 +22,8 @@ namespace netgen
int i, j, domnr;
double elto0, minx, miny, maxx, maxy;
+ // mp.Print(*testout);
+
PointIndex pi;
SegmentIndex si;
SurfaceElementIndex sei;
@@ -43,13 +45,30 @@ namespace netgen
geometry.PartitionBoundary (h, *mesh);
+ for (i = 0; i < geometry.GetNP(); i++)
+ if (geometry.GetPoint(i).hpref)
+ {
+ double mindist = 1e99;
+ PointIndex mpi;
+ Point<2> gp = geometry.GetPoint(i);
+ Point<3> gp3(gp(0), gp(1), 0);
+ for (PointIndex pi = PointIndex::BASE;
+ pi < mesh->GetNP()+PointIndex::BASE; pi++)
+ if (Dist2(gp3, (*mesh)[pi]) < mindist)
+ {
+ mpi = pi;
+ mindist = Dist2(gp3, (*mesh)[pi]);
+ }
+ (*mesh)[mpi].SetSingular();
+ }
+
+
int maxdomnr = 0;
for (si = 0; si < mesh->GetNSeg(); si++)
{
if ( (*mesh)[si].domin > maxdomnr) maxdomnr = (*mesh)[si].domin;
if ( (*mesh)[si].domout > maxdomnr) maxdomnr = (*mesh)[si].domout;
}
-
mesh->ClearFaceDescriptors();
for (i = 1; i <= maxdomnr; i++)
@@ -111,10 +130,15 @@ namespace netgen
mp.optsteps2d = hsteps;
-
-
mesh->Compress();
mesh -> SetNextMajorTimeStamp();
+
+
+#ifdef OPENGL
+ extern void Render();
+ Render();
+#endif
+
}
diff --git a/Netgen/libsrc/geom2d/geom2dmesh.cpp b/Netgen/libsrc/geom2d/geom2dmesh.cpp
index 3ca3275d29..09664da239 100644
--- a/Netgen/libsrc/geom2d/geom2dmesh.cpp
+++ b/Netgen/libsrc/geom2d/geom2dmesh.cpp
@@ -7,90 +7,49 @@
namespace netgen
{
-Refinement2d :: Refinement2d (const SplineGeometry2d & ageometry)
- : Refinement(), geometry(ageometry)
-{
- ;
-}
-
-Refinement2d :: ~Refinement2d ()
-{
- ;
-}
+ Refinement2d :: Refinement2d (const SplineGeometry2d & ageometry)
+ : Refinement(), geometry(ageometry)
+ {
+ ;
+ }
+
+ Refinement2d :: ~Refinement2d ()
+ {
+ ;
+ }
+ void Refinement2d ::
+ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
+ int surfi,
+ const PointGeomInfo & gi1,
+ const PointGeomInfo & gi2,
+ Point3d & newp, PointGeomInfo & newgi)
+ {
+ newp = p1+secpoint*(p2-p1);
+ newgi.trignum = 1;
+ }
+
+
+
+ void Refinement2d ::
+ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
+ int surfi1, int surfi2,
+ const EdgePointGeomInfo & ap1,
+ const EdgePointGeomInfo & ap2,
+ Point3d & newp, EdgePointGeomInfo & newgi)
+ {
+ Point<2> p2d;
+
+ p2d = geometry.GetSplines().Get(ap1.edgenr) ->
+ GetPoint (((1-secpoint)*ap1.dist+secpoint*ap2.dist));
+
+ // (*testout) << "refine 2d line, ap1.dist, ap2.dist = " << ap1.dist << ", " << ap2.dist << endl;
+ // (*testout) << "p1, p2 = " << p1 << p2 << ", newp = " << p2d << endl;
-void Refinement2d ::
-PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
- int surfi,
- const PointGeomInfo & gi1,
- const PointGeomInfo & gi2,
- Point3d & newp, PointGeomInfo & newgi)
-{
- newp = p1+secpoint*(p2-p1);
- newgi.trignum = 1;
- /*
- if (surfi)
- {
- // (*testout) << "surfi1 = " << surfi << endl;
- // (*testout) << "np = " << newp << endl;
- geometry.GetSurface (surfi) -> Project (newp);
- newgi.trignum = 1;
- // (*testout) << "np2 = " << newp << endl;
- }
- */
-}
-
-
-
-void Refinement2d ::
-PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
- int surfi1, int surfi2,
- const EdgePointGeomInfo & ap1,
- const EdgePointGeomInfo & ap2,
- Point3d & newp, EdgePointGeomInfo & newgi)
-{
- Point<2> p2d;
-
- p2d = geometry.GetSplines().Get(ap1.edgenr) ->
- GetPoint (((1-secpoint)*ap1.dist+secpoint*ap2.dist));
-
-
-/*
-
- // test routine: general function on first edge
-
- double x = secpoint;
- if (ap1.edgenr == 1)
- p2d = Point<2>((1-secpoint),fabs(x-0.5) < 0.2 ? (1+cos((x-0.5)*M_PI/0.2))*0.1 : 0);
-
-*/
-
- // (*testout) << "refine 2d line, ap1.dist, ap2.dist = " << ap1.dist << ", " << ap2.dist << endl;
- // (*testout) << "p1, p2 = " << p1 << p2 << ", newp = " << p2d << endl;
-
- // newp = Center (p1, p2);
- newp = Point3d (p2d(0), p2d(1), 0);
- newgi.edgenr = ap1.edgenr;
- newgi.dist = ((1-secpoint)*ap1.dist+secpoint*ap2.dist);
-
- /*
- if (surfi1 && surfi2 && surfi1 != surfi2)
- {
- // (*testout) << "surfi1 = " << surfi1 << " surfi2 = " << surfi2 << endl;
- // (*testout) << "np = " << newp << endl;
- // geometry.GetSurface (surfi1) -> Project (newp);
- ProjectToEdge (geometry.GetSurface(surfi1),
- geometry.GetSurface(surfi2),
- newp);
- newgi.edgenr = 1;
- // (*testout) << "np2 = " << newp << endl;
- }
- else if (surfi1)
- {
- geometry.GetSurface (surfi1) -> Project (newp);
- }
- */
-};
+ newp = Point3d (p2d(0), p2d(1), 0);
+ newgi.edgenr = ap1.edgenr;
+ newgi.dist = ((1-secpoint)*ap1.dist+secpoint*ap2.dist);
+ };
}
diff --git a/Netgen/libsrc/geom2d/spline2d.cpp b/Netgen/libsrc/geom2d/spline2d.cpp
index 18c0362f41..8609e064d1 100644
--- a/Netgen/libsrc/geom2d/spline2d.cpp
+++ b/Netgen/libsrc/geom2d/spline2d.cpp
@@ -14,337 +14,382 @@ namespace netgen
#include "spline2d.hpp"
-void CalcPartition (double l, double h, double r1, double r2,
- double ra, double elto0, ARRAY<double> & points);
-
-
-
-// calculates length of spline-curve
-double SplineSegment :: Length () const
-{
- Point<2> p, pold;
-
- int i, n = 100;
- double dt = 1.0 / n;
-
- pold = GetPoint (0);
-
- double l = 0;
- for (i = 1; i <= n; i++)
- {
- p = GetPoint (i * dt);
- l += Dist (p, pold);
- pold = p;
- }
- return l;
-}
-
-
-
-// partitionizes spline curve
-void SplineSegment :: Partition (double h, double elto0,
- Mesh & mesh, int segnr) const
-{
- int i, j;
- double l, r1, r2, ra;
- double lold, dt, frac;
- int n = 100;
- Point<2> p, pold, mark, oldmark;
- ARRAY<double> curvepoints;
- double edgelength, edgelengthold;
- l = Length();
-
- r1 = StartPI().refatpoint;
- r2 = EndPI().refatpoint;
- ra = reffak;
-
- // cout << "Partition, l = " << l << ", h = " << h << endl;
- CalcPartition (l, h, r1, r2, ra, elto0, curvepoints);
- // cout << "curvepoints = " << curvepoints << endl;
-
- dt = 1.0 / n;
-
- l = 0;
- j = 1;
-
- pold = GetPoint (0);
- lold = 0;
- oldmark = pold;
- edgelengthold = 0;
-
- for (i = 1; i <= n; i++)
- {
- p = GetPoint (i*dt);
- l = lold + Dist (p, pold);
- while (j < curvepoints.Size() && (l >= curvepoints[j] || i == n))
- {
- frac = (curvepoints[j]-lold) / (l-lold);
- mark = pold + frac * (p-pold);
- edgelength = i*dt + (frac-1)*dt;
+ void CalcPartition (double l, double h, double r1, double r2,
+ double ra, double elto0, ARRAY<double> & points);
+
+
+
+ // calculates length of spline-curve
+ double SplineSegment :: Length () const
+ {
+ Point<2> p, pold;
+
+ int i, n = 100;
+ double dt = 1.0 / n;
+
+ pold = GetPoint (0);
+
+ double l = 0;
+ for (i = 1; i <= n; i++)
+ {
+ p = GetPoint (i * dt);
+ l += Dist (p, pold);
+ pold = p;
+ }
+ return l;
+ }
+
+
+
+ // partitionizes spline curve
+ void SplineSegment :: Partition (double h, double elto0,
+ Mesh & mesh, Point3dTree & searchtree, int segnr) const
+ {
+ int i, j;
+ double l, r1, r2, ra;
+ double lold, dt, frac;
+ int n = 100;
+ Point<2> p, pold, mark, oldmark;
+ ARRAY<double> curvepoints;
+ double edgelength, edgelengthold;
+ l = Length();
+
+ r1 = StartPI().refatpoint;
+ r2 = EndPI().refatpoint;
+ ra = reffak;
+
+ // cout << "Partition, l = " << l << ", h = " << h << endl;
+ CalcPartition (l, h, r1, r2, ra, elto0, curvepoints);
+ // cout << "curvepoints = " << curvepoints << endl;
+
+ dt = 1.0 / n;
+
+ l = 0;
+ j = 1;
+
+ pold = GetPoint (0);
+ lold = 0;
+ oldmark = pold;
+ edgelengthold = 0;
+ ARRAY<int> locsearch;
+
+ for (i = 1; i <= n; i++)
+ {
+ p = GetPoint (i*dt);
+ l = lold + Dist (p, pold);
+ while (j < curvepoints.Size() && (l >= curvepoints[j] || i == n))
{
- PointIndex pi1 = -1, pi2 = -1;
+ frac = (curvepoints[j]-lold) / (l-lold);
+ mark = pold + frac * (p-pold);
+ edgelength = i*dt + (frac-1)*dt;
+ {
+ PointIndex pi1 = -1, pi2 = -1;
- Point3d mark3(mark(0), mark(1), 0);
- Point3d oldmark3(oldmark(0), oldmark(1), 0);
+ Point3d mark3(mark(0), mark(1), 0);
+ Point3d oldmark3(oldmark(0), oldmark(1), 0);
+
+ Vec<3> v (1e-4*h, 1e-4*h, 1e-4*h);
+ searchtree.GetIntersecting (oldmark3 - v, oldmark3 + v, locsearch);
+ if (locsearch.Size()) pi1 = locsearch[0];
+
+ searchtree.GetIntersecting (mark3 - v, mark3 + v, locsearch);
+ if (locsearch.Size()) pi2 = locsearch[0];
+ /*
+ for (PointIndex pk = PointIndex::BASE;
+ pk < mesh.GetNP()+PointIndex::BASE; pk++)
+ {
+ if (Dist (mesh[pk], oldmark3) < 1e-4 * h) pi1 = pk;
+ if (Dist (mesh[pk], mark3) < 1e-4 * h) pi2 = pk;
+ }
+ */
- for (PointIndex pk = PointIndex::BASE;
- pk < mesh.GetNP()+PointIndex::BASE; pk++)
- {
- if (Dist (mesh[pk], oldmark3) < 1e-4 * h) pi1 = pk;
- if (Dist (mesh[pk], mark3) < 1e-4 * h) pi2 = pk;
- }
-
- // cout << "pi1 = " << pi1 << endl;
- // cout << "pi2 = " << pi2 << endl;
-
- if (pi1 == -1) pi1 = mesh.AddPoint(oldmark3);
- if (pi2 == -1) pi2 = mesh.AddPoint(mark3);
- // cout << "pi1 = " << pi1 << endl;
- // cout << "pi2 = " << pi2 << endl;
+ // cout << "pi1 = " << pi1 << endl;
+ // cout << "pi2 = " << pi2 << endl;
+
+ if (pi1 == -1)
+ {
+ pi1 = mesh.AddPoint(oldmark3);
+ searchtree.Insert (oldmark3, pi1);
+ }
+ if (pi2 == -1)
+ {
+ pi2 = mesh.AddPoint(mark3);
+ searchtree.Insert (mark3, pi2);
+ }
+
+ // cout << "pi1 = " << pi1 << endl;
+ // cout << "pi2 = " << pi2 << endl;
- Segment seg;
- seg.edgenr = segnr;
- seg.si = bc; // segnr;
- seg.p1 = pi1;
- seg.p2 = pi2;
- seg.domin = leftdom;
- seg.domout = rightdom;
- seg.epgeominfo[0].edgenr = segnr;
- seg.epgeominfo[0].dist = edgelengthold;
- seg.epgeominfo[1].edgenr = segnr;
- seg.epgeominfo[1].dist = edgelength;
-
- mesh.AddSegment (seg);
- }
+ Segment seg;
+ seg.edgenr = segnr;
+ seg.si = bc; // segnr;
+ seg.p1 = pi1;
+ seg.p2 = pi2;
+ seg.domin = leftdom;
+ seg.domout = rightdom;
+ seg.epgeominfo[0].edgenr = segnr;
+ seg.epgeominfo[0].dist = edgelengthold;
+ seg.epgeominfo[1].edgenr = segnr;
+ seg.epgeominfo[1].dist = edgelength;
+ seg.singedge_left = hpref_left;
+ seg.singedge_right = hpref_right;
+ mesh.AddSegment (seg);
+ }
- oldmark = mark;
- edgelengthold = edgelength;
- j++;
- }
+ oldmark = mark;
+ edgelengthold = edgelength;
+ j++;
+ }
- pold = p;
- lold = l;
- }
-}
+ pold = p;
+ lold = l;
+ }
+ }
-void SplineSegment :: GetPoints (int n, ARRAY<Point<2> > & points)
-{
- points.SetSize (n);
- if (n >= 2)
- for (int i = 0; i < n; i++)
- points[i] = GetPoint(double(i) / (n-1));
-}
+ void SplineSegment :: GetPoints (int n, ARRAY<Point<2> > & points)
+ {
+ points.SetSize (n);
+ if (n >= 2)
+ for (int i = 0; i < n; i++)
+ points[i] = GetPoint(double(i) / (n-1));
+ }
-/*
- Implementation of line-segment from p1 to p2
-*/
+ /*
+ Implementation of line-segment from p1 to p2
+ */
-LineSegment :: LineSegment (const GeomPoint2d & ap1,
- const GeomPoint2d & ap2)
- : p1(ap1), p2(ap2)
-{
- ;
-}
+ LineSegment :: LineSegment (const GeomPoint2d & ap1,
+ const GeomPoint2d & ap2)
+ : p1(ap1), p2(ap2)
+ {
+ ;
+ }
-Point<2> LineSegment :: GetPoint (double t) const
-{
- return p1 + t * (p2 - p1);
-}
+ Point<2> LineSegment :: GetPoint (double t) const
+ {
+ return p1 + t * (p2 - p1);
+ }
-double LineSegment :: Length () const
-{
- return Dist (p1, p2);
-}
+ double LineSegment :: Length () const
+ {
+ return Dist (p1, p2);
+ }
-void LineSegment :: PrintCoeff (ostream & ost) const
-{
- double dx = p2(0) - p1(0);
- double dy = p2(1) - p1(1);
- ost << "0 0 0 " << dy << " " << -dx << " "
- << dx * p1(1) - dy * p1(0) << endl;
-}
+ void LineSegment :: PrintCoeff (ostream & ost) const
+ {
+ double dx = p2(0) - p1(0);
+ double dy = p2(1) - p1(1);
+ ost << "0 0 0 " << dy << " " << -dx << " "
+ << dx * p1(1) - dy * p1(0) << endl;
+ }
-SplineSegment3 :: SplineSegment3 (const GeomPoint2d & ap1,
- const GeomPoint2d & ap2,
- const GeomPoint2d & ap3)
- : p1(ap1), p2(ap2), p3(ap3)
-{
- ;
-}
+ SplineSegment3 :: SplineSegment3 (const GeomPoint2d & ap1,
+ const GeomPoint2d & ap2,
+ const GeomPoint2d & ap3)
+ : p1(ap1), p2(ap2), p3(ap3)
+ {
+ ;
+ }
-Point<2> SplineSegment3 :: GetPoint (double t) const
-{
- double x, y, w;
- double b1, b2, b3;
+ Point<2> SplineSegment3 :: GetPoint (double t) const
+ {
+ double x, y, w;
+ double b1, b2, b3;
- b1 = (1-t)*(1-t);
- b2 = sqrt(2.0) * t * (1-t);
- b3 = t * t;
+ b1 = (1-t)*(1-t);
+ b2 = sqrt(2.0) * t * (1-t);
+ b3 = t * t;
- x = p1(0) * b1 + p2(0) * b2 + p3(0) * b3;
- y = p1(1) * b1 + p2(1) * b2 + p3(1) * b3;
- w = b1 + b2 + b3;
+ x = p1(0) * b1 + p2(0) * b2 + p3(0) * b3;
+ y = p1(1) * b1 + p2(1) * b2 + p3(1) * b3;
+ w = b1 + b2 + b3;
- return Point<2> (x/w, y/w);
-}
+ return Point<2> (x/w, y/w);
+ }
-void SplineSegment3 :: PrintCoeff (ostream & ost) const
-{
- double t;
- int i;
- Point<2> p;
- DenseMatrix a(6, 6);
- DenseMatrix ata(6, 6);
- Vector u(6), f(6);
-
- // ata.SetSymmetric(1);
-
- t = 0;
- for (i = 1; i <= 5; i++, t += 0.25)
- {
- p = GetPoint (t);
- a.Elem(i, 1) = p(0) * p(0);
- a.Elem(i, 2) = p(1) * p(1);
- a.Elem(i, 3) = p(0) * p(1);
- a.Elem(i, 4) = p(0);
- a.Elem(i, 5) = p(1);
- a.Elem(i, 6) = 1;
- }
- a.Elem(6, 1) = 1;
-
- CalcAtA (a, ata);
-
- u = 0;
- u.Elem(6) = 1;
- a.MultTrans (u, f);
- ata.Solve (f, u);
+ void SplineSegment3 :: PrintCoeff (ostream & ost) const
+ {
+ double t;
+ int i;
+ Point<2> p;
+ DenseMatrix a(6, 6);
+ DenseMatrix ata(6, 6);
+ Vector u(6), f(6);
+
+ // ata.SetSymmetric(1);
+
+ t = 0;
+ for (i = 1; i <= 5; i++, t += 0.25)
+ {
+ p = GetPoint (t);
+ a.Elem(i, 1) = p(0) * p(0);
+ a.Elem(i, 2) = p(1) * p(1);
+ a.Elem(i, 3) = p(0) * p(1);
+ a.Elem(i, 4) = p(0);
+ a.Elem(i, 5) = p(1);
+ a.Elem(i, 6) = 1;
+ }
+ a.Elem(6, 1) = 1;
+
+ CalcAtA (a, ata);
+
+ u = 0;
+ u.Elem(6) = 1;
+ a.MultTrans (u, f);
+ ata.Solve (f, u);
- for (i = 1; i <= 6; i++)
- ost << u.Get(i) << " ";
- ost << endl;
-}
+ for (i = 1; i <= 6; i++)
+ ost << u.Get(i) << " ";
+ ost << endl;
+ }
-//########################################################################
-// circlesegment
+ //########################################################################
+ // circlesegment
-CircleSegment :: CircleSegment (const GeomPoint2d & ap1,
- const GeomPoint2d & ap2,
- const GeomPoint2d & ap3)
- : p1(ap1), p2(ap2), p3(ap3)
-{
- Vec<2> v1,v2;
+ CircleSegment :: CircleSegment (const GeomPoint2d & ap1,
+ const GeomPoint2d & ap2,
+ const GeomPoint2d & ap3)
+ : p1(ap1), p2(ap2), p3(ap3)
+ {
+ Vec<2> v1,v2;
- v1 = p1 - p2;
- v2 = p3 - p2;
+ v1 = p1 - p2;
+ v2 = p3 - p2;
- Point<2> p1t(p1(0)+v1[1], p1(1)-v1[0]);
- Point<2> p2t(p3(0)+v2[1], p3(1)-v2[0]);
- Line2d g1t(p1, p1t), g2t(p3, p2t);
+ Point<2> p1t(p1(0)+v1[1], p1(1)-v1[0]);
+ Point<2> p2t(p3(0)+v2[1], p3(1)-v2[0]);
+ Line2d g1t(p1, p1t), g2t(p3, p2t);
- pm = CrossPoint (g1t,g2t);
- radius = Dist(pm,StartPI());
- w1 = Angle(Vec2d (p1 - pm));
- w3 = Angle(Vec2d (p3 - pm));
- if ( fabs(w3-w1) > M_PI )
- {
- if ( w3>M_PI ) w3 -= 2*M_PI;
- if ( w1>M_PI ) w1 -= 2*M_PI;
- }
-}
+ pm = CrossPoint (g1t,g2t);
+ radius = Dist(pm,StartPI());
+ w1 = Angle(Vec2d (p1 - pm));
+ w3 = Angle(Vec2d (p3 - pm));
+ if ( fabs(w3-w1) > M_PI )
+ {
+ if ( w3>M_PI ) w3 -= 2*M_PI;
+ if ( w1>M_PI ) w1 -= 2*M_PI;
+ }
+ }
-Point<2> CircleSegment :: GetPoint (double t) const
-{
- if (t >= 1.0) { return p3; }
+ Point<2> CircleSegment :: GetPoint (double t) const
+ {
+ if (t >= 1.0) { return p3; }
- double phi = StartAngle() + t*(EndAngle()-StartAngle());
- Vec2d tmp(cos(phi),sin(phi));
+ double phi = StartAngle() + t*(EndAngle()-StartAngle());
+ Vec2d tmp(cos(phi),sin(phi));
- return pm + Radius()*tmp;
-}
+ return pm + Radius()*tmp;
+ }
-void CircleSegment :: PrintCoeff (ostream & ost) const
-{
- double a,b,c,d,e,f;
+ void CircleSegment :: PrintCoeff (ostream & ost) const
+ {
+ double a,b,c,d,e,f;
- a = b = 1.0;
- c = 0.0;
- d = -2.0 * pm[0];
- e = -2.0 * pm[1];
- f = sqr(pm[0]) + sqr(pm[1]) - sqr(Radius());
+ a = b = 1.0;
+ c = 0.0;
+ d = -2.0 * pm[0];
+ e = -2.0 * pm[1];
+ f = sqr(pm[0]) + sqr(pm[1]) - sqr(Radius());
- ost << a << " " << b << " " << c << " " << d << " " << e << " " << f ;
- ost << endl;
-}
+ ost << a << " " << b << " " << c << " " << d << " " << e << " " << f ;
+ ost << endl;
+ }
+ DiscretePointsSegment :: DiscretePointsSegment (const ARRAY<Point<2> > & apts)
+ : pts (apts),
+ p1 (apts[0](0), apts[0](1), 1),
+ p2 (apts.Last()(0), apts.Last()(1), 1)
+ { ; }
-//########################################################################
+ DiscretePointsSegment :: ~DiscretePointsSegment ()
+ { ; }
+ Point<2> DiscretePointsSegment :: GetPoint (double t) const
+ {
+ double t1 = t * (pts.Size()-1);
+ int segnr = int(t1);
+ if (segnr < 0) segnr = 0;
+ if (segnr >= pts.Size()) segnr = pts.Size()-1;
+ double rest = t1 - segnr;
+
+ return Point<2> ((1-rest)*pts[segnr](0) + rest*pts[segnr+1](0),
+ (1-rest)*pts[segnr](1) + rest*pts[segnr+1](1));
+ }
+
-void CalcPartition (double l, double h, double r1, double r2,
- double ra, double elto0, ARRAY<double> & points)
-{
- int i, j, n, nel;
- double sum, t, dt, fun, fperel, oldf, f;
-
- n = 1000;
-
- points.SetSize (0);
-
- sum = 0;
- dt = l / n;
- t = 0.5 * dt;
- for (i = 1; i <= n; i++)
- {
- fun = min3 (h/ra, t/elto0 + h/r1, (l-t)/elto0 + h/r2);
- sum += dt / fun;
- t += dt;
- }
-
- nel = int (sum+1);
- fperel = sum / nel;
-
- points.Append (0);
-
- i = 1;
- oldf = 0;
- t = 0.5 * dt;
- for (j = 1; j <= n && i < nel; j++)
- {
- fun = min3 (h/ra, t/elto0 + h/r1, (l-t)/elto0 + h/r2);
-
- f = oldf + dt / fun;
-
- while (f > i * fperel && i < nel)
- {
- points.Append ( (l/n) * (j-1 + (i * fperel - oldf) / (f - oldf)) );
- i++;
- }
- oldf = f;
- t += dt;
- }
- points.Append (l);
-}
+
+
+
+ //########################################################################
+
+
+
+
+ void CalcPartition (double l, double h, double r1, double r2,
+ double ra, double elto0, ARRAY<double> & points)
+ {
+ int i, j, n, nel;
+ double sum, t, dt, fun, fperel, oldf, f;
+
+ n = 1000;
+
+ points.SetSize (0);
+
+ sum = 0;
+ dt = l / n;
+ t = 0.5 * dt;
+ for (i = 1; i <= n; i++)
+ {
+ fun = min3 (h/ra, t/elto0 + h/r1, (l-t)/elto0 + h/r2);
+ sum += dt / fun;
+ t += dt;
+ }
+
+ nel = int (sum+1);
+ fperel = sum / nel;
+
+ points.Append (0);
+
+ i = 1;
+ oldf = 0;
+ t = 0.5 * dt;
+ for (j = 1; j <= n && i < nel; j++)
+ {
+ fun = min3 (h/ra, t/elto0 + h/r1, (l-t)/elto0 + h/r2);
+
+ f = oldf + dt / fun;
+
+ while (f > i * fperel && i < nel)
+ {
+ points.Append ( (l/n) * (j-1 + (i * fperel - oldf) / (f - oldf)) );
+ i++;
+ }
+ oldf = f;
+ t += dt;
+ }
+ points.Append (l);
+ }
}
diff --git a/Netgen/libsrc/geom2d/spline2d.hpp b/Netgen/libsrc/geom2d/spline2d.hpp
index bdd33d736b..f107a137f1 100644
--- a/Netgen/libsrc/geom2d/spline2d.hpp
+++ b/Netgen/libsrc/geom2d/spline2d.hpp
@@ -19,6 +19,7 @@ class GeomPoint2d : public Point<2>
public:
/// refinement to point
double refatpoint;
+ bool hpref;
GeomPoint2d ()
{ ; }
@@ -44,14 +45,16 @@ public:
int bc;
/// copy spline mesh from other spline (-1.. do not copy)
int copyfrom;
-
+ /// perfrom anisotropic refinement (hp-refinement) to edge
+ bool hpref_left;
+ bool hpref_right;
/// calculates length of curve
virtual double Length () const;
/// returns point at curve, 0 <= t <= 1
virtual Point<2> GetPoint (double t) const = 0;
/// partitionizes curve
void Partition (double h, double elto0,
- Mesh & mesh, int segnr) const;
+ Mesh & mesh, Point3dTree & searchtree, int segnr) const;
/// returns initial point on curve
virtual const GeomPoint2d & StartPI () const = 0;
/// returns terminal point on curve
@@ -64,6 +67,8 @@ public:
virtual void PrintCoeff (ostream & ost) const = 0;
virtual void GetPoints (int n, ARRAY<Point<2> > & points);
+
+ virtual string GetType(void) const {return "splinebase";}
};
@@ -85,6 +90,8 @@ public:
virtual const GeomPoint2d & EndPI () const { return p2; }
///
virtual void PrintCoeff (ostream & ost) const;
+
+ virtual string GetType(void) const {return "line";}
};
@@ -106,6 +113,8 @@ public:
virtual const GeomPoint2d & EndPI () const { return p3; }
///
virtual void PrintCoeff (ostream & ost) const;
+
+ virtual string GetType(void) const {return "spline3";}
};
@@ -137,6 +146,8 @@ public:
double StartAngle() const { return w1; }
///
double EndAngle() const { return w3; }
+
+ virtual string GetType(void) const {return "circle";}
};
@@ -164,4 +175,30 @@ public:
+
+
+///
+class DiscretePointsSegment : public SplineSegment
+{
+ ARRAY<Point<2> > pts;
+ GeomPoint2d p1, p2;
+public:
+ ///
+ DiscretePointsSegment (const ARRAY<Point<2> > & apts);
+ ///
+ virtual ~DiscretePointsSegment ();
+ ///
+ virtual Point<2> GetPoint (double t) const;
+ ///
+ virtual const GeomPoint2d & StartPI () const { return p1; };
+ ///
+ virtual const GeomPoint2d & EndPI () const { return p2; }
+ ///
+ virtual void PrintCoeff (ostream & /* ost */) const { ; }
+};
+
+
+
+
+
#endif
diff --git a/Netgen/libsrc/geom2d/splinegeometry2.cpp b/Netgen/libsrc/geom2d/splinegeometry2.cpp
index 921e22a295..a034d53989 100644
--- a/Netgen/libsrc/geom2d/splinegeometry2.cpp
+++ b/Netgen/libsrc/geom2d/splinegeometry2.cpp
@@ -19,62 +19,107 @@ namespace netgen
-
+SplineGeometry2d :: ~SplineGeometry2d()
+{
+ for(int i=0; i<splines.Size(); i++)
+ {
+ delete splines[i];
+ }
+ splines.DeleteAll();
+ geompoints.DeleteAll();
+}
void SplineGeometry2d :: Load (const char * filename)
{
ifstream infile;
- int nump, numseg, nelp, i, leftdom, rightdom;
+ int nump, numseg, leftdom, rightdom;
double x, y;
int hi1, hi2, hi3;
double hd;
- char reco[50], ch;
+ char buf[50], ch;
infile.open (filename);
- infile >> reco;
+ if (! infile.good() )
+ throw NgException(string ("2D Input file '") +
+ string (filename) +
+ string ("' not available!"));
+
+ infile >> buf; // file recognition
infile >> elto0;
infile >> nump;
- for (i = 0; i < nump; i++)
+ for (int i = 0; i < nump; i++)
{
infile >> x >> y >> hd;
+
+ Flags flags;
+
+ ch = 'a';
+ // infile >> ch;
+ do {
+ infile.get (ch);
+ } while (isspace(ch) && ch != '\n');
+ while (ch == '-')
+ {
+ char flag[100];
+ flag[0]='-';
+ infile >> (flag+1);
+ flags.SetCommandLineFlag (flag);
+ ch = 'a';
+ do {
+ infile.get (ch);
+ } while (isspace(ch) && ch != '\n');
+ }
+
+ if (infile.good())
+ infile.putback (ch);
+
geompoints.Append (GeomPoint2d(x, y, hd));
+ geompoints.Last().hpref = flags.GetDefineFlag ("hpref");
}
infile >> numseg;
-
SplineSegment * spline = 0;
- for (i = 0; i < numseg; i++)
+ for (int i = 0; i < numseg; i++)
{
infile >> leftdom >> rightdom;
- infile >> nelp;
- switch (nelp)
- { // type of spline segement
- case 2:
- { // a line
- infile >> hi1 >> hi2;
- spline = new LineSegment(geompoints[hi1-1],
- geompoints[hi2-1]);
- break;
- }
- case 3:
- { // a rational spline
- infile >> hi1 >> hi2 >> hi3;
- spline = new SplineSegment3 (geompoints[hi1-1],
- geompoints[hi2-1],
- geompoints[hi3-1]);
- break;
- }
- case 4:
- { // an arc
- infile >> hi1 >> hi2 >> hi3;
- splines.Append (new CircleSegment (geompoints[hi1-1],
- geompoints[hi2-1],
- geompoints[hi3-1]));
- break;
- }
+ // cout << "add spline " << i << ", left = " << leftdom << endl;
+
+ infile >> buf;
+ // type of spline segement
+ if (strcmp (buf, "2") == 0)
+ { // a line
+ infile >> hi1 >> hi2;
+ spline = new LineSegment(geompoints[hi1-1],
+ geompoints[hi2-1]);
+ }
+ else if (strcmp (buf, "3") == 0)
+ { // a rational spline
+ infile >> hi1 >> hi2 >> hi3;
+ spline = new SplineSegment3 (geompoints[hi1-1],
+ geompoints[hi2-1],
+ geompoints[hi3-1]);
+ }
+ else if (strcmp (buf, "4") == 0)
+ { // an arc
+ infile >> hi1 >> hi2 >> hi3;
+ spline = new CircleSegment (geompoints[hi1-1],
+ geompoints[hi2-1],
+ geompoints[hi3-1]);
+ break;
+ }
+ else if (strcmp (buf, "discretepoints") == 0)
+ {
+ int npts;
+ infile >> npts;
+ ARRAY<Point<2> > pts(npts);
+ for (int j = 0; j < npts; j++)
+ infile >> pts[j](0) >> pts[j](1);
+
+ spline = new DiscretePointsSegment (pts);
+ cout << "pts = " << pts << endl;
}
infile >> spline->reffak;
@@ -82,7 +127,6 @@ void SplineGeometry2d :: Load (const char * filename)
spline -> rightdom = rightdom;
splines.Append (spline);
-
Flags flags;
ch = 'a';
@@ -101,13 +145,15 @@ void SplineGeometry2d :: Load (const char * filename)
infile.putback (ch);
splines.Last()->bc = int (flags.GetNumFlag ("bc", i+1));
+ splines.Last()->hpref_left = int (flags.GetDefineFlag ("hpref")) ||
+ int (flags.GetDefineFlag ("hprefleft"));
+ splines.Last()->hpref_right = int (flags.GetDefineFlag ("hpref")) ||
+ int (flags.GetDefineFlag ("hprefright"));
splines.Last()->copyfrom = int (flags.GetNumFlag ("copy", -1));
}
- Box<2> bbox;
- GetBoundingBox (bbox);
- // cout << "bbox = " << bbox << endl;
+ infile.close();
}
@@ -115,20 +161,29 @@ void SplineGeometry2d :: Load (const char * filename)
void SplineGeometry2d ::
PartitionBoundary (double h, Mesh & mesh2d)
{
+ Box<2> bbox;
+ GetBoundingBox (bbox);
+ double dist = Dist (bbox.PMin(), bbox.PMax());
+ Point<3> pmin(bbox.PMin()(0), bbox.PMin()(1), -dist);
+ Point<3> pmax(bbox.PMax()(0), bbox.PMax()(1), dist);
+
+ cout << "searchtree from " << pmin << " to " << pmax << endl;
+ Point3dTree searchtree (pmin, pmax);
+
for (int i = 0; i < splines.Size(); i++)
if (splines[i]->copyfrom == -1)
- splines[i]->Partition(h, elto0, mesh2d, i+1);
+ splines[i]->Partition(h, elto0, mesh2d, searchtree, i+1);
else
- CopyEdgeMesh (splines[i]->copyfrom, i+1, mesh2d);
+ CopyEdgeMesh (splines[i]->copyfrom, i+1, mesh2d, searchtree);
}
-void SplineGeometry2d :: CopyEdgeMesh (int from, int to, Mesh & mesh)
+void SplineGeometry2d :: CopyEdgeMesh (int from, int to, Mesh & mesh, Point3dTree & searchtree)
{
int i, j, k;
- ARRAY<int> mappoints (mesh.GetNP());
- ARRAY<double> param (mesh.GetNP());
+ ARRAY<int, PointIndex::BASE> mappoints (mesh.GetNP());
+ ARRAY<double, PointIndex::BASE> param (mesh.GetNP());
mappoints = -1;
param = 0;
@@ -168,8 +223,9 @@ void SplineGeometry2d :: CopyEdgeMesh (int from, int to, Mesh & mesh)
if (npi == -1)
{
npi = mesh.AddPoint (newp3);
+ searchtree.Insert (newp3, npi);
}
-
+
mappoints.Elem(i) = npi;
mesh.GetIdentifications().Add (i, npi, to);
@@ -221,4 +277,70 @@ GetBoundingBox (Box<2> & box) const
}
}
+void SplineGeometry2d ::
+SetGrading (const double grading)
+{ elto0 = grading;}
+
+void SplineGeometry2d ::
+AppendPoint (const double x, const double y, const double reffac, const bool hpref)
+{
+ geompoints.Append (GeomPoint2d(x, y, reffac));
+ geompoints.Last().hpref = hpref;
+}
+
+
+void SplineGeometry2d ::
+AppendSegment(SplineSegment * spline, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom)
+{
+ spline -> leftdom = leftdomain;
+ spline -> rightdom = rightdomain;
+ spline -> bc = (bc >= 0) ? bc : (splines.Size()+1);
+ spline -> reffak = reffac;
+ spline -> hpref_left = hprefleft;
+ spline -> hpref_right = hprefright;
+ spline -> copyfrom = copyfrom;
+
+ splines.Append(spline);
+}
+
+void SplineGeometry2d ::
+AppendLineSegment (const int n1, const int n2, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom)
+{
+ SplineSegment * spline = new LineSegment(geompoints[n1],geompoints[n2]);
+ AppendSegment(spline,leftdomain,rightdomain,bc,reffac,hprefleft,hprefright,copyfrom);
+}
+void SplineGeometry2d ::
+AppendSplineSegment (const int n1, const int n2, const int n3, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom)
+{
+ SplineSegment * spline = new SplineSegment3(geompoints[n1],geompoints[n2],geompoints[n3]);
+ AppendSegment(spline,leftdomain,rightdomain,bc,reffac,hprefleft,hprefright,copyfrom);
+}
+void SplineGeometry2d ::
+AppendCircleSegment (const int n1, const int n2, const int n3, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom)
+{
+ SplineSegment * spline = new CircleSegment(geompoints[n1],geompoints[n2],geompoints[n3]);
+ AppendSegment(spline,leftdomain,rightdomain,bc,reffac,hprefleft,hprefright,copyfrom);
+}
+void SplineGeometry2d ::
+AppendDiscretePointsSegment (const ARRAY< Point<2> > & points, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom)
+{
+ SplineSegment * spline = new DiscretePointsSegment(points);
+ AppendSegment(spline,leftdomain,rightdomain,bc,reffac,hprefleft,hprefright,copyfrom);
+}
+
}
diff --git a/Netgen/libsrc/geom2d/splinegeometry2.hpp b/Netgen/libsrc/geom2d/splinegeometry2.hpp
index 38de574b24..66c2a4d79f 100644
--- a/Netgen/libsrc/geom2d/splinegeometry2.hpp
+++ b/Netgen/libsrc/geom2d/splinegeometry2.hpp
@@ -19,25 +19,65 @@ extern void PartitionBoundary (const ARRAY<SplineSegment*> & splines,
double h, double elto0,
Mesh & mesh2d);
-
class SplineGeometry2d
{
ARRAY<GeomPoint2d> geompoints;
ARRAY<SplineSegment*> splines;
double elto0;
+
+private:
+ void AppendSegment(SplineSegment * spline, const int leftdomain, const int rightdomain,
+ const int bc,
+ const double reffac, const bool hprefleft, const bool hprefright,
+ const int copyfrom);
+
public:
+ ~SplineGeometry2d();
+
void Load (const char * filename);
void PartitionBoundary (double h, Mesh & mesh2d);
- void CopyEdgeMesh (int from, int to, Mesh & mesh2d);
+ void CopyEdgeMesh (int from, int to, Mesh & mesh2d, Point3dTree & searchtree);
const ARRAY<SplineSegment*> & GetSplines () const
{ return splines; }
void GetBoundingBox (Box<2> & box) const;
+
+ int GetNP () const { return geompoints.Size(); }
+ const GeomPoint2d & GetPoint(int i) const { return geompoints[i]; }
+
+ void SetGrading (const double grading);
+ void AppendPoint (const double x, const double y, const double reffac = 1., const bool hpref = false);
+
+ void AppendLineSegment (const int n1, const int n2,
+ const int leftdomain, const int rightdomain, const int bc = -1,
+ const double reffac = 1.,
+ const bool hprefleft = false, const bool hprefright = false,
+ const int copyfrom = -1);
+ void AppendSplineSegment (const int n1, const int n2, const int n3,
+ const int leftdomain, const int rightdomain, const int bc = -1,
+ const double reffac = 1.,
+ const bool hprefleft = false, const bool hprefright = false,
+ const int copyfrom = -1);
+ void AppendCircleSegment (const int n1, const int n2, const int n3,
+ const int leftdomain, const int rightdomain, const int bc = -1,
+ const double reffac = 1.,
+ const bool hprefleft = false, const bool hprefright = false,
+ const int copyfrom = -1);
+ void AppendDiscretePointsSegment (const ARRAY< Point<2> > & points,
+ const int leftdomain, const int rightdomain, const int bc = -1,
+ const double reffac = 1.,
+ const bool hprefleft = false, const bool hprefright = false,
+ const int copyfrom = -1);
+
};
+void MeshFromSpline2D (SplineGeometry2d & geometry,
+ Mesh *& mesh,
+ MeshingParameters & mp);
+
#endif
diff --git a/Netgen/libsrc/gprim/adtree.cpp b/Netgen/libsrc/gprim/adtree.cpp
index b3e3f13795..25f46183e2 100644
--- a/Netgen/libsrc/gprim/adtree.cpp
+++ b/Netgen/libsrc/gprim/adtree.cpp
@@ -9,478 +9,461 @@ namespace netgen
{
-/* ******************************* ADTree ******************************* */
-
-
-ADTreeNode :: ADTreeNode(int adim)
-{
- pi = 0;
-
- left = NULL;
- right = NULL;
- father = NULL;
- nchilds = 0;
- dim = adim;
- data = new float [dim];
- boxmin = NULL;
- boxmax = NULL;
-}
-
-
-
-
-ADTreeNode :: ~ADTreeNode()
-{
- delete data;
-}
-
-
-ADTree :: ADTree (int adim, const float * acmin,
- const float * acmax)
- : ela(0), stack(1000), stackdir(1000)
-{
- dim = adim;
- cmin = new float [dim];
- cmax = new float [dim];
- memcpy (cmin, acmin, dim * sizeof(float));
- memcpy (cmax, acmax, dim * sizeof(float));
-
- root = new ADTreeNode (dim);
- root->sep = (cmin[0] + cmax[0]) / 2;
- root->boxmin = new float [dim];
- root->boxmax = new float [dim];
- memcpy (root->boxmin, cmin, dim * sizeof(float));
- memcpy (root->boxmax, cmax, dim * sizeof(float));
-}
-
-ADTree :: ~ADTree ()
-{
- ;
-}
-
-void ADTree :: Insert (const float * p, int pi)
-{
- ADTreeNode *node;
- ADTreeNode *next;
- int dir;
- int lr;
-
- float * bmin = new float [dim];
- float * bmax = new float [dim];
+ /* ******************************* ADTree ******************************* */
+
+
+ ADTreeNode :: ADTreeNode(int adim)
+ {
+ pi = -1;
+
+ left = NULL;
+ right = NULL;
+ father = NULL;
+ nchilds = 0;
+ dim = adim;
+ data = new float [dim];
+ boxmin = NULL;
+ boxmax = NULL;
+ }
+
+
+
+
+ ADTreeNode :: ~ADTreeNode()
+ {
+ delete data;
+ }
+
+
+ ADTree :: ADTree (int adim, const float * acmin,
+ const float * acmax)
+ : ela(0), stack(1000), stackdir(1000)
+ {
+ dim = adim;
+ cmin = new float [dim];
+ cmax = new float [dim];
+ memcpy (cmin, acmin, dim * sizeof(float));
+ memcpy (cmax, acmax, dim * sizeof(float));
+
+ root = new ADTreeNode (dim);
+ root->sep = (cmin[0] + cmax[0]) / 2;
+ root->boxmin = new float [dim];
+ root->boxmax = new float [dim];
+ memcpy (root->boxmin, cmin, dim * sizeof(float));
+ memcpy (root->boxmax, cmax, dim * sizeof(float));
+ }
+
+ ADTree :: ~ADTree ()
+ {
+ ;
+ }
+
+ void ADTree :: Insert (const float * p, int pi)
+ {
+ ADTreeNode *node;
+ ADTreeNode *next;
+ int dir;
+ int lr;
+
+ float * bmin = new float [dim];
+ float * bmax = new float [dim];
- memcpy (bmin, cmin, dim * sizeof(float));
- memcpy (bmax, cmax, dim * sizeof(float));
+ memcpy (bmin, cmin, dim * sizeof(float));
+ memcpy (bmax, cmax, dim * sizeof(float));
-#ifdef MARK
- MARK (insertloop3)
-#endif
-
- next = root;
- dir = 0;
- while (next)
- {
- node = next;
- if (!node->pi)
- {
- memcpy (node->data, p, dim * sizeof(float));
- node->pi = pi;
-
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ next = root;
+ dir = 0;
+ while (next)
+ {
+ node = next;
- return;
- }
+ if (node->pi == -1)
+ {
+ memcpy (node->data, p, dim * sizeof(float));
+ node->pi = pi;
- if (node->sep > p[dir])
- {
- next = node->left;
- bmax[dir] = node->sep;
- lr = 0;
- }
- else
- {
- next = node->right;
- bmin[dir] = node->sep;
- lr = 1;
- }
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = node;
- dir++;
- if (dir == dim)
- dir = 0;
- }
+ return;
+ }
-#ifdef MARK
- MARK (insertend3)
-#endif
+ if (node->sep > p[dir])
+ {
+ next = node->left;
+ bmax[dir] = node->sep;
+ lr = 0;
+ }
+ else
+ {
+ next = node->right;
+ bmin[dir] = node->sep;
+ lr = 1;
+ }
+ dir++;
+ if (dir == dim)
+ dir = 0;
+ }
- next = new ADTreeNode(dim);
- memcpy (next->data, p, dim * sizeof(float));
- next->pi = pi;
- next->sep = (bmin[dir] + bmax[dir]) / 2;
- next->boxmin = bmin;
- next->boxmax = bmax;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ next = new ADTreeNode(dim);
+ memcpy (next->data, p, dim * sizeof(float));
+ next->pi = pi;
+ next->sep = (bmin[dir] + bmax[dir]) / 2;
+ next->boxmin = bmin;
+ next->boxmax = bmax;
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = next;
- if (lr)
- node->right = next;
- else
- node->left = next;
- next -> father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ if (lr)
+ node->right = next;
+ else
+ node->left = next;
+ next -> father = node;
-void ADTree :: DeleteElement (int pi)
-{
- ADTreeNode * node = ela.Get(pi);
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
- node->pi = 0;
+ void ADTree :: DeleteElement (int pi)
+ {
+ ADTreeNode * node = ela[pi];
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node->pi = -1;
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree :: SetCriterion (ADTreeCriterion & acriterion)
-{
- criterion = & acriterion;
-}
+ void ADTree :: SetCriterion (ADTreeCriterion & acriterion)
+ {
+ criterion = & acriterion;
+ }
-void ADTree :: Reset ()
-{
- stack.Elem(1) = root;
- stackdir.Elem(1) = 0;
- stackindex = 1;
-}
+ void ADTree :: Reset ()
+ {
+ stack.Elem(1) = root;
+ stackdir.Elem(1) = 0;
+ stackindex = 1;
+ }
-int ADTree:: Next ()
-{
- ADTreeNode *node;
- int dir;
- if (stackindex == 0)
- return 0;
+ int ADTree:: Next ()
+ {
+ ADTreeNode *node;
+ int dir;
- do
- {
- node = stack.Get(stackindex);
- dir = stackdir.Get(stackindex);
- stackindex --;
+ if (stackindex == 0)
+ return -1;
- if (criterion -> Eval(node))
- {
- int ndir = dir + 1;
- if (ndir == dim)
- ndir = 0;
+ do
+ {
+ node = stack.Get(stackindex);
+ dir = stackdir.Get(stackindex);
+ stackindex --;
- if (node -> left && criterion -> Eval (node->left))
- {
- stackindex ++;
- stack.Elem(stackindex) = node -> left;
- stackdir.Elem(stackindex) = ndir;
- }
- if (node->right && criterion -> Eval (node -> right))
- {
- stackindex++;
- stack.Elem(stackindex) = node->right;
- stackdir.Elem(stackindex) = ndir;
- }
+ if (criterion -> Eval(node))
+ {
+ int ndir = dir + 1;
+ if (ndir == dim)
+ ndir = 0;
+
+ if (node -> left && criterion -> Eval (node->left))
+ {
+ stackindex ++;
+ stack.Elem(stackindex) = node -> left;
+ stackdir.Elem(stackindex) = ndir;
+ }
+ if (node->right && criterion -> Eval (node -> right))
+ {
+ stackindex++;
+ stack.Elem(stackindex) = node->right;
+ stackdir.Elem(stackindex) = ndir;
+ }
- if (node -> pi)
- return node->pi;
- }
- }
- while (stackindex > 0);
+ if (node -> pi != -1)
+ return node->pi;
+ }
+ }
+ while (stackindex > 0);
- return 0;
-}
+ return -1;
+ }
-void ADTree :: GetMatch (ARRAY <int> & matches)
-{
- int nodenr;
+ void ADTree :: GetMatch (ARRAY <int> & matches)
+ {
+ int nodenr;
- Reset();
+ Reset();
- while (nodenr = Next())
- matches.Append (nodenr);
-}
+ while ( (nodenr = Next()) != -1)
+ matches.Append (nodenr);
+ }
-void ADTree :: PrintRec (ostream & ost, const ADTreeNode * node) const
-{
+ void ADTree :: PrintRec (ostream & ost, const ADTreeNode * node) const
+ {
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (int i = 0; i < dim; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
- if (node->left)
- {
- ost << "l ";
- PrintRec (ost, node->left);
- }
- if (node->right)
- {
- ost << "r ";
- PrintRec (ost, node->right);
- }
-}
-
-
-/* ******************************* ADTree3 ******************************* */
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (int i = 0; i < dim; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ if (node->left)
+ {
+ ost << "l ";
+ PrintRec (ost, node->left);
+ }
+ if (node->right)
+ {
+ ost << "r ";
+ PrintRec (ost, node->right);
+ }
+ }
-ADTreeNode3 :: ADTreeNode3()
-{
- pi = 0;
+ /* ******************************* ADTree3 ******************************* */
- left = NULL;
- right = NULL;
- father = NULL;
- nchilds = 0;
-}
-
-void ADTreeNode3 :: DeleteChilds ()
-{
- if (left)
- {
- left->DeleteChilds();
- delete left;
- left = NULL;
- }
- if (right)
- {
- right->DeleteChilds();
- delete right;
- right = NULL;
- }
-}
+ ADTreeNode3 :: ADTreeNode3()
+ {
+ pi = -1;
-BlockAllocator ADTreeNode3 :: ball(sizeof (ADTreeNode3));
+ left = NULL;
+ right = NULL;
+ father = NULL;
+ nchilds = 0;
+ }
-
-void * ADTreeNode3 :: operator new(size_t s)
-{
- ADTreeNode3 * ap;
- return ball.Alloc();
-}
-
-void ADTreeNode3 :: operator delete (void * p)
-{
- ball.Free (p);
- // ::delete [] p;
-}
+ void ADTreeNode3 :: DeleteChilds ()
+ {
+ if (left)
+ {
+ left->DeleteChilds();
+ delete left;
+ left = NULL;
+ }
+ if (right)
+ {
+ right->DeleteChilds();
+ delete right;
+ right = NULL;
+ }
+ }
+ BlockAllocator ADTreeNode3 :: ball(sizeof (ADTreeNode3));
+ void * ADTreeNode3 :: operator new(size_t s)
+ {
+ return ball.Alloc();
+ }
+ void ADTreeNode3 :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree3 :: ADTree3 (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 3 * sizeof(float));
- memcpy (cmax, acmax, 3 * sizeof(float));
- root = new ADTreeNode3;
- root->sep = (cmin[0] + cmax[0]) / 2;
-}
-ADTree3 :: ~ADTree3 ()
-{
- root->DeleteChilds();
- delete root;
-}
-void ADTree3 :: Insert (const float * p, int pi)
-{
- ADTreeNode3 *node;
- ADTreeNode3 *next;
- int dir;
- int lr;
- float bmin[3];
- float bmax[3];
+ ADTree3 :: ADTree3 (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 3 * sizeof(float));
+ memcpy (cmax, acmax, 3 * sizeof(float));
+
+ root = new ADTreeNode3;
+ root->sep = (cmin[0] + cmax[0]) / 2;
+ }
+
+ ADTree3 :: ~ADTree3 ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
+
+
+ void ADTree3 :: Insert (const float * p, int pi)
+ {
+ ADTreeNode3 *node;
+ ADTreeNode3 *next;
+ int dir;
+ int lr;
+
+ float bmin[3];
+ float bmax[3];
- memcpy (bmin, cmin, 3 * sizeof(float));
- memcpy (bmax, cmax, 3 * sizeof(float));
-
-#ifdef MARK
- // MARK (insertloop3)
-#endif
-
- next = root;
- dir = 0;
- while (next)
- {
- node = next;
-
- if (!node->pi)
- {
- memcpy (node->data, p, 3 * sizeof(float));
- node->pi = pi;
-
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ memcpy (bmin, cmin, 3 * sizeof(float));
+ memcpy (bmax, cmax, 3 * sizeof(float));
- return;
- }
-
- if (node->sep > p[dir])
- {
- next = node->left;
- bmax[dir] = node->sep;
- lr = 0;
- }
- else
- {
- next = node->right;
- bmin[dir] = node->sep;
- lr = 1;
- }
-
- dir++;
- if (dir == 3)
- dir = 0;
- }
+ next = root;
+ dir = 0;
+ while (next)
+ {
+ node = next;
-#ifdef MARK
- // MARK (insertend3)
-#endif
+ if (node->pi == -1)
+ {
+ memcpy (node->data, p, 3 * sizeof(float));
+ node->pi = pi;
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = node;
- next = new ADTreeNode3;
- memcpy (next->data, p, 3 * sizeof(float));
- next->pi = pi;
- next->sep = (bmin[dir] + bmax[dir]) / 2;
+ return;
+ }
+ if (node->sep > p[dir])
+ {
+ next = node->left;
+ bmax[dir] = node->sep;
+ lr = 0;
+ }
+ else
+ {
+ next = node->right;
+ bmin[dir] = node->sep;
+ lr = 1;
+ }
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ dir++;
+ if (dir == 3)
+ dir = 0;
+ }
- if (lr)
- node->right = next;
- else
- node->left = next;
- next -> father = node;
+ next = new ADTreeNode3;
+ memcpy (next->data, p, 3 * sizeof(float));
+ next->pi = pi;
+ next->sep = (bmin[dir] + bmax[dir]) / 2;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
-void ADTree3 :: DeleteElement (int pi)
-{
- ADTreeNode3 * node = ela.Get(pi);
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = next;
- node->pi = 0;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ if (lr)
+ node->right = next;
+ else
+ node->left = next;
+ next -> father = node;
-void ADTree3 :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode3*> stack(1000);
- static ARRAY<int> stackdir(1000);
- ADTreeNode3 * node;
- int dir, i, stacks;
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
- stack.SetSize (1000);
- stackdir.SetSize(1000);
- pis.SetSize(0);
+ void ADTree3 :: DeleteElement (int pi)
+ {
+ ADTreeNode3 * node = ela[pi];
- stack.Elem(1) = root;
- stackdir.Elem(1) = 0;
- stacks = 1;
+ node->pi = -1;
- while (stacks)
- {
- node = stack.Get(stacks);
- dir = stackdir.Get(stacks);
- stacks--;
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
+
+ void ADTree3 :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode3*> stack(1000);
+ static ARRAY<int> stackdir(1000);
+ ADTreeNode3 * node;
+ int dir, stacks;
+
+ stack.SetSize (1000);
+ stackdir.SetSize(1000);
+ pis.SetSize(0);
+
+ stack.Elem(1) = root;
+ stackdir.Elem(1) = 0;
+ stacks = 1;
+
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ dir = stackdir.Get(stacks);
+ stacks--;
- if (node->pi)
- {
- if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
- node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
- node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
+ if (node->pi != -1)
+ {
+ if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
+ node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
+ node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
- pis.Append (node->pi);
- }
+ pis.Append (node->pi);
+ }
- int ndir = dir+1;
- if (ndir == 3)
- ndir = 0;
+ int ndir = dir+1;
+ if (ndir == 3)
+ ndir = 0;
- if (node->left && bmin[dir] <= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->left;
- stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->right;
- stackdir.Elem(stacks) = ndir;
- }
- }
-}
+ if (node->left && bmin[dir] <= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks) = node->left;
+ stackdir.Elem(stacks) = ndir;
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks) = node->right;
+ stackdir.Elem(stacks) = ndir;
+ }
+ }
+ }
-void ADTree3 :: PrintRec (ostream & ost, const ADTreeNode3 * node) const
-{
+ void ADTree3 :: PrintRec (ostream & ost, const ADTreeNode3 * node) const
+ {
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (int i = 0; i < 3; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
- if (node->left)
- PrintRec (ost, node->left);
- if (node->right)
- PrintRec (ost, node->right);
-}
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (int i = 0; i < 3; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ if (node->left)
+ PrintRec (ost, node->left);
+ if (node->right)
+ PrintRec (ost, node->right);
+ }
@@ -489,285 +472,277 @@ void ADTree3 :: PrintRec (ostream & ost, const ADTreeNode3 * node) const
+#ifdef ABC
-/* ******************************* ADTree3Div ******************************* */
+ /* ******************************* ADTree3Div ******************************* */
-ADTreeNode3Div :: ADTreeNode3Div()
-{
- pi = 0;
+ ADTreeNode3Div :: ADTreeNode3Div()
+ {
+ pi = 0;
- int i;
- for (i = 0; i < ADTN_DIV; i++)
- childs[i] = NULL;
-
- father = NULL;
- nchilds = 0;
- minx = 0;
- dist = 1;
-}
+ int i;
+ for (i = 0; i < ADTN_DIV; i++)
+ childs[i] = NULL;
-void ADTreeNode3Div :: DeleteChilds ()
-{
- int i;
- for (i = 0; i < ADTN_DIV; i++)
- if (childs[i])
- {
- childs[i]->DeleteChilds();
- delete childs[i];
- childs[i] = NULL;
- }
-}
+ father = NULL;
+ nchilds = 0;
+ minx = 0;
+ dist = 1;
+ }
+ void ADTreeNode3Div :: DeleteChilds ()
+ {
+ int i;
+ for (i = 0; i < ADTN_DIV; i++)
+ if (childs[i])
+ {
+ childs[i]->DeleteChilds();
+ delete childs[i];
+ childs[i] = NULL;
+ }
+ }
-BlockAllocator ADTreeNode3Div :: ball(sizeof (ADTreeNode3Div));
-void * ADTreeNode3Div :: operator new(size_t)
-{
- return ball.Alloc();
-}
+ BlockAllocator ADTreeNode3Div :: ball(sizeof (ADTreeNode3Div));
-void ADTreeNode3Div :: operator delete (void * p)
-{
- ball.Free (p);
-}
+ void * ADTreeNode3Div :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
+ void ADTreeNode3Div :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree3Div :: ADTree3Div (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 3 * sizeof(float));
- memcpy (cmax, acmax, 3 * sizeof(float));
- root = new ADTreeNode3Div;
+ ADTree3Div :: ADTree3Div (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 3 * sizeof(float));
+ memcpy (cmax, acmax, 3 * sizeof(float));
- root->minx = cmin[0];
- root->dist = (cmax[0] - cmin[0]) / ADTN_DIV;
+ root = new ADTreeNode3Div;
- // root->sep = (cmin[0] + cmax[0]) / 2;
-}
+ root->minx = cmin[0];
+ root->dist = (cmax[0] - cmin[0]) / ADTN_DIV;
-ADTree3Div :: ~ADTree3Div ()
-{
- root->DeleteChilds();
- delete root;
-}
+ // root->sep = (cmin[0] + cmax[0]) / 2;
+ }
+ ADTree3Div :: ~ADTree3Div ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
-void ADTree3Div :: Insert (const float * p, int pi)
-{
- ADTreeNode3Div *node;
- ADTreeNode3Div *next;
- int dir;
- int bag;
+
+ void ADTree3Div :: Insert (const float * p, int pi)
+ {
+ ADTreeNode3Div *node;
+ ADTreeNode3Div *next;
+ int dir;
+ int bag;
- float bmin[3];
- float bmax[3];
+ float bmin[3];
+ float bmax[3];
- memcpy (bmin, cmin, 3 * sizeof(float));
- memcpy (bmax, cmax, 3 * sizeof(float));
+ memcpy (bmin, cmin, 3 * sizeof(float));
+ memcpy (bmax, cmax, 3 * sizeof(float));
-#ifdef MARK
- // MARK (insertloop3)
-#endif
- // (*testout) << endl << "add point " << Point3d (p[0], p[1], p[2]) << endl;
-
- next = root;
- dir = 0;
- while (next)
- {
- node = next;
+ next = root;
+ dir = 0;
+ while (next)
+ {
+ node = next;
- if (!node->pi)
- {
- memcpy (node->data, p, 3 * sizeof(float));
- node->pi = pi;
+ if (!node->pi)
+ {
+ memcpy (node->data, p, 3 * sizeof(float));
+ node->pi = pi;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = node;
- return;
- }
+ return;
+ }
- double dx = (bmax[dir] - bmin[dir]) / ADTN_DIV;
- bag = int ((p[dir]-bmin[dir]) / dx);
+ double dx = (bmax[dir] - bmin[dir]) / ADTN_DIV;
+ bag = int ((p[dir]-bmin[dir]) / dx);
- // (*testout) << "insert, bag = " << bag << endl;
+ // (*testout) << "insert, bag = " << bag << endl;
- if (bag < 0) bag = 0;
- if (bag >= ADTN_DIV) bag = ADTN_DIV-1;
+ if (bag < 0) bag = 0;
+ if (bag >= ADTN_DIV) bag = ADTN_DIV-1;
- double nbmin = bmin[dir] + bag * dx;
- double nbmax = bmin[dir] + (bag+1) * dx;
+ double nbmin = bmin[dir] + bag * dx;
+ double nbmax = bmin[dir] + (bag+1) * dx;
- /*
- (*testout) << "bmin, max = " << bmin[dir] << "-" << bmax[dir]
- << " p = " << p[dir];
- */
- next = node->childs[bag];
- bmin[dir] = nbmin;
- bmax[dir] = nbmax;
+ /*
+ (*testout) << "bmin, max = " << bmin[dir] << "-" << bmax[dir]
+ << " p = " << p[dir];
+ */
+ next = node->childs[bag];
+ bmin[dir] = nbmin;
+ bmax[dir] = nbmax;
- // (*testout) << "new bmin, max = " << bmin[dir] << "-" << bmax[dir] << endl;
+ // (*testout) << "new bmin, max = " << bmin[dir] << "-" << bmax[dir] << endl;
- /*
- if (node->sep > p[dir])
- {
- next = node->left;
- bmax[dir] = node->sep;
- lr = 0;
- }
- else
- {
- next = node->right;
- bmin[dir] = node->sep;
- lr = 1;
- }
- */
-
- dir++;
- if (dir == 3)
- dir = 0;
- }
-
-#ifdef MARK
- // MARK (insertend3)
-#endif
-
-
- next = new ADTreeNode3Div;
- memcpy (next->data, p, 3 * sizeof(float));
- next->pi = pi;
-
- next->minx = bmin[dir];
- next->dist = (bmax[dir] - bmin[dir]) / ADTN_DIV;
- // next->sep = (bmin[dir] + bmax[dir]) / 2;
+ /*
+ if (node->sep > p[dir])
+ {
+ next = node->left;
+ bmax[dir] = node->sep;
+ lr = 0;
+ }
+ else
+ {
+ next = node->right;
+ bmin[dir] = node->sep;
+ lr = 1;
+ }
+ */
+ dir++;
+ if (dir == 3)
+ dir = 0;
+ }
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
- node->childs[bag] = next;
- next -> father = node;
+ next = new ADTreeNode3Div;
+ memcpy (next->data, p, 3 * sizeof(float));
+ next->pi = pi;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ next->minx = bmin[dir];
+ next->dist = (bmax[dir] - bmin[dir]) / ADTN_DIV;
+ // next->sep = (bmin[dir] + bmax[dir]) / 2;
-void ADTree3Div :: DeleteElement (int pi)
-{
- ADTreeNode3Div * node = ela.Get(pi);
- node->pi = 0;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = next;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node->childs[bag] = next;
+ next -> father = node;
-void ADTree3Div :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode3Div*> stack(1000);
- static ARRAY<int> stackdir(1000);
- ADTreeNode3Div * node;
- int dir, i, stacks;
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
- stack.SetSize (1000);
- stackdir.SetSize(1000);
- pis.SetSize(0);
+ void ADTree3Div :: DeleteElement (int pi)
+ {
+ ADTreeNode3Div * node = ela.Get(pi);
- stack.Elem(1) = root;
- stackdir.Elem(1) = 0;
- stacks = 1;
+ node->pi = 0;
- while (stacks)
- {
- node = stack.Get(stacks);
- dir = stackdir.Get(stacks);
- stacks--;
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
+
+ void ADTree3Div :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode3Div*> stack(1000);
+ static ARRAY<int> stackdir(1000);
+ ADTreeNode3Div * node;
+ int dir, i, stacks;
+
+ stack.SetSize (1000);
+ stackdir.SetSize(1000);
+ pis.SetSize(0);
+
+ stack.Elem(1) = root;
+ stackdir.Elem(1) = 0;
+ stacks = 1;
+
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ dir = stackdir.Get(stacks);
+ stacks--;
- if (node->pi)
- {
- if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
- node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
- node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
+ if (node->pi)
+ {
+ if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
+ node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
+ node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
- pis.Append (node->pi);
- }
+ pis.Append (node->pi);
+ }
- int ndir = dir+1;
- if (ndir == 3)
- ndir = 0;
+ int ndir = dir+1;
+ if (ndir == 3)
+ ndir = 0;
- int mini = int ( (bmin[dir] - node->minx) / node->dist );
- int maxi = int ( (bmax[dir] - node->minx) / node->dist );
+ int mini = int ( (bmin[dir] - node->minx) / node->dist );
+ int maxi = int ( (bmax[dir] - node->minx) / node->dist );
- // (*testout) << "get int, mini, maxi = " << mini << ", " << maxi << endl;
- if (mini < 0) mini = 0;
- if (maxi >= ADTN_DIV) maxi = ADTN_DIV-1;
+ // (*testout) << "get int, mini, maxi = " << mini << ", " << maxi << endl;
+ if (mini < 0) mini = 0;
+ if (maxi >= ADTN_DIV) maxi = ADTN_DIV-1;
- for (i = mini; i <= maxi; i++)
- if (node->childs[i])
- {
- stacks++;
- stack.Elem(stacks) = node->childs[i];
- stackdir.Elem(stacks) = ndir;
- }
+ for (i = mini; i <= maxi; i++)
+ if (node->childs[i])
+ {
+ stacks++;
+ stack.Elem(stacks) = node->childs[i];
+ stackdir.Elem(stacks) = ndir;
+ }
- /*
- if (node->left && bmin[dir] <= node->sep)
- {
+ /*
+ if (node->left && bmin[dir] <= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->left;
stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->right;
stackdir.Elem(stacks) = ndir;
- }
- */
- }
-}
+ }
+ */
+ }
+ }
-void ADTree3Div :: PrintRec (ostream & ost, const ADTreeNode3Div * node) const
-{
+ void ADTree3Div :: PrintRec (ostream & ost, const ADTreeNode3Div * node) const
+ {
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- ost << " from " << node->minx << " - " << node->minx + node->dist*ADTN_DIV << " ";
- for (int i = 0; i < 3; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
- int i;
- for (i = 0; i < ADTN_DIV; i++)
- if (node->childs[i])
- PrintRec (ost, node->childs[i]);
-}
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ ost << " from " << node->minx << " - " << node->minx + node->dist*ADTN_DIV << " ";
+ for (int i = 0; i < 3; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ int i;
+ for (i = 0; i < ADTN_DIV; i++)
+ if (node->childs[i])
+ PrintRec (ost, node->childs[i]);
+ }
@@ -780,245 +755,237 @@ void ADTree3Div :: PrintRec (ostream & ost, const ADTreeNode3Div * node) const
-/* ******************************* ADTree3M ******************************* */
+ /* ******************************* ADTree3M ******************************* */
-ADTreeNode3M :: ADTreeNode3M()
-{
- int i;
- for (i = 0; i < ADTN_SIZE; i++)
- pi[i] = 0;
-
- left = NULL;
- right = NULL;
- father = NULL;
- nchilds = 0;
-}
+ ADTreeNode3M :: ADTreeNode3M()
+ {
+ int i;
+ for (i = 0; i < ADTN_SIZE; i++)
+ pi[i] = 0;
-void ADTreeNode3M :: DeleteChilds ()
-{
- if (left)
- {
- left->DeleteChilds();
- delete left;
- left = NULL;
- }
- if (right)
- {
- right->DeleteChilds();
- delete right;
- right = NULL;
- }
-}
+ left = NULL;
+ right = NULL;
+ father = NULL;
+ nchilds = 0;
+ }
+ void ADTreeNode3M :: DeleteChilds ()
+ {
+ if (left)
+ {
+ left->DeleteChilds();
+ delete left;
+ left = NULL;
+ }
+ if (right)
+ {
+ right->DeleteChilds();
+ delete right;
+ right = NULL;
+ }
+ }
-BlockAllocator ADTreeNode3M :: ball(sizeof (ADTreeNode3M));
-void * ADTreeNode3M :: operator new(size_t)
-{
- return ball.Alloc();
-}
+ BlockAllocator ADTreeNode3M :: ball(sizeof (ADTreeNode3M));
-void ADTreeNode3M :: operator delete (void * p)
-{
- ball.Free (p);
-}
+ void * ADTreeNode3M :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
+ void ADTreeNode3M :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree3M :: ADTree3M (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 3 * sizeof(float));
- memcpy (cmax, acmax, 3 * sizeof(float));
- root = new ADTreeNode3M;
- root->sep = (cmin[0] + cmax[0]) / 2;
-}
+ ADTree3M :: ADTree3M (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 3 * sizeof(float));
+ memcpy (cmax, acmax, 3 * sizeof(float));
-ADTree3M :: ~ADTree3M ()
-{
- root->DeleteChilds();
- delete root;
-}
+ root = new ADTreeNode3M;
+ root->sep = (cmin[0] + cmax[0]) / 2;
+ }
+ ADTree3M :: ~ADTree3M ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
-void ADTree3M :: Insert (const float * p, int pi)
-{
- ADTreeNode3M *node;
- ADTreeNode3M *next;
- int dir;
- int lr;
- int i;
- float bmin[3];
- float bmax[3];
-
- memcpy (bmin, cmin, 3 * sizeof(float));
- memcpy (bmax, cmax, 3 * sizeof(float));
-#ifdef MARK
- // MARK (insertloop3)
-#endif
+ void ADTree3M :: Insert (const float * p, int pi)
+ {
+ ADTreeNode3M *node;
+ ADTreeNode3M *next;
+ int dir;
+ int lr;
+ int i;
+ float bmin[3];
+ float bmax[3];
+
+ memcpy (bmin, cmin, 3 * sizeof(float));
+ memcpy (bmax, cmax, 3 * sizeof(float));
- next = root;
- dir = 0;
- while (next)
- {
- node = next;
+ next = root;
+ dir = 0;
+ while (next)
+ {
+ node = next;
- for (i = 0; i < ADTN_SIZE; i++)
- if (!node->pi[i])
- {
- memcpy (node->data[i], p, 3 * sizeof(float));
- node->pi[i] = pi;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (!node->pi[i])
+ {
+ memcpy (node->data[i], p, 3 * sizeof(float));
+ node->pi[i] = pi;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = node;
- return;
- }
-
- if (node->sep > p[dir])
- {
- next = node->left;
- bmax[dir] = node->sep;
- lr = 0;
- }
- else
- {
- next = node->right;
- bmin[dir] = node->sep;
- lr = 1;
- }
+ return;
+ }
- dir++;
- if (dir == 3)
- dir = 0;
- }
+ if (node->sep > p[dir])
+ {
+ next = node->left;
+ bmax[dir] = node->sep;
+ lr = 0;
+ }
+ else
+ {
+ next = node->right;
+ bmin[dir] = node->sep;
+ lr = 1;
+ }
-#ifdef MARK
- // MARK (insertend3)
-#endif
+ dir++;
+ if (dir == 3)
+ dir = 0;
+ }
- next = new ADTreeNode3M;
- memcpy (next->data[0], p, 3 * sizeof(float));
- next->pi[0] = pi;
- next->sep = (bmin[dir] + bmax[dir]) / 2;
+ next = new ADTreeNode3M;
+ memcpy (next->data[0], p, 3 * sizeof(float));
+ next->pi[0] = pi;
+ next->sep = (bmin[dir] + bmax[dir]) / 2;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = next;
- if (lr)
- node->right = next;
- else
- node->left = next;
- next -> father = node;
+ if (lr)
+ node->right = next;
+ else
+ node->left = next;
+ next -> father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
-void ADTree3M :: DeleteElement (int pi)
-{
- ADTreeNode3M * node = ela.Get(pi);
+ void ADTree3M :: DeleteElement (int pi)
+ {
+ ADTreeNode3M * node = ela.Get(pi);
- int i;
- for (i = 0; i < ADTN_SIZE; i++)
- if (node->pi[i] == pi)
- node->pi[i] = 0;
+ int i;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (node->pi[i] == pi)
+ node->pi[i] = 0;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree3M :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode3M*> stack(1000);
- static ARRAY<int> stackdir(1000);
- ADTreeNode3M * node;
- int dir, i, stacks;
+ void ADTree3M :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode3M*> stack(1000);
+ static ARRAY<int> stackdir(1000);
+ ADTreeNode3M * node;
+ int dir, i, stacks;
- stack.SetSize (1000);
- stackdir.SetSize(1000);
- pis.SetSize(0);
+ stack.SetSize (1000);
+ stackdir.SetSize(1000);
+ pis.SetSize(0);
- stack.Elem(1) = root;
- stackdir.Elem(1) = 0;
- stacks = 1;
+ stack.Elem(1) = root;
+ stackdir.Elem(1) = 0;
+ stacks = 1;
- while (stacks)
- {
- node = stack.Get(stacks);
- dir = stackdir.Get(stacks);
- stacks--;
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ dir = stackdir.Get(stacks);
+ stacks--;
- int * hpi = node->pi;
- for (i = 0; i < ADTN_SIZE; i++)
- if (hpi[i])
- {
- float * datai = &node->data[i][0];
- if (datai[0] >= bmin[0] && datai[0] <= bmax[0] &&
- datai[1] >= bmin[1] && datai[1] <= bmax[1] &&
- datai[2] >= bmin[2] && datai[2] <= bmax[2])
+ int * hpi = node->pi;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (hpi[i])
+ {
+ float * datai = &node->data[i][0];
+ if (datai[0] >= bmin[0] && datai[0] <= bmax[0] &&
+ datai[1] >= bmin[1] && datai[1] <= bmax[1] &&
+ datai[2] >= bmin[2] && datai[2] <= bmax[2])
- pis.Append (node->pi[i]);
- }
+ pis.Append (node->pi[i]);
+ }
- int ndir = dir+1;
- if (ndir == 3)
- ndir = 0;
+ int ndir = dir+1;
+ if (ndir == 3)
+ ndir = 0;
- if (node->left && bmin[dir] <= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->left;
- stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->right;
- stackdir.Elem(stacks) = ndir;
- }
- }
-}
+ if (node->left && bmin[dir] <= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks) = node->left;
+ stackdir.Elem(stacks) = ndir;
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks) = node->right;
+ stackdir.Elem(stacks) = ndir;
+ }
+ }
+ }
-void ADTree3M :: PrintRec (ostream & ost, const ADTreeNode3M * node) const
-{
+ void ADTree3M :: PrintRec (ostream & ost, const ADTreeNode3M * node) const
+ {
- if (node->data)
- {
- // ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (int i = 0; i < 3; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
- if (node->left)
- PrintRec (ost, node->left);
- if (node->right)
- PrintRec (ost, node->right);
-}
+ if (node->data)
+ {
+ // ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (int i = 0; i < 3; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ if (node->left)
+ PrintRec (ost, node->left);
+ if (node->right)
+ PrintRec (ost, node->right);
+ }
@@ -1031,44 +998,44 @@ void ADTree3M :: PrintRec (ostream & ost, const ADTreeNode3M * node) const
-/* ******************************* ADTree3F ******************************* */
+ /* ******************************* ADTree3F ******************************* */
-ADTreeNode3F :: ADTreeNode3F()
-{
- pi = 0;
- father = NULL;
- nchilds = 0;
- int i;
- for (i = 0; i < 8; i++)
- childs[i] = NULL;
-}
+ ADTreeNode3F :: ADTreeNode3F()
+ {
+ pi = 0;
+ father = NULL;
+ nchilds = 0;
+ int i;
+ for (i = 0; i < 8; i++)
+ childs[i] = NULL;
+ }
-void ADTreeNode3F :: DeleteChilds ()
-{
- int i;
+ void ADTreeNode3F :: DeleteChilds ()
+ {
+ int i;
- for (i = 0; i < 8; i++)
- {
- if (childs[i])
- childs[i]->DeleteChilds();
- delete childs[i];
- childs[i] = NULL;
- }
-}
+ for (i = 0; i < 8; i++)
+ {
+ if (childs[i])
+ childs[i]->DeleteChilds();
+ delete childs[i];
+ childs[i] = NULL;
+ }
+ }
-BlockAllocator ADTreeNode3F :: ball(sizeof (ADTreeNode3F));
+ BlockAllocator ADTreeNode3F :: ball(sizeof (ADTreeNode3F));
-void * ADTreeNode3F :: operator new(size_t)
-{
- return ball.Alloc();
-}
+ void * ADTreeNode3F :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
-void ADTreeNode3F :: operator delete (void * p)
-{
- ball.Free (p);
-}
+ void ADTreeNode3F :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
@@ -1076,211 +1043,206 @@ void ADTreeNode3F :: operator delete (void * p)
-ADTree3F :: ADTree3F (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 3 * sizeof(float));
- memcpy (cmax, acmax, 3 * sizeof(float));
+ ADTree3F :: ADTree3F (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 3 * sizeof(float));
+ memcpy (cmax, acmax, 3 * sizeof(float));
- root = new ADTreeNode3F;
- for (int i = 0; i < 3; i++)
- root->sep[i] = (cmin[i] + cmax[i]) / 2;
-}
+ root = new ADTreeNode3F;
+ for (int i = 0; i < 3; i++)
+ root->sep[i] = (cmin[i] + cmax[i]) / 2;
+ }
-ADTree3F :: ~ADTree3F ()
-{
- root->DeleteChilds();
- delete root;
-}
+ ADTree3F :: ~ADTree3F ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
-void ADTree3F :: Insert (const float * p, int pi)
-{
- ADTreeNode3F *node;
- ADTreeNode3F *next;
- int lr;
+ void ADTree3F :: Insert (const float * p, int pi)
+ {
+ ADTreeNode3F *node;
+ ADTreeNode3F *next;
+ int lr;
- float bmin[3];
- float bmax[3];
- int i, dir;
+ float bmin[3];
+ float bmax[3];
+ int i, dir;
- memcpy (bmin, cmin, 3 * sizeof(float));
- memcpy (bmax, cmax, 3 * sizeof(float));
+ memcpy (bmin, cmin, 3 * sizeof(float));
+ memcpy (bmax, cmax, 3 * sizeof(float));
-#ifdef MARK
- // MARK (insertloop3)
-#endif
- next = root;
- while (next)
- {
- node = next;
+ next = root;
+ while (next)
+ {
+ node = next;
- if (!node->pi)
- {
- memcpy (node->data, p, 3 * sizeof(float));
- node->pi = pi;
+ if (!node->pi)
+ {
+ memcpy (node->data, p, 3 * sizeof(float));
+ node->pi = pi;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = node;
- return;
- }
+ return;
+ }
- dir = 0;
- for (i = 0; i < 3; i++)
- {
- if (node->sep[i] > p[i])
- {
- bmax[i] = node->sep[i];
- }
- else
- {
- bmin[i] = node->sep[i];
- dir += (1 << i);
- }
- }
- next = node->childs[dir];
+ dir = 0;
+ for (i = 0; i < 3; i++)
+ {
+ if (node->sep[i] > p[i])
+ {
+ bmax[i] = node->sep[i];
+ }
+ else
+ {
+ bmin[i] = node->sep[i];
+ dir += (1 << i);
+ }
+ }
+ next = node->childs[dir];
- /*
- if (node->sep > p[dir])
- {
+ /*
+ if (node->sep > p[dir])
+ {
next = node->left;
bmax[dir] = node->sep;
lr = 0;
- }
- else
- {
+ }
+ else
+ {
next = node->right;
bmin[dir] = node->sep;
lr = 1;
- }
- */
- }
+ }
+ */
+ }
- next = new ADTreeNode3F;
- memcpy (next->data, p, 3 * sizeof(float));
- next->pi = pi;
+ next = new ADTreeNode3F;
+ memcpy (next->data, p, 3 * sizeof(float));
+ next->pi = pi;
- for (i = 0; i < 3; i++)
- next->sep[i] = (bmin[i] + bmax[i]) / 2;
+ for (i = 0; i < 3; i++)
+ next->sep[i] = (bmin[i] + bmax[i]) / 2;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = next;
- node->childs[dir] = next;
- next->father = node;
+ node->childs[dir] = next;
+ next->father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
-void ADTree3F :: DeleteElement (int pi)
-{
- ADTreeNode3F * node = ela.Get(pi);
+ void ADTree3F :: DeleteElement (int pi)
+ {
+ ADTreeNode3F * node = ela.Get(pi);
- node->pi = 0;
+ node->pi = 0;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree3F :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode3F*> stack(1000);
- ADTreeNode3F * node;
- int dir, i, stacks;
+ void ADTree3F :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode3F*> stack(1000);
+ ADTreeNode3F * node;
+ int dir, i, stacks;
- stack.SetSize (1000);
- pis.SetSize(0);
+ stack.SetSize (1000);
+ pis.SetSize(0);
- stack.Elem(1) = root;
- stacks = 1;
+ stack.Elem(1) = root;
+ stacks = 1;
- while (stacks)
- {
- node = stack.Get(stacks);
- stacks--;
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ stacks--;
- if (node->pi)
- {
- if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
- node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
- node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
+ if (node->pi)
+ {
+ if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
+ node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
+ node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
- pis.Append (node->pi);
- }
+ pis.Append (node->pi);
+ }
- int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
- int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
- int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
- int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
- int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
- int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
-
- int i1, i2, i3;
- for (i1 = i1min; i1 <= i1max; i1++)
- for (i2 = i2min; i2 <= i2max; i2++)
- for (i3 = i3min; i3 <= i3max; i3++)
- {
- i = i1+2*i2+4*i3;
- if (node->childs[i])
- {
- stacks++;
- stack.Elem(stacks) = node->childs[i];
- }
- }
+ int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
+ int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
+ int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
+ int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
+ int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
+ int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
+
+ int i1, i2, i3;
+ for (i1 = i1min; i1 <= i1max; i1++)
+ for (i2 = i2min; i2 <= i2max; i2++)
+ for (i3 = i3min; i3 <= i3max; i3++)
+ {
+ i = i1+2*i2+4*i3;
+ if (node->childs[i])
+ {
+ stacks++;
+ stack.Elem(stacks) = node->childs[i];
+ }
+ }
- /*
- if (node->left && bmin[dir] <= node->sep)
- {
+ /*
+ if (node->left && bmin[dir] <= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->left;
stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->right;
stackdir.Elem(stacks) = ndir;
- }
- */
- }
-}
-
-void ADTree3F :: PrintRec (ostream & ost, const ADTreeNode3F * node) const
-{
- int i;
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (i = 0; i < 3; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
-
- for (i = 0; i < 8; i++)
- if (node->childs[i])
- PrintRec (ost, node->childs[i]);
-}
+ }
+ */
+ }
+ }
+ void ADTree3F :: PrintRec (ostream & ost, const ADTreeNode3F * node) const
+ {
+ int i;
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (i = 0; i < 3; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ for (i = 0; i < 8; i++)
+ if (node->childs[i])
+ PrintRec (ost, node->childs[i]);
+ }
@@ -1292,944 +1254,935 @@ void ADTree3F :: PrintRec (ostream & ost, const ADTreeNode3F * node) const
-/* ******************************* ADTree3FM ******************************* */
-ADTreeNode3FM :: ADTreeNode3FM()
-{
- father = NULL;
- nchilds = 0;
- int i;
+ /* ******************************* ADTree3FM ******************************* */
- for (i = 0; i < ADTN_SIZE; i++)
- pi[i] = 0;
- for (i = 0; i < 8; i++)
- childs[i] = NULL;
-}
+ ADTreeNode3FM :: ADTreeNode3FM()
+ {
+ father = NULL;
+ nchilds = 0;
+ int i;
-void ADTreeNode3FM :: DeleteChilds ()
-{
- int i;
+ for (i = 0; i < ADTN_SIZE; i++)
+ pi[i] = 0;
- for (i = 0; i < 8; i++)
- {
- if (childs[i])
- childs[i]->DeleteChilds();
- delete childs[i];
+ for (i = 0; i < 8; i++)
childs[i] = NULL;
- }
-}
+ }
+ void ADTreeNode3FM :: DeleteChilds ()
+ {
+ int i;
-BlockAllocator ADTreeNode3FM :: ball(sizeof (ADTreeNode3FM));
-
-void * ADTreeNode3FM :: operator new(size_t)
-{
- return ball.Alloc();
-}
-
-void ADTreeNode3FM :: operator delete (void * p)
-{
- ball.Free (p);
-}
-
+ for (i = 0; i < 8; i++)
+ {
+ if (childs[i])
+ childs[i]->DeleteChilds();
+ delete childs[i];
+ childs[i] = NULL;
+ }
+ }
+ BlockAllocator ADTreeNode3FM :: ball(sizeof (ADTreeNode3FM));
+ void * ADTreeNode3FM :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
+ void ADTreeNode3FM :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree3FM :: ADTree3FM (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 3 * sizeof(float));
- memcpy (cmax, acmax, 3 * sizeof(float));
- root = new ADTreeNode3FM;
- for (int i = 0; i < 3; i++)
- root->sep[i] = (cmin[i] + cmax[i]) / 2;
-}
-ADTree3FM :: ~ADTree3FM ()
-{
- root->DeleteChilds();
- delete root;
-}
-void ADTree3FM :: Insert (const float * p, int pi)
-{
- ADTreeNode3FM *node;
- ADTreeNode3FM *next;
- int lr;
- float bmin[3];
- float bmax[3];
- int i, dir;
+ ADTree3FM :: ADTree3FM (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 3 * sizeof(float));
+ memcpy (cmax, acmax, 3 * sizeof(float));
+
+ root = new ADTreeNode3FM;
+ for (int i = 0; i < 3; i++)
+ root->sep[i] = (cmin[i] + cmax[i]) / 2;
+ }
+
+ ADTree3FM :: ~ADTree3FM ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
+
+
+ void ADTree3FM :: Insert (const float * p, int pi)
+ {
+ ADTreeNode3FM *node;
+ ADTreeNode3FM *next;
+ int lr;
+
+ float bmin[3];
+ float bmax[3];
+ int i, dir;
- memcpy (bmin, cmin, 3 * sizeof(float));
- memcpy (bmax, cmax, 3 * sizeof(float));
-
-#ifdef MARK
- // MARK (insertloop3)
-#endif
+ memcpy (bmin, cmin, 3 * sizeof(float));
+ memcpy (bmax, cmax, 3 * sizeof(float));
- next = root;
- while (next)
- {
- node = next;
+ next = root;
+ while (next)
+ {
+ node = next;
- for (i = 0; i < ADTN_SIZE; i++)
- if (!node->pi[i])
- {
- memcpy (node->data[i], p, 3 * sizeof(float));
- node->pi[i] = pi;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (!node->pi[i])
+ {
+ memcpy (node->data[i], p, 3 * sizeof(float));
+ node->pi[i] = pi;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = node;
- return;
- }
-
- dir = 0;
- for (i = 0; i < 3; i++)
- {
- if (node->sep[i] > p[i])
- {
- bmax[i] = node->sep[i];
- }
- else
- {
- bmin[i] = node->sep[i];
- dir += (1 << i);
+ return;
}
- }
- next = node->childs[dir];
- /*
- if (node->sep > p[dir])
- {
+ dir = 0;
+ for (i = 0; i < 3; i++)
+ {
+ if (node->sep[i] > p[i])
+ {
+ bmax[i] = node->sep[i];
+ }
+ else
+ {
+ bmin[i] = node->sep[i];
+ dir += (1 << i);
+ }
+ }
+ next = node->childs[dir];
+
+ /*
+ if (node->sep > p[dir])
+ {
next = node->left;
bmax[dir] = node->sep;
lr = 0;
- }
- else
- {
+ }
+ else
+ {
next = node->right;
bmin[dir] = node->sep;
lr = 1;
- }
- */
- }
+ }
+ */
+ }
- next = new ADTreeNode3FM;
- memcpy (next->data[0], p, 3 * sizeof(float));
- next->pi[0] = pi;
+ next = new ADTreeNode3FM;
+ memcpy (next->data[0], p, 3 * sizeof(float));
+ next->pi[0] = pi;
- for (i = 0; i < 3; i++)
- next->sep[i] = (bmin[i] + bmax[i]) / 2;
+ for (i = 0; i < 3; i++)
+ next->sep[i] = (bmin[i] + bmax[i]) / 2;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = next;
- node->childs[dir] = next;
- next->father = node;
+ node->childs[dir] = next;
+ next->father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
-void ADTree3FM :: DeleteElement (int pi)
-{
- ADTreeNode3FM * node = ela.Get(pi);
+ void ADTree3FM :: DeleteElement (int pi)
+ {
+ ADTreeNode3FM * node = ela.Get(pi);
- int i;
- for (i = 0; i < ADTN_SIZE; i++)
- if (node->pi[i] == pi)
- node->pi[i] = 0;
+ int i;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (node->pi[i] == pi)
+ node->pi[i] = 0;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree3FM :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode3FM*> stack(1000);
- ADTreeNode3FM * node;
- int dir, i, stacks;
+ void ADTree3FM :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode3FM*> stack(1000);
+ ADTreeNode3FM * node;
+ int dir, i, stacks;
- stack.SetSize (1000);
- pis.SetSize(0);
+ stack.SetSize (1000);
+ pis.SetSize(0);
- stack.Elem(1) = root;
- stacks = 1;
+ stack.Elem(1) = root;
+ stacks = 1;
- while (stacks)
- {
- node = stack.Get(stacks);
- stacks--;
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ stacks--;
- int * hpi = node->pi;
- for (i = 0; i < ADTN_SIZE; i++)
- if (hpi[i])
- {
- float * datai = &node->data[i][0];
- if (datai[0] >= bmin[0] && datai[0] <= bmax[0] &&
- datai[1] >= bmin[1] && datai[1] <= bmax[1] &&
- datai[2] >= bmin[2] && datai[2] <= bmax[2])
+ int * hpi = node->pi;
+ for (i = 0; i < ADTN_SIZE; i++)
+ if (hpi[i])
+ {
+ float * datai = &node->data[i][0];
+ if (datai[0] >= bmin[0] && datai[0] <= bmax[0] &&
+ datai[1] >= bmin[1] && datai[1] <= bmax[1] &&
+ datai[2] >= bmin[2] && datai[2] <= bmax[2])
- pis.Append (node->pi[i]);
- }
+ pis.Append (node->pi[i]);
+ }
- /*
- if (node->pi)
- {
+ /*
+ if (node->pi)
+ {
if (node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
- node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
- node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
+ node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
+ node->data[2] >= bmin[2] && node->data[2] <= bmax[2])
- pis.Append (node->pi);
- }
- */
+ pis.Append (node->pi);
+ }
+ */
- int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
- int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
- int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
- int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
- int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
- int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
-
- int i1, i2, i3;
- for (i1 = i1min; i1 <= i1max; i1++)
- for (i2 = i2min; i2 <= i2max; i2++)
- for (i3 = i3min; i3 <= i3max; i3++)
- {
- i = i1+2*i2+4*i3;
- if (node->childs[i])
- {
- stacks++;
- stack.Elem(stacks) = node->childs[i];
- }
- }
+ int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
+ int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
+ int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
+ int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
+ int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
+ int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
+
+ int i1, i2, i3;
+ for (i1 = i1min; i1 <= i1max; i1++)
+ for (i2 = i2min; i2 <= i2max; i2++)
+ for (i3 = i3min; i3 <= i3max; i3++)
+ {
+ i = i1+2*i2+4*i3;
+ if (node->childs[i])
+ {
+ stacks++;
+ stack.Elem(stacks) = node->childs[i];
+ }
+ }
- /*
- if (node->left && bmin[dir] <= node->sep)
- {
+ /*
+ if (node->left && bmin[dir] <= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->left;
stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->right;
stackdir.Elem(stacks) = ndir;
- }
- */
- }
-}
-
-void ADTree3FM :: PrintRec (ostream & ost, const ADTreeNode3FM * node) const
-{
- int i;
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (i = 0; i < 3; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
-
- for (i = 0; i < 8; i++)
- if (node->childs[i])
- PrintRec (ost, node->childs[i]);
-}
-
-
-
-
+ }
+ */
+ }
+ }
+ void ADTree3FM :: PrintRec (ostream & ost, const ADTreeNode3FM * node) const
+ {
+ int i;
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (i = 0; i < 3; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ for (i = 0; i < 8; i++)
+ if (node->childs[i])
+ PrintRec (ost, node->childs[i]);
+ }
-/* ******************************* ADTree6 ******************************* */
+#endif
-ADTreeNode6 :: ADTreeNode6()
-{
- pi = 0;
- left = NULL;
- right = NULL;
- father = NULL;
- nchilds = 0;
-}
-void ADTreeNode6 :: DeleteChilds ()
-{
- if (left)
- {
- left->DeleteChilds();
- delete left;
- left = NULL;
- }
- if (right)
- {
- right->DeleteChilds();
- delete right;
- right = NULL;
- }
-}
-BlockAllocator ADTreeNode6 :: ball (sizeof (ADTreeNode6));
-void * ADTreeNode6 :: operator new(size_t)
-{
- return ball.Alloc();
-}
+ /* ******************************* ADTree6 ******************************* */
-void ADTreeNode6 :: operator delete (void * p)
-{
- ball.Free (p);
-}
+ ADTreeNode6 :: ADTreeNode6()
+ {
+ pi = -1;
+ left = NULL;
+ right = NULL;
+ father = NULL;
+ nchilds = 0;
+ }
+ void ADTreeNode6 :: DeleteChilds ()
+ {
+ if (left)
+ {
+ left->DeleteChilds();
+ delete left;
+ left = NULL;
+ }
+ if (right)
+ {
+ right->DeleteChilds();
+ delete right;
+ right = NULL;
+ }
+ }
-ADTree6 :: ADTree6 (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 6 * sizeof(float));
- memcpy (cmax, acmax, 6 * sizeof(float));
+ BlockAllocator ADTreeNode6 :: ball (sizeof (ADTreeNode6));
+ void * ADTreeNode6 :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
- root = new ADTreeNode6;
- root->sep = (cmin[0] + cmax[0]) / 2;
-}
+ void ADTreeNode6 :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree6 :: ~ADTree6 ()
-{
- root->DeleteChilds();
- delete root;
-}
-void ADTree6 :: Insert (const float * p, int pi)
-{
- ADTreeNode6 *node;
- ADTreeNode6 *next;
- int dir;
- int lr;
- float bmin[6];
- float bmax[6];
-
- memcpy (bmin, cmin, 6 * sizeof(float));
- memcpy (bmax, cmax, 6 * sizeof(float));
-#ifdef MARK
- MARK (insertloop6)
-#endif
+ ADTree6 :: ADTree6 (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 6 * sizeof(float));
+ memcpy (cmax, acmax, 6 * sizeof(float));
+
+ root = new ADTreeNode6;
+ root->sep = (cmin[0] + cmax[0]) / 2;
+ }
+
+ ADTree6 :: ~ADTree6 ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
+
+ void ADTree6 :: Insert (const float * p, int pi)
+ {
+ ADTreeNode6 *node;
+ ADTreeNode6 *next;
+ int dir;
+ int lr;
+
+ float bmin[6];
+ float bmax[6];
- next = root;
- dir = 0;
- while (next)
- {
- node = next;
+
+ memcpy (bmin, cmin, 6 * sizeof(float));
+ memcpy (bmax, cmax, 6 * sizeof(float));
- if (!node->pi)
- {
- memcpy (node->data, p, 6 * sizeof(float));
- node->pi = pi;
+ next = root;
+ dir = 0;
+ while (next)
+ {
+ node = next;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (node->pi == -1)
+ {
+ memcpy (node->data, p, 6 * sizeof(float));
+ node->pi = pi;
- return;
- }
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = node;
- if (node->sep > p[dir])
- {
- next = node->left;
- bmax[dir] = node->sep;
- lr = 0;
- }
- else
- {
- next = node->right;
- bmin[dir] = node->sep;
- lr = 1;
- }
+ return;
+ }
- dir++;
- if (dir == 6)
- dir = 0;
- }
+ if (node->sep > p[dir])
+ {
+ next = node->left;
+ bmax[dir] = node->sep;
+ lr = 0;
+ }
+ else
+ {
+ next = node->right;
+ bmin[dir] = node->sep;
+ lr = 1;
+ }
-#ifdef MARK
- MARK (insertend6)
-#endif
+ dir++;
+ if (dir == 6)
+ dir = 0;
+ }
- next = new ADTreeNode6;
- memcpy (next->data, p, 6 * sizeof(float));
- next->pi = pi;
- next->sep = (bmin[dir] + bmax[dir]) / 2;
+ next = new ADTreeNode6;
+ memcpy (next->data, p, 6 * sizeof(float));
+ next->pi = pi;
+ next->sep = (bmin[dir] + bmax[dir]) / 2;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ if (ela.Size() < pi+1)
+ ela.SetSize (pi+1);
+ ela[pi] = next;
- if (lr)
- node->right = next;
- else
- node->left = next;
- next -> father = node;
+ if (lr)
+ node->right = next;
+ else
+ node->left = next;
+ next -> father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
-void ADTree6 :: DeleteElement (int pi)
-{
- ADTreeNode6 * node = ela.Get(pi);
+ void ADTree6 :: DeleteElement (int pi)
+ {
+ ADTreeNode6 * node = ela[pi];
- node->pi = 0;
+ node->pi = -1;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree6 :: PrintMemInfo (ostream & ost) const
-{
- ost << Elements() << " elements a " << sizeof(ADTreeNode6)
- << " Bytes = "
- << Elements() * sizeof(ADTreeNode6) << endl;
- ost << "maxind = " << ela.Size() << " = " << sizeof(ADTreeNode6*) * ela.Size() << " Bytes" << endl;
-}
+ void ADTree6 :: PrintMemInfo (ostream & ost) const
+ {
+ ost << Elements() << " elements a " << sizeof(ADTreeNode6)
+ << " Bytes = "
+ << Elements() * sizeof(ADTreeNode6) << endl;
+ ost << "maxind = " << ela.Size() << " = " << sizeof(ADTreeNode6*) * ela.Size() << " Bytes" << endl;
+ }
-class inttn6 {
-public:
- int dir;
- ADTreeNode6 * node;
-};
+ class inttn6 {
+ public:
+ int dir;
+ ADTreeNode6 * node;
+ };
-void ADTree6 :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<inttn6> stack(10000);
- ADTreeNode6 * node;
- int dir, stacks;
+ void ADTree6 :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<inttn6> stack(10000);
+ ADTreeNode6 * node;
+ int dir, stacks;
- stack.SetSize (10000);
- pis.SetSize(0);
+ stack.SetSize (10000);
+ pis.SetSize(0);
- stack.Elem(1).node = root;
- stack.Elem(1).dir = 0;
- stacks = 1;
+ stack.Elem(1).node = root;
+ stack.Elem(1).dir = 0;
+ stacks = 1;
- while (stacks)
- {
- node = stack.Get(stacks).node;
- dir = stack.Get(stacks).dir;
- stacks--;
+ while (stacks)
+ {
+ node = stack.Get(stacks).node;
+ dir = stack.Get(stacks).dir;
+ stacks--;
- if (node->pi)
- {
+ if (node->pi != -1)
+ {
-// int in = 1;
-// for (i = 0; i < 3; i++)
-// if (/* node->data[i] < bmin[i] || */ node->data[i] > bmax[i] ||
-// node->data[i+3] < bmin[i+3] /* || node->data[i+3] > bmax[i+3] */ )
-// {
-// in = 0;
-// break;
-// }
-
-// if (in)
-// pis.Append (node->pi);
-
- if (node->data[0] > bmax[0] ||
- node->data[1] > bmax[1] ||
- node->data[2] > bmax[2] ||
- node->data[3] < bmin[3] ||
- node->data[4] < bmin[4] ||
- node->data[5] < bmin[5])
- ;
- else
- pis.Append (node->pi);
- }
+ // int in = 1;
+ // for (i = 0; i < 3; i++)
+ // if (/* node->data[i] < bmin[i] || */ node->data[i] > bmax[i] ||
+ // node->data[i+3] < bmin[i+3] /* || node->data[i+3] > bmax[i+3] */ )
+ // {
+ // in = 0;
+ // break;
+ // }
+
+ // if (in)
+ // pis.Append (node->pi);
+
+ if (node->data[0] > bmax[0] ||
+ node->data[1] > bmax[1] ||
+ node->data[2] > bmax[2] ||
+ node->data[3] < bmin[3] ||
+ node->data[4] < bmin[4] ||
+ node->data[5] < bmin[5])
+ ;
+ else
+ pis.Append (node->pi);
+ }
- int ndir = dir+1;
- if (ndir == 6)
- ndir = 0;
+ int ndir = dir+1;
+ if (ndir == 6)
+ ndir = 0;
- if (node->left && bmin[dir] <= node->sep)
- {
- stacks++;
- stack.Elem(stacks).node = node->left;
- stack.Elem(stacks).dir = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
- stacks++;
- stack.Elem(stacks).node = node->right;
- stack.Elem(stacks).dir = ndir;
- }
- }
-}
+ if (node->left && bmin[dir] <= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks).node = node->left;
+ stack.Elem(stacks).dir = ndir;
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks).node = node->right;
+ stack.Elem(stacks).dir = ndir;
+ }
+ }
+ }
-/*
-void ADTree6 :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode6*> stack(10000);
- static ARRAY<int> stackdir(10000);
- ADTreeNode6 * node;
- int dir, stacks;
+ /*
+ void ADTree6 :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode6*> stack(10000);
+ static ARRAY<int> stackdir(10000);
+ ADTreeNode6 * node;
+ int dir, stacks;
- stack.SetSize (10000);
- stackdir.SetSize(10000);
- pis.SetSize(0);
+ stack.SetSize (10000);
+ stackdir.SetSize(10000);
+ pis.SetSize(0);
- stack.Elem(1) = root;
- stackdir.Elem(1) = 0;
- stacks = 1;
+ stack.Elem(1) = root;
+ stackdir.Elem(1) = 0;
+ stacks = 1;
- while (stacks)
+ while (stacks)
{
- node = stack.Get(stacks);
- dir = stackdir.Get(stacks);
- stacks--;
+ node = stack.Get(stacks);
+ dir = stackdir.Get(stacks);
+ stacks--;
- if (node->pi)
- {
+ if (node->pi)
+ {
- if (node->data[0] > bmax[0] ||
- node->data[1] > bmax[1] ||
- node->data[2] > bmax[2] ||
- node->data[3] < bmin[3] ||
- node->data[4] < bmin[4] ||
- node->data[5] < bmin[5])
- ;
- else
- pis.Append (node->pi);
- }
+ if (node->data[0] > bmax[0] ||
+ node->data[1] > bmax[1] ||
+ node->data[2] > bmax[2] ||
+ node->data[3] < bmin[3] ||
+ node->data[4] < bmin[4] ||
+ node->data[5] < bmin[5])
+ ;
+ else
+ pis.Append (node->pi);
+ }
- int ndir = dir+1;
- if (ndir == 6)
- ndir = 0;
+ int ndir = dir+1;
+ if (ndir == 6)
+ ndir = 0;
- if (node->left && bmin[dir] <= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->left;
- stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
- stacks++;
- stack.Elem(stacks) = node->right;
- stackdir.Elem(stacks) = ndir;
- }
+ if (node->left && bmin[dir] <= node->sep)
+ {
+ stacks++;
+ stack.Elem(stacks) = node->left;
+ stackdir.Elem(stacks) = ndir;
}
-}
-*/
-
-
-void ADTree6 :: PrintRec (ostream & ost, const ADTreeNode6 * node) const
-{
-
- if (node->data)
+ if (node->right && bmax[dir] >= node->sep)
{
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (int i = 0; i < 6; i++)
- ost << node->data[i] << " ";
- ost << endl;
+ stacks++;
+ stack.Elem(stacks) = node->right;
+ stackdir.Elem(stacks) = ndir;
}
- if (node->left)
- PrintRec (ost, node->left);
- if (node->right)
- PrintRec (ost, node->right);
-}
+ }
+ }
+ */
-int ADTree6 :: DepthRec (const ADTreeNode6 * node) const
-{
- int ldepth = 0;
- int rdepth = 0;
-
- if (node->left)
- ldepth = DepthRec(node->left);
- if (node->right)
- rdepth = DepthRec(node->right);
- return 1 + max2 (ldepth, rdepth);
-}
+ void ADTree6 :: PrintRec (ostream & ost, const ADTreeNode6 * node) const
+ {
+
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (int i = 0; i < 6; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ if (node->left)
+ PrintRec (ost, node->left);
+ if (node->right)
+ PrintRec (ost, node->right);
+ }
-int ADTree6 :: ElementsRec (const ADTreeNode6 * node) const
-{
- int els = 1;
- if (node->left)
- els += ElementsRec(node->left);
- if (node->right)
- els += ElementsRec(node->right);
- return els;
-}
+ int ADTree6 :: DepthRec (const ADTreeNode6 * node) const
+ {
+ int ldepth = 0;
+ int rdepth = 0;
+ if (node->left)
+ ldepth = DepthRec(node->left);
+ if (node->right)
+ rdepth = DepthRec(node->right);
+ return 1 + max2 (ldepth, rdepth);
+ }
+ int ADTree6 :: ElementsRec (const ADTreeNode6 * node) const
+ {
+ int els = 1;
+ if (node->left)
+ els += ElementsRec(node->left);
+ if (node->right)
+ els += ElementsRec(node->right);
+ return els;
+ }
-/* ******************************* ADTree6F ******************************* */
-ADTreeNode6F :: ADTreeNode6F()
-{
- pi = 0;
- father = NULL;
- nchilds = 0;
- int i;
- for (i = 0; i < 64; i++)
- childs[i] = NULL;
-}
+#ifdef ABC
-void ADTreeNode6F :: DeleteChilds ()
-{
- int i;
+ /* ******************************* ADTree6F ******************************* */
- for (i = 0; i < 64; i++)
- {
- if (childs[i])
- childs[i]->DeleteChilds();
- delete childs[i];
+
+ ADTreeNode6F :: ADTreeNode6F()
+ {
+ pi = 0;
+ father = NULL;
+ nchilds = 0;
+ int i;
+ for (i = 0; i < 64; i++)
childs[i] = NULL;
- }
-}
+ }
+
+ void ADTreeNode6F :: DeleteChilds ()
+ {
+ int i;
+ for (i = 0; i < 64; i++)
+ {
+ if (childs[i])
+ childs[i]->DeleteChilds();
+ delete childs[i];
+ childs[i] = NULL;
+ }
+ }
-BlockAllocator ADTreeNode6F :: ball(sizeof (ADTreeNode6F));
-void * ADTreeNode6F :: operator new(size_t)
-{
- return ball.Alloc();
-}
+ BlockAllocator ADTreeNode6F :: ball(sizeof (ADTreeNode6F));
-void ADTreeNode6F :: operator delete (void * p)
-{
- ball.Free (p);
-}
+ void * ADTreeNode6F :: operator new(size_t)
+ {
+ return ball.Alloc();
+ }
+ void ADTreeNode6F :: operator delete (void * p)
+ {
+ ball.Free (p);
+ }
-ADTree6F :: ADTree6F (const float * acmin,
- const float * acmax)
- : ela(0)
-{
- memcpy (cmin, acmin, 6 * sizeof(float));
- memcpy (cmax, acmax, 6 * sizeof(float));
- root = new ADTreeNode6F;
- for (int i = 0; i < 6; i++)
- root->sep[i] = (cmin[i] + cmax[i]) / 2;
-}
+ ADTree6F :: ADTree6F (const float * acmin,
+ const float * acmax)
+ : ela(0)
+ {
+ memcpy (cmin, acmin, 6 * sizeof(float));
+ memcpy (cmax, acmax, 6 * sizeof(float));
-ADTree6F :: ~ADTree6F ()
-{
- root->DeleteChilds();
- delete root;
-}
+ root = new ADTreeNode6F;
+ for (int i = 0; i < 6; i++)
+ root->sep[i] = (cmin[i] + cmax[i]) / 2;
+ }
+ ADTree6F :: ~ADTree6F ()
+ {
+ root->DeleteChilds();
+ delete root;
+ }
-void ADTree6F :: Insert (const float * p, int pi)
-{
- ADTreeNode6F *node;
- ADTreeNode6F *next;
- int lr;
- float bmin[6];
- float bmax[6];
- int i, dir;
-
- memcpy (bmin, cmin, 6 * sizeof(float));
- memcpy (bmax, cmax, 6 * sizeof(float));
+ void ADTree6F :: Insert (const float * p, int pi)
+ {
+ ADTreeNode6F *node;
+ ADTreeNode6F *next;
+ int lr;
-#ifdef MARK
- // MARK (insertloop3)
-#endif
+ float bmin[6];
+ float bmax[6];
+ int i, dir;
+
+ memcpy (bmin, cmin, 6 * sizeof(float));
+ memcpy (bmax, cmax, 6 * sizeof(float));
- next = root;
- while (next)
- {
- node = next;
+ next = root;
+ while (next)
+ {
+ node = next;
- if (!node->pi)
- {
- memcpy (node->data, p, 6 * sizeof(float));
- node->pi = pi;
+ if (!node->pi)
+ {
+ memcpy (node->data, p, 6 * sizeof(float));
+ node->pi = pi;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = node;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = node;
- return;
- }
+ return;
+ }
- dir = 0;
- for (i = 0; i < 6; i++)
- {
- if (node->sep[i] > p[i])
- {
- bmax[i] = node->sep[i];
- }
- else
- {
- bmin[i] = node->sep[i];
- dir += (1 << i);
- }
- }
- next = node->childs[dir];
+ dir = 0;
+ for (i = 0; i < 6; i++)
+ {
+ if (node->sep[i] > p[i])
+ {
+ bmax[i] = node->sep[i];
+ }
+ else
+ {
+ bmin[i] = node->sep[i];
+ dir += (1 << i);
+ }
+ }
+ next = node->childs[dir];
- /*
- if (node->sep > p[dir])
- {
+ /*
+ if (node->sep > p[dir])
+ {
next = node->left;
bmax[dir] = node->sep;
lr = 0;
- }
- else
- {
+ }
+ else
+ {
next = node->right;
bmin[dir] = node->sep;
lr = 1;
- }
- */
- }
+ }
+ */
+ }
- next = new ADTreeNode6F;
- memcpy (next->data, p, 6 * sizeof(float));
- next->pi = pi;
+ next = new ADTreeNode6F;
+ memcpy (next->data, p, 6 * sizeof(float));
+ next->pi = pi;
- for (i = 0; i < 6; i++)
- next->sep[i] = (bmin[i] + bmax[i]) / 2;
+ for (i = 0; i < 6; i++)
+ next->sep[i] = (bmin[i] + bmax[i]) / 2;
- if (ela.Size() < pi)
- ela.SetSize (pi);
- ela.Elem(pi) = next;
+ if (ela.Size() < pi)
+ ela.SetSize (pi);
+ ela.Elem(pi) = next;
- node->childs[dir] = next;
- next->father = node;
+ node->childs[dir] = next;
+ next->father = node;
- while (node)
- {
- node->nchilds++;
- node = node->father;
- }
-}
+ while (node)
+ {
+ node->nchilds++;
+ node = node->father;
+ }
+ }
-void ADTree6F :: DeleteElement (int pi)
-{
- ADTreeNode6F * node = ela.Get(pi);
+ void ADTree6F :: DeleteElement (int pi)
+ {
+ ADTreeNode6F * node = ela.Get(pi);
- node->pi = 0;
+ node->pi = 0;
- node = node->father;
- while (node)
- {
- node->nchilds--;
- node = node->father;
- }
-}
+ node = node->father;
+ while (node)
+ {
+ node->nchilds--;
+ node = node->father;
+ }
+ }
-void ADTree6F :: GetIntersecting (const float * bmin,
- const float * bmax,
- ARRAY<int> & pis) const
-{
- static ARRAY<ADTreeNode6F*> stack(1000);
- ADTreeNode6F * node;
- int dir, i, stacks;
+ void ADTree6F :: GetIntersecting (const float * bmin,
+ const float * bmax,
+ ARRAY<int> & pis) const
+ {
+ static ARRAY<ADTreeNode6F*> stack(1000);
+ ADTreeNode6F * node;
+ int dir, i, stacks;
- stack.SetSize (1000);
- pis.SetSize(0);
+ stack.SetSize (1000);
+ pis.SetSize(0);
- stack.Elem(1) = root;
- stacks = 1;
+ stack.Elem(1) = root;
+ stacks = 1;
- while (stacks)
- {
- node = stack.Get(stacks);
- stacks--;
+ while (stacks)
+ {
+ node = stack.Get(stacks);
+ stacks--;
- if (node->pi)
- {
- if (
- node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
- node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
- node->data[2] >= bmin[2] && node->data[2] <= bmax[2] &&
- node->data[3] >= bmin[3] && node->data[3] <= bmax[3] &&
- node->data[4] >= bmin[4] && node->data[4] <= bmax[4] &&
- node->data[5] >= bmin[5] && node->data[5] <= bmax[5]
- )
-
- pis.Append (node->pi);
- }
+ if (node->pi)
+ {
+ if (
+ node->data[0] >= bmin[0] && node->data[0] <= bmax[0] &&
+ node->data[1] >= bmin[1] && node->data[1] <= bmax[1] &&
+ node->data[2] >= bmin[2] && node->data[2] <= bmax[2] &&
+ node->data[3] >= bmin[3] && node->data[3] <= bmax[3] &&
+ node->data[4] >= bmin[4] && node->data[4] <= bmax[4] &&
+ node->data[5] >= bmin[5] && node->data[5] <= bmax[5]
+ )
+
+ pis.Append (node->pi);
+ }
- int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
- int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
- int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
- int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
- int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
- int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
-
- int i4min = (bmin[3] <= node->sep[3]) ? 0 : 1;
- int i4max = (bmax[3] < node->sep[3]) ? 0 : 1;
- int i5min = (bmin[4] <= node->sep[4]) ? 0 : 1;
- int i5max = (bmax[4] < node->sep[4]) ? 0 : 1;
- int i6min = (bmin[5] <= node->sep[5]) ? 0 : 1;
- int i6max = (bmax[5] < node->sep[5]) ? 0 : 1;
-
- int i1, i2, i3, i4, i5, i6;
- for (i1 = i1min; i1 <= i1max; i1++)
- for (i2 = i2min; i2 <= i2max; i2++)
- for (i3 = i3min; i3 <= i3max; i3++)
- for (i4 = i4min; i4 <= i4max; i4++)
- for (i5 = i5min; i5 <= i5max; i5++)
- for (i6 = i6min; i6 <= i6max; i6++)
- {
- i = i1 + 2*i2 + 4*i3 + 8*i4 + 16*i5 +32*i6;
- if (node->childs[i])
- {
- stacks++;
- stack.Elem(stacks) = node->childs[i];
- }
- }
+ int i1min = (bmin[0] <= node->sep[0]) ? 0 : 1;
+ int i1max = (bmax[0] < node->sep[0]) ? 0 : 1;
+ int i2min = (bmin[1] <= node->sep[1]) ? 0 : 1;
+ int i2max = (bmax[1] < node->sep[1]) ? 0 : 1;
+ int i3min = (bmin[2] <= node->sep[2]) ? 0 : 1;
+ int i3max = (bmax[2] < node->sep[2]) ? 0 : 1;
+
+ int i4min = (bmin[3] <= node->sep[3]) ? 0 : 1;
+ int i4max = (bmax[3] < node->sep[3]) ? 0 : 1;
+ int i5min = (bmin[4] <= node->sep[4]) ? 0 : 1;
+ int i5max = (bmax[4] < node->sep[4]) ? 0 : 1;
+ int i6min = (bmin[5] <= node->sep[5]) ? 0 : 1;
+ int i6max = (bmax[5] < node->sep[5]) ? 0 : 1;
+
+ int i1, i2, i3, i4, i5, i6;
+ for (i1 = i1min; i1 <= i1max; i1++)
+ for (i2 = i2min; i2 <= i2max; i2++)
+ for (i3 = i3min; i3 <= i3max; i3++)
+ for (i4 = i4min; i4 <= i4max; i4++)
+ for (i5 = i5min; i5 <= i5max; i5++)
+ for (i6 = i6min; i6 <= i6max; i6++)
+ {
+ i = i1 + 2*i2 + 4*i3 + 8*i4 + 16*i5 +32*i6;
+ if (node->childs[i])
+ {
+ stacks++;
+ stack.Elem(stacks) = node->childs[i];
+ }
+ }
- /*
- if (node->left && bmin[dir] <= node->sep)
- {
+ /*
+ if (node->left && bmin[dir] <= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->left;
stackdir.Elem(stacks) = ndir;
- }
- if (node->right && bmax[dir] >= node->sep)
- {
+ }
+ if (node->right && bmax[dir] >= node->sep)
+ {
stacks++;
stack.Elem(stacks) = node->right;
stackdir.Elem(stacks) = ndir;
- }
- */
- }
-}
-
-void ADTree6F :: PrintRec (ostream & ost, const ADTreeNode6F * node) const
-{
- int i;
- if (node->data)
- {
- ost << node->pi << ": ";
- ost << node->nchilds << " childs, ";
- for (i = 0; i < 6; i++)
- ost << node->data[i] << " ";
- ost << endl;
- }
-
- for (i = 0; i < 64; i++)
- if (node->childs[i])
- PrintRec (ost, node->childs[i]);
-}
-
+ }
+ */
+ }
+ }
+ void ADTree6F :: PrintRec (ostream & ost, const ADTreeNode6F * node) const
+ {
+ int i;
+ if (node->data)
+ {
+ ost << node->pi << ": ";
+ ost << node->nchilds << " childs, ";
+ for (i = 0; i < 6; i++)
+ ost << node->data[i] << " ";
+ ost << endl;
+ }
+ for (i = 0; i < 64; i++)
+ if (node->childs[i])
+ PrintRec (ost, node->childs[i]);
+ }
-/* ************************************* Point3dTree ********************** */
+#endif
-Point3dTree :: Point3dTree (const Point3d & pmin, const Point3d & pmax)
-{
- float pmi[3], pma[3];
- for (int i = 0; i < 3; i++)
- {
- pmi[i] = pmin.X(i+1);
- pma[i] = pmax.X(i+1);
- }
- tree = new ADTree3 (pmi, pma);
-}
-Point3dTree :: ~Point3dTree ()
-{
- delete tree;
-}
+ /* ************************************* Point3dTree ********************** */
-void Point3dTree :: Insert (const Point3d & p, int pi)
-{
- static float pd[3];
- pd[0] = p.X();
- pd[1] = p.Y();
- pd[2] = p.Z();
- tree->Insert (pd, pi);
-}
-void Point3dTree :: GetIntersecting (const Point3d & pmin, const Point3d & pmax,
- ARRAY<int> & pis) const
-{
- float pmi[3], pma[3];
- for (int i = 0; i < 3; i++)
- {
- pmi[i] = pmin.X(i+1);
- pma[i] = pmax.X(i+1);
- }
- tree->GetIntersecting (pmi, pma, pis);
-}
+ Point3dTree :: Point3dTree (const Point3d & pmin, const Point3d & pmax)
+ {
+ float pmi[3], pma[3];
+ for (int i = 0; i < 3; i++)
+ {
+ pmi[i] = pmin.X(i+1);
+ pma[i] = pmax.X(i+1);
+ }
+ tree = new ADTree3 (pmi, pma);
+ }
+
+ Point3dTree :: ~Point3dTree ()
+ {
+ delete tree;
+ }
+
+
+
+ void Point3dTree :: Insert (const Point3d & p, int pi)
+ {
+ static float pd[3];
+ pd[0] = p.X();
+ pd[1] = p.Y();
+ pd[2] = p.Z();
+ tree->Insert (pd, pi);
+ }
+
+ void Point3dTree :: GetIntersecting (const Point3d & pmin, const Point3d & pmax,
+ ARRAY<int> & pis) const
+ {
+ float pmi[3], pma[3];
+ for (int i = 0; i < 3; i++)
+ {
+ pmi[i] = pmin.X(i+1);
+ pma[i] = pmax.X(i+1);
+ }
+ tree->GetIntersecting (pmi, pma, pis);
+ }
@@ -2240,53 +2193,53 @@ void Point3dTree :: GetIntersecting (const Point3d & pmin, const Point3d & pmax,
-Box3dTree :: Box3dTree (const Point3d & apmin, const Point3d & apmax)
-{
- boxpmin = apmin;
- boxpmax = apmax;
- float tpmin[6], tpmax[6];
- for (int i = 0; i < 3; i++)
- {
- tpmin[i] = tpmin[i+3] = boxpmin.X(i+1);
- tpmax[i] = tpmax[i+3] = boxpmax.X(i+1);
- }
- tree = new ADTree6 (tpmin, tpmax);
-}
+ Box3dTree :: Box3dTree (const Point3d & apmin, const Point3d & apmax)
+ {
+ boxpmin = apmin;
+ boxpmax = apmax;
+ float tpmin[6], tpmax[6];
+ for (int i = 0; i < 3; i++)
+ {
+ tpmin[i] = tpmin[i+3] = boxpmin.X(i+1);
+ tpmax[i] = tpmax[i+3] = boxpmax.X(i+1);
+ }
+ tree = new ADTree6 (tpmin, tpmax);
+ }
-Box3dTree :: ~Box3dTree ()
-{
- delete tree;
-}
+ Box3dTree :: ~Box3dTree ()
+ {
+ delete tree;
+ }
-void Box3dTree :: Insert (const Point3d & bmin, const Point3d & bmax, int pi)
-{
- static float tp[6];
+ void Box3dTree :: Insert (const Point3d & bmin, const Point3d & bmax, int pi)
+ {
+ static float tp[6];
- for (int i = 0; i < 3; i++)
- {
- tp[i] = bmin.X(i+1);
- tp[i+3] = bmax.X(i+1);
- }
+ for (int i = 0; i < 3; i++)
+ {
+ tp[i] = bmin.X(i+1);
+ tp[i+3] = bmax.X(i+1);
+ }
- tree->Insert (tp, pi);
-}
+ tree->Insert (tp, pi);
+ }
-void Box3dTree ::GetIntersecting (const Point3d & pmin, const Point3d & pmax,
- ARRAY<int> & pis) const
-{
- float tpmin[6];
- float tpmax[6];
+ void Box3dTree ::GetIntersecting (const Point3d & pmin, const Point3d & pmax,
+ ARRAY<int> & pis) const
+ {
+ float tpmin[6];
+ float tpmax[6];
- for (int i = 0; i < 3; i++)
- {
- tpmin[i] = boxpmin.X(i+1);
- tpmax[i] = pmax.X(i+1);
+ for (int i = 0; i < 3; i++)
+ {
+ tpmin[i] = boxpmin.X(i+1);
+ tpmax[i] = pmax.X(i+1);
- tpmin[i+3] = pmin.X(i+1);
- tpmax[i+3] = boxpmax.X(i+1);
- }
+ tpmin[i+3] = pmin.X(i+1);
+ tpmax[i+3] = boxpmax.X(i+1);
+ }
- tree->GetIntersecting (tpmin, tpmax, pis);
-}
+ tree->GetIntersecting (tpmin, tpmax, pis);
+ }
}
diff --git a/Netgen/libsrc/gprim/adtree.hpp b/Netgen/libsrc/gprim/adtree.hpp
index d28f873086..64f3509e1a 100644
--- a/Netgen/libsrc/gprim/adtree.hpp
+++ b/Netgen/libsrc/gprim/adtree.hpp
@@ -124,7 +124,7 @@ public:
};
-
+/*
// divide each direction
#define ADTN_DIV 10
@@ -320,7 +320,7 @@ public:
-
+*/
@@ -380,7 +380,7 @@ public:
-
+/*
class ADTreeNode6F
{
@@ -436,7 +436,7 @@ public:
-
+*/
diff --git a/Netgen/libsrc/gprim/geom3d.cpp b/Netgen/libsrc/gprim/geom3d.cpp
index b243e62c3a..eaee776778 100644
--- a/Netgen/libsrc/gprim/geom3d.cpp
+++ b/Netgen/libsrc/gprim/geom3d.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
#include <mystdlib.h>
#include <myadt.hpp>
@@ -175,6 +176,15 @@ Box3d :: Box3d ( const Box3d & b2 )
}
}
+Box3d :: Box3d ( const Box<3> & b2 )
+{
+ for (int i = 0; i < 3; i++)
+ {
+ minx[i] = b2.PMin()(i);
+ maxx[i] = b2.PMax()(i);
+ }
+}
+
/*
int Box3d :: Intersect (const Box3d & box2) const
diff --git a/Netgen/libsrc/gprim/geom3d.hpp b/Netgen/libsrc/gprim/geom3d.hpp
index fd60e6b26f..56bff4ad6b 100644
--- a/Netgen/libsrc/gprim/geom3d.hpp
+++ b/Netgen/libsrc/gprim/geom3d.hpp
@@ -417,11 +417,13 @@ inline Vec3d & Vec3d :: operator/= (double s)
x[1] /= s;
x[2] /= s;
}
+#ifdef DEBUG
else
{
cerr << "Vec div by 0, v = " << (*this) << endl;
// MyError ("Vec3d::operator /=: Divisioin by zero");
}
+#endif
return *this;
}
@@ -571,6 +573,8 @@ public:
///
Box3d (const Point3d& p1, const Point3d& p2);
///
+ Box3d (const Box<3> & b2);
+ ///
double MinX () const { return minx[0]; }
///
double MaxX () const { return maxx[0]; }
diff --git a/Netgen/libsrc/gprim/geomfuncs.hpp b/Netgen/libsrc/gprim/geomfuncs.hpp
index b013261df8..b9228c8583 100644
--- a/Netgen/libsrc/gprim/geomfuncs.hpp
+++ b/Netgen/libsrc/gprim/geomfuncs.hpp
@@ -115,8 +115,15 @@ inline void CalcInverse (const Mat<2,3> & m, Mat<3,2> & inv)
inv = Trans (m) * ainv;
}
-// void CalcInverse (const Mat<3,2> & m, Mat<2,3> & inv);
+void CalcInverse (const Mat<3,2> & m, Mat<2,3> & inv);
+inline void CalcInverse (const Mat<3,2> & m, Mat<2,3> & inv)
+{
+ Mat<2,2> a = Trans (m) * m;
+ Mat<2,2> ainv;
+ CalcInverse (a, ainv);
+ inv = ainv * Trans (m);
+}
double Det (const Mat<2,2> & m);
diff --git a/Netgen/libsrc/gprim/geomobjects.hpp b/Netgen/libsrc/gprim/geomobjects.hpp
index 9f6a8f025b..2db82cf9e9 100644
--- a/Netgen/libsrc/gprim/geomobjects.hpp
+++ b/Netgen/libsrc/gprim/geomobjects.hpp
@@ -74,6 +74,10 @@ public:
explicit Vec (const Point<D> & p)
{ for (int i = 0; i < D; i++) x[i] = p(i); }
+ Vec (const Vec<D> & p1, const Vec<D> & p2)
+ { for(int i=0; i<D; i++) x[i] = p2(i)-p1(1); }
+
+
Vec & operator= (const Vec<D> & p2)
{
@@ -150,6 +154,8 @@ public:
double & operator() (int i, int j) { return x[i*W+j]; }
const double & operator() (int i, int j) const { return x[i*W+j]; }
+ double & operator() (int i) { return x[i]; }
+ const double & operator() (int i) const { return x[i]; }
Vec<H> Col (int i) const
{
@@ -273,6 +279,13 @@ protected:
public:
///
BoxSphere () { };
+ ///
+ BoxSphere (const Box<D> & box)
+ : Box<D> (box)
+ {
+ CalcDiamCenter();
+ };
+
///
BoxSphere ( Point<D> pmin, Point<D> pmax )
: Box<D> (pmin, pmax)
diff --git a/Netgen/libsrc/gprim/geomops.hpp b/Netgen/libsrc/gprim/geomops.hpp
index 0b783c076b..755f35a878 100644
--- a/Netgen/libsrc/gprim/geomops.hpp
+++ b/Netgen/libsrc/gprim/geomops.hpp
@@ -287,6 +287,23 @@ inline Mat<3,2> operator* (const Mat<3,2> & a, const Mat<2,2> & b)
return m;
}
+
+
+inline Mat<2,3> operator* (const Mat<2,2> & a, const Mat<2,3> & b)
+{
+ Mat<2,3> m;
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 3; j++)
+ {
+ double sum = 0;
+ for (int k = 0; k < 2; k++)
+ sum += a(i,k) * b(k, j);
+ m(i,j) = sum;
+ }
+ return m;
+}
+
+
inline Mat<3,3> operator* (const Mat<3,3> & a, const Mat<3,3> & b)
{
Mat<3,3> m;
diff --git a/Netgen/libsrc/gprim/transform3d.cpp b/Netgen/libsrc/gprim/transform3d.cpp
index 40ef4e3b2a..ea62fffe5a 100644
--- a/Netgen/libsrc/gprim/transform3d.cpp
+++ b/Netgen/libsrc/gprim/transform3d.cpp
@@ -54,6 +54,7 @@ Transformation3d (const Point3d & c, double alpha,
ht.Combine (ht2, r1);
Combine (ht, tcinv);
+ cout << "Rotation - Transformation:" << (*this) << endl;
// (*testout) << "Rotation - Transformation:" << (*this) << endl;
}
diff --git a/Netgen/libsrc/gprim/transform3d.hpp b/Netgen/libsrc/gprim/transform3d.hpp
index 9eccc5a7f9..7472257297 100644
--- a/Netgen/libsrc/gprim/transform3d.hpp
+++ b/Netgen/libsrc/gprim/transform3d.hpp
@@ -93,7 +93,27 @@ public:
// rotation with ...
Transformation (const Point<D> & c, double alpha, double beta, double gamma)
{
- ;
+ // total = T_c x Rot_0 x T_c^{-1}
+ // Use Euler angles, see many books from tech mech, e.g.
+ // Shabana "multibody systems"
+
+ Vec<D> vc(c);
+ Transformation<D> tc(vc);
+ Transformation<D> tcinv(-vc);
+ // tc.CalcInverse (tcinv);
+
+ Transformation<D> r1, r2, r3, ht, ht2;
+ r1.SetAxisRotation (3, alpha);
+ r2.SetAxisRotation (1, beta);
+ r3.SetAxisRotation (3, gamma);
+
+ ht.Combine (tc, r3);
+ ht2.Combine (ht, r2);
+ ht.Combine (ht2, r1);
+ Combine (ht, tcinv);
+
+ // cout << "Rotation - Transformation:" << (*this) << endl;
+ // (*testout) << "Rotation - Transformation:" << (*this) << endl;
}
///
@@ -106,8 +126,31 @@ public:
m = ta.m * tb.m;
}
+
+
/// dir = 1..3 (== x..z)
- void SetAxisRotation (int dir, double alpha);
+ void SetAxisRotation (int dir, double alpha)
+ {
+ double co = cos(alpha);
+ double si = sin(alpha);
+ dir--;
+ int pos1 = (dir+1) % 3;
+ int pos2 = (dir+2) % 3;
+
+ int i, j;
+ for (i = 0; i <= 2; i++)
+ {
+ v(i) = 0;
+ for (j = 0; j <= 2; j++)
+ m(i,j) = 0;
+ }
+
+ m(dir,dir) = 1;
+ m(pos1, pos1) = co;
+ m(pos2, pos2) = co;
+ m(pos1, pos2) = si;
+ m(pos2, pos1) = -si;
+ }
///
void Transform (const Point<D> & from, Point<D> & to) const
diff --git a/Netgen/libsrc/include/FlexLexer.h b/Netgen/libsrc/include/FlexLexer.h
index abc6b53625..4b9b53cd13 100644
--- a/Netgen/libsrc/include/FlexLexer.h
+++ b/Netgen/libsrc/include/FlexLexer.h
@@ -1,4 +1,4 @@
-// $Header: /cvsroot/gmsh/Netgen/libsrc/include/FlexLexer.h,v 1.1 2004-06-26 18:03:24 geuzaine Exp $
+// $Header: /cvsroot/gmsh/Netgen/libsrc/include/FlexLexer.h,v 1.2 2004-12-08 20:01:21 geuzaine Exp $
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
diff --git a/Netgen/libsrc/include/mystdlib.h b/Netgen/libsrc/include/mystdlib.h
index 8c5544407c..2249aea3a2 100644
--- a/Netgen/libsrc/include/mystdlib.h
+++ b/Netgen/libsrc/include/mystdlib.h
@@ -31,6 +31,7 @@
#include <new>
#include <string>
+#include <typeinfo>
#ifndef M_PI
#define M_PI 3.14159265358979323846
diff --git a/Netgen/libsrc/interface/Makefile b/Netgen/libsrc/interface/Makefile
index 98d943a028..c47dbe2c5a 100644
--- a/Netgen/libsrc/interface/Makefile
+++ b/Netgen/libsrc/interface/Makefile
@@ -1,4 +1,4 @@
-src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp readuser.cpp importsolution.cpp
+src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp
#
lib = nginterface
libpath = libsrc/interface
diff --git a/Netgen/libsrc/interface/nginterface.cpp b/Netgen/libsrc/interface/nginterface.cpp
index 5510f28a27..34182721ea 100644
--- a/Netgen/libsrc/interface/nginterface.cpp
+++ b/Netgen/libsrc/interface/nginterface.cpp
@@ -6,12 +6,18 @@
#include <geometry2d.hpp>
#include <stlgeom.hpp>
-#include <visual.hpp>
+#ifdef OCCGEOMETRY
+#include <occgeom.hpp>
+#endif
+
+
+//#include <visual.hpp>
#include "nginterface.h"
// #include <FlexLexer.h>
+// #include <mystdlib.h>
namespace netgen
@@ -20,12 +26,16 @@ namespace netgen
extern VisualSceneMesh vsmesh;
extern Tcl_Interp * tcl_interp;
- extern SplineGeometry2d * geometry2d;
- extern CSGeometry * parsegeom;
- extern CSGeometry * geometry;
+ extern AutoPtr<SplineGeometry2d> geometry2d;
+ extern AutoPtr<CSGeometry> geometry;
extern STLGeometry * stlgeometry;
+#ifdef OCCGEOMETRY
+ extern OCCGeometry * occgeometry;
+#endif
+#ifdef OPENGL
extern VisualSceneSolution vssolution;
+#endif
extern CSGeometry * ParseCSG (istream & istr);
}
@@ -47,50 +57,81 @@ void Ng_LoadGeometry (char * filename)
{
ifstream infile (filename);
- if (geometry)
- delete geometry;
+ geometry.Reset ();
+ geometry2d.Reset ();
- if (strcmp (&filename[strlen(filename)-3], "geo") == 0)
- {
- /*
- geometry = new CSGeometry(filename);
-
- parsegeom = geometry;
-
- lexer = new yyFlexLexer (&infile);
-
- extern int yyparse ();
- yyparse ();
- delete lexer;
- */
+#ifdef OCCGEOMETRY
+ delete occgeometry;
+ occgeometry = 0;
+#endif
- geometry = netgen::ParseCSG (infile);
+ if ((strcmp (&filename[strlen(filename)-3], "geo") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "GEO") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "Geo") == 0))
+ {
+ geometry.Reset (netgen::ParseCSG (infile));
if (!geometry)
- throw NgException ("input file not found");
+ {
+ geometry.Reset (new CSGeometry ());
+ throw NgException ("input file not found");
+ }
geometry -> FindIdenticSurfaces(1e-6);
+
+ double detail = atof (Tcl_GetVar (tcl_interp, "geooptions.detail", 0));
+ double facets = atof (Tcl_GetVar (tcl_interp, "geooptions.facets", 0));
Box<3> box (geometry->BoundingBox());
+
+ if (atoi (Tcl_GetVar (tcl_interp, "geooptions.drawcsg", 0)))
+ geometry->CalcTriangleApproximation(box, detail, facets);
- geometry->CalcTriangleApproximation (box, 0.01, 10);
+ // geometry->CalcTriangleApproximation (box, 0.01, 10);
}
- else
- {
- geometry = new CSGeometry("");
- if (strcmp (&filename[strlen(filename)-4], "in2d") == 0)
- {
+ else if (strcmp (&filename[strlen(filename)-4], "in2d") == 0)
+ {
+ geometry2d.Reset (new SplineGeometry2d());
+ geometry2d -> Load (filename);
+ }
- if (geometry2d)
- delete geometry2d;
- geometry2d = new SplineGeometry2d();
- geometry2d -> Load (filename);
- }
+ else if ((strcmp (&filename[strlen(filename)-3], "stl") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "STL") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "Stl") == 0))
+ {
+ ifstream infile(filename);
+ stlgeometry = STLGeometry :: Load (infile);
+ stlgeometry->edgesfound = 0;
+ Mesh meshdummy;
+ stlgeometry->Clear();
+ stlgeometry->BuildEdges();
+ stlgeometry->MakeAtlas(meshdummy);
+ stlgeometry->CalcFaceNums();
+ stlgeometry->AddFaceEdges();
+ stlgeometry->LinkEdges();
+ }
- else
- {
- cerr << "Unknown geometry extension!!" << endl;
- }
+#ifdef OCCGEOMETRY
+ else if ((strcmp (&filename[strlen(filename)-4], "iges") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "igs") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "IGS") == 0) ||
+ (strcmp (&filename[strlen(filename)-4], "IGES") == 0))
+ {
+ PrintMessage (1, "Load IGES geometry file ", filename);
+ occgeometry = LoadOCC_IGES (filename);
+ }
+ else if ((strcmp (&filename[strlen(filename)-4], "step") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "stp") == 0) ||
+ (strcmp (&filename[strlen(filename)-3], "STP") == 0) ||
+ (strcmp (&filename[strlen(filename)-4], "STEP") == 0))
+ {
+ PrintMessage (1, "Load STEP geometry file ", filename);
+ occgeometry = LoadOCC_STEP (filename);
+ }
+#endif
+ else
+ {
+ cerr << "Unknown geometry extension!!" << endl;
}
}
@@ -293,7 +334,7 @@ NG_ELEMENT_TYPE Ng_GetSurfaceElement (int ei, int * epi, int * np)
{
const Segment & seg = mesh->LineSegment (ei);
- if (!seg.pmid)
+ if (seg.pmid < 0)
{
epi[0] = seg.p1;
epi[1] = seg.p2;
@@ -329,6 +370,8 @@ void Ng_GetNormalVector (int sei, int locpi, double * nv)
nv[0] = 0;
nv[1] = 0;
nv[2] = 1;
+
+ (*testout) << "Ng_GetNormalVector (sei = " << sei << ", locpi = " << locpi << ")" << endl;
if (mesh->GetDimension() == 3)
{
@@ -337,9 +380,24 @@ void Ng_GetNormalVector (int sei, int locpi, double * nv)
p = mesh->Point (mesh->SurfaceElement(sei).PNum(locpi));
int surfi = mesh->GetFaceDescriptor(mesh->SurfaceElement(sei).GetIndex()).SurfNr();
+
+ (*testout) << "surfi = " << surfi << endl;
+#ifdef OCCGEOMETRY
+ if (occgeometry)
+ {
+ PointGeomInfo gi = mesh->SurfaceElement(sei).GeomInfoPi(locpi);
+ occgeometry->GetSurface (surfi).GetNormalVector(p, gi, n);
+ nv[0] = n(0);
+ nv[1] = n(1);
+ nv[2] = n(2);
+ }
+ else
+#endif
if (geometry)
{
- geometry->GetSurface (surfi) -> GetNormalVector(p, n);
+ (*testout) << "geometry defined" << endl;
+ n = geometry->GetSurface (surfi) -> GetNormalVector(p);
+ (*testout) << "aus is" << endl;
nv[0] = n(0);
nv[1] = n(1);
nv[2] = n(2);
@@ -348,13 +406,13 @@ void Ng_GetNormalVector (int sei, int locpi, double * nv)
}
-int Ng_FindElementOfPoint (double * p, double * lami)
+int Ng_FindElementOfPoint (double * p, double * lami, int build_searchtree, int index)
{
if (mesh->GetDimension() == 3)
{
Point3d p3d(p[0], p[1], p[2]);
int ind =
- mesh->GetElementOfPoint(p3d, lami);
+ mesh->GetElementOfPoint(p3d, lami, build_searchtree != 0, index);
return ind;
}
else
@@ -362,7 +420,7 @@ int Ng_FindElementOfPoint (double * p, double * lami)
double lam3[3];
Point3d p2d(p[0], p[1], 0);
int ind =
- mesh->GetElementOfPoint(p2d, lam3);
+ mesh->GetElementOfPoint(p2d, lam3, build_searchtree != 0, index);
lami[0] = lam3[0];
lami[1] = lam3[1];
return ind;
@@ -382,7 +440,6 @@ void Ng_GetElementTransformation (int ei, const double * xi,
mesh->GetCurvedElements().CalcSurfaceTransformation (xl, ei-1, xg, dx);
- // still 1-based arrays
if (x)
{
for (int i = 0; i < 2; i++)
@@ -471,6 +528,12 @@ void Ng_GetSurfaceElementTransformation (int sei, const double * xi,
+void Ng_GetSurfaceElementNeighbouringDomains(const int selnr, int & in, int & out)
+{
+ in = mesh->GetFaceDescriptor((*mesh)[static_cast<SurfaceElementIndex>(selnr)].GetIndex()).DomainIn();
+ out = mesh->GetFaceDescriptor((*mesh)[static_cast<SurfaceElementIndex>(selnr)].GetIndex()).DomainOut();
+}
+
void Ng_SetRefinementFlag (int ei, int flag)
{
@@ -491,33 +554,34 @@ void Ng_Refine (NG_REFINEMENT_TYPE reftype)
{
BisectionOptions biopt;
biopt.usemarkedelements = 1;
+ biopt.refine_p = 0;
biopt.refine_hp = 0;
- if (reftype == NG_REFINE_P || reftype == NG_REFINE_HP)
+ if (reftype == NG_REFINE_P)
+ biopt.refine_p = 1;
+ if (reftype == NG_REFINE_HP)
biopt.refine_hp = 1;
+ Refinement * ref;
- if (geometry && mesh->GetDimension() == 3)
- {
- RefinementSurfaces ref (*geometry);
- ref.Bisect (*mesh, biopt);
- }
+ if (geometry2d)
+ ref = new Refinement2d(*geometry2d);
else if (stlgeometry)
- {
- RefinementSTLGeometry ref (*stlgeometry);
- ref.Bisect (*mesh, biopt);
- }
- else if (geometry2d)
- {
- Refinement2d ref (*geometry2d);
- ref.Bisect (*mesh, biopt);
- }
+ ref = new RefinementSTLGeometry(*stlgeometry);
+#ifdef OCCGEOMETRY
+ else if (occgeometry)
+ ref = new OCCRefinementSurfaces (*occgeometry);
+#endif
+ else if (geometry && mesh->GetDimension() == 3)
+ ref = new RefinementSurfaces(*geometry);
else
{
- cout << "No geometry available" << endl;
- Refinement ref;
- ref.Bisect (*mesh, biopt);
+ ref = new Refinement();
}
+ ref -> Bisect (*mesh, biopt);
+
mesh -> UpdateTopology();
+ // mesh -> GetCurvedElements().BuildCurvedElements (ref, mparam.elementorder);
+ delete ref;
}
void Ng_SecondOrder ()
@@ -552,7 +616,17 @@ void Ng_SecondOrder ()
void Ng_HPRefinement (int levels)
{
- HPRefinement (*mesh, levels);
+ Refinement * ref;
+
+ if (stlgeometry)
+ ref = new RefinementSTLGeometry (*stlgeometry);
+ else if (geometry2d)
+ ref = new Refinement2d (*geometry2d);
+ else
+ ref = new RefinementSurfaces (*geometry);
+
+
+ HPRefinement (*mesh, ref, levels);
}
@@ -562,6 +636,10 @@ void Ng_HighOrder (int order)
if (stlgeometry)
ref = new RefinementSTLGeometry (*stlgeometry);
+#ifdef OCCGEOMETRY
+ else if (occgeometry)
+ ref = new OCCRefinementSurfaces (*occgeometry);
+#endif
else if (geometry2d)
ref = new Refinement2d (*geometry2d);
else
@@ -1019,6 +1097,26 @@ void Ng_GetEdge_Vertices (int ednr, int * vert)
}
+int Ng_GetNVertexElements (int vnr)
+{
+ if (mesh->GetDimension() == 3)
+ return mesh->GetTopology().GetVertexElements(vnr).Size();
+ else
+ return mesh->GetTopology().GetVertexSurfaceElements(vnr).Size();
+}
+
+void Ng_GetVertexElements (int vnr, int * els)
+{
+ FlatArray<int> ia(0,0);
+ if (mesh->GetDimension() == 3)
+ ia = mesh->GetTopology().GetVertexElements(vnr);
+ else
+ ia = mesh->GetTopology().GetVertexSurfaceElements(vnr);
+ for (int i = 0; i < ia.Size(); i++)
+ els[i] = ia[i];
+}
+
+
int Ng_GetElementOrder (int enr)
{
if (mesh->GetDimension() == 3)
@@ -1122,6 +1220,7 @@ void Ng_InitSolutionData (Ng_SolutionData * soldata)
void Ng_SetSolutionData (Ng_SolutionData * soldata)
{
+#ifdef OPENGL
// vssolution.ClearSolutionData ();
VisualSceneSolution::SolData * vss = new VisualSceneSolution::SolData;
@@ -1140,24 +1239,35 @@ void Ng_SetSolutionData (Ng_SolutionData * soldata)
vss->soltype = VisualSceneSolution::SolType (soldata->soltype);
vss->solclass = soldata->solclass;
vssolution.AddSolutionData (vss);
+#endif
}
+void Ng_ClearSolutionData ()
+{
+ vssolution.ClearSolutionData();
+}
+
+
void Ng_Redraw ()
{
+#ifdef OPENGL
vssolution.UpdateSolutionTimeStamp();
Render();
+#endif
}
void Ng_SetVisualizationParameter (const char * name, const char * value)
{
+#ifdef OPENGL
char buf[100];
sprintf (buf, "visoptions.%s", name);
cout << "name = " << name << ", value = " << value << endl;
cout << "set tcl-variable " << buf << " to " << value << endl;
Tcl_SetVar (tcl_interp, buf, const_cast<char*> (value), 0);
Tcl_Eval (tcl_interp, "Ng_Vis_Set parameters;");
+#endif
}
@@ -1198,7 +1308,7 @@ void PlayAnimFile(const char* name, int speed, int maxcnt)
for (i = 1; i <= ne; i++)
{
int j;
- Element2d tri(3);
+ Element2d tri(TRIG);
tri.SetIndex(1); //faceind
for (j = 1; j <= 3; j++)
@@ -1240,62 +1350,127 @@ void Ng_GetPeriodicVertices (int * pairs)
pairs[2*i+1] = apairs[i].I2();
}
- /*<<<<<< nginterface.cpp
- infile >> np;
- for (i = 1; i <= np; i++)
+}
+
+
+
+int Ng_GetNPeriodicEdges ()
+{
+ ARRAY<INDEX,PointIndex::BASE> map;
+ const MeshTopology & top = mesh->GetTopology();
+ int nse = mesh->GetNSeg();
+
+ int cnt = 0;
+ // for (int id = 1; id <= mesh->GetIdentifications().GetMaxNr(); id++)
+ {
+ mesh->GetIdentifications().GetMap(0, map);
+ //(*testout) << "ident-map " << id << ":" << endl << map << endl;
+
+ for (SegmentIndex si = 0; si < nse; si++)
{
- Point3d p;
- infile >> p.X() >> p.Y() >> p.Z();
- if (firsttime)
- mesh->AddPoint (p);
- else
- mesh->Point(i)=p;
+ PointIndex other1 = map[(*mesh)[si].p1];
+ PointIndex other2 = map[(*mesh)[si].p2];
+ // (*testout) << "seg = " << (*mesh)[si] << "; other = "
+ // << other1 << "-" << other2 << endl;
+ if (other1 && other2 && mesh->IsSegment (other1, other2))
+ {
+ cnt++;
+ }
}
+ }
+ return cnt;
+}
- //firsttime = 0;
- Ng_Redraw();
- //}
+void Ng_GetPeriodicEdges (int * pairs)
+{
+ ARRAY<INDEX,PointIndex::BASE> map;
+ const MeshTopology & top = mesh->GetTopology();
+ int nse = mesh->GetNSeg();
+
+ int cnt = 0;
+ // for (int id = 1; id <= mesh->GetIdentifications().GetMaxNr(); id++)
+ {
+ mesh->GetIdentifications().GetMap(0, map);
+
+ //(*testout) << "map = " << map << endl;
+
+ for (SegmentIndex si = 0; si < nse; si++)
+ {
+ PointIndex other1 = map[(*mesh)[si].p1];
+ PointIndex other2 = map[(*mesh)[si].p2];
+ if (other1 && other2 && mesh->IsSegment (other1, other2))
+ {
+ SegmentIndex otherseg = mesh->SegmentNr (other1, other2);
+ pairs[cnt++] = top.GetSegmentEdge (si+1);
+ pairs[cnt++] = top.GetSegmentEdge (otherseg+1);
+ }
+ }
+ }
}
-
-int Ng_GetNPeriodicVertices ()
+
+
+void Ng_PushStatus (const char * str)
{
- ARRAY<INDEX_2> apairs;
- mesh->GetIdentifications().GetPairs (0, apairs);
- return apairs.Size();
+ PushStatus (MyStr (str));
}
+void Ng_PopStatus ()
+{
+ PopStatus ();
+}
-// pairs should be an integer array of 2*npairs
-void Ng_GetPeriodicVertices (int * pairs)
+void Ng_SetThreadPercentage (double percent)
{
- ARRAY<INDEX_2> apairs;
- mesh->GetIdentifications().GetPairs (0, apairs);
- for (int i = 0; i < apairs.Size(); i++)
- {
- pairs[2*i] = apairs[i].I1();
- pairs[2*i+1] = apairs[i].I2();
- }
-=======
- if (firsttime)
- mesh->AddSurfaceElement (tri);
- }
+ SetThreadPercent (percent);
+}
+
+
+///// Added by Roman Stainko ....
+int Ng_GetVertex_Elements( int vnr, int* elems )
+{
+ const MeshTopology& topology = mesh->GetTopology();
+ ArrayMem<int,4> indexArray;
+ topology.GetVertexElements( vnr, indexArray );
- infile >> np;
- for (i = 1; i <= np; i++)
- {
- Point3d p;
- infile >> p.X() >> p.Y() >> p.Z();
- if (firsttime)
- mesh->AddPoint (p);
- else
- mesh->Point(i)=p;
- }
+ for( int i=0; i<indexArray.Size(); i++ )
+ elems[i] = indexArray[i];
- //firsttime = 0;
- Ng_Redraw();
->>>>>>> 1.9
-*/
+ return indexArray.Size();
+}
+
+///// Added by Roman Stainko ....
+int Ng_GetVertex_SurfaceElements( int vnr, int* elems )
+{
+ const MeshTopology& topology = mesh->GetTopology();
+ ArrayMem<int,4> indexArray;
+ topology.GetVertexSurfaceElements( vnr, indexArray );
+
+ for( int i=0; i<indexArray.Size(); i++ )
+ elems[i] = indexArray[i];
+
+ return indexArray.Size();
}
+///// Added by Roman Stainko ....
+int Ng_GetVertex_NElements( int vnr )
+{
+ const MeshTopology& topology = mesh->GetTopology();
+ ArrayMem<int,4> indexArray;
+ topology.GetVertexElements( vnr, indexArray );
+
+ return indexArray.Size();
+}
+
+///// Added by Roman Stainko ....
+int Ng_GetVertex_NSurfaceElements( int vnr )
+{
+ const MeshTopology& topology = mesh->GetTopology();
+ ArrayMem<int,4> indexArray;
+ topology.GetVertexSurfaceElements( vnr, indexArray );
+
+ return indexArray.Size();
+}
+
+
diff --git a/Netgen/libsrc/interface/nginterface.h b/Netgen/libsrc/interface/nginterface.h
index e7949900a0..dcb8ddd332 100644
--- a/Netgen/libsrc/interface/nginterface.h
+++ b/Netgen/libsrc/interface/nginterface.h
@@ -19,7 +19,7 @@
#define NG_ELEMENT_MAXPOINTS 12
// max number of nodes per surface element
-#define NG_SURFACE_ELEMENT_MAXPOINTS 6
+#define NG_SURFACE_ELEMENT_MAXPOINTS 8
@@ -89,7 +89,8 @@ extern "C" {
// Find element of point, returns local coordinates
- int Ng_FindElementOfPoint (double * p, double * lami);
+ int Ng_FindElementOfPoint (double * p, double * lami,
+ int build_searchtrees = 0, int index = -1);
/// Curved Elemens:
@@ -140,10 +141,15 @@ extern "C" {
int Ng_GetSurfaceElement_Edges (int selnr, int * edges, int * orient = 0);
int Ng_GetSurfaceElement_Face (int selnr, int * orient = 0);
+ void Ng_GetSurfaceElementNeighbouringDomains(const int selnr, int & in, int & out);
+
int Ng_GetFace_Vertices (int fnr, int * vert);
void Ng_GetEdge_Vertices (int ednr, int * vert);
int Ng_GetFace_Edges (int fnr, int * edge);
+ int Ng_GetNVertexElements (int vnr);
+ void Ng_GetVertexElements (int vnr, int * els);
+
int Ng_GetElementOrder (int enr);
// Multilevel functions:
@@ -202,6 +208,8 @@ namespace netgen {
void Ng_InitSolutionData (Ng_SolutionData * soldata);
// set solution data
void Ng_SetSolutionData (Ng_SolutionData * soldata);
+ /// delete gridfunctions
+ void Ng_ClearSolutionData();
// redraw
void Ng_Redraw();
//
@@ -212,9 +220,24 @@ namespace netgen {
// number of periodic vertices
int Ng_GetNPeriodicVertices ();
// pairs should be an integer array of 2*npairs
- void Ng_GetPeriodicVertices (int * pairs);
+ void Ng_GetPeriodicVertices (int * pairs);
+
+ // number of periodic edges
+ int Ng_GetNPeriodicEdges ();
+ // pairs should be an integer array of 2*npairs
+ void Ng_GetPeriodicEdges (int * pairs);
+ void Ng_PushStatus (const char * str);
+ void Ng_PopStatus ();
+ void Ng_SetThreadPercentage (double percent);
+
+ //// added by Roman Stainko ....
+ int Ng_GetVertex_Elements( int vnr, int* elems);
+ int Ng_GetVertex_SurfaceElements( int vnr, int* elems );
+ int Ng_GetVertex_NElements( int vnr );
+ int Ng_GetVertex_NSurfaceElements( int vnr );
+
#ifdef __cplusplus
}
#endif
diff --git a/Netgen/libsrc/interface/nglib.cpp b/Netgen/libsrc/interface/nglib.cpp
index d309cd7189..d2e59f931e 100644
--- a/Netgen/libsrc/interface/nglib.cpp
+++ b/Netgen/libsrc/interface/nglib.cpp
@@ -20,14 +20,32 @@
#include <geometry2d.hpp>
#include <meshing.hpp>
+
+
// #include <FlexLexer.h>
+namespace netgen {
+ extern void MeshFromSpline2D (SplineGeometry2d & geometry,
+ Mesh *& mesh,
+ MeshingParameters & mp);
+}
+
+
+
+
+
+
+
+namespace nglib {
#include "nglib.h"
+}
using namespace netgen;
// constants and types:
+namespace nglib
+{
// initialize, deconstruct Netgen library:
void Ng_Init ()
{
@@ -164,7 +182,7 @@ Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp)
MeshVolume (mparam, *m);
RemoveIllegalElements (*m);
- OptimizeVolume (mparam, *m, NULL);
+ OptimizeVolume (mparam, *m);
return NG_OK;
}
@@ -242,27 +260,23 @@ void Ng_GetSegment_2D (Ng_Mesh * mesh, int num, int * pi, int * matnum)
-Ng_Geometry_2D * Ng_LoadGeometry_2D (char * filename)
+
+Ng_Geometry_2D * Ng_LoadGeometry_2D (const char * filename)
{
SplineGeometry2d * geom = new SplineGeometry2d();
geom -> Load (filename);
return (Ng_Geometry_2D *)geom;
}
-namespace netgen {
- extern void MeshFromSpline2D (SplineGeometry2d & geometry,
- Mesh *& mesh,
- MeshingParameters & mp);
-}
-
-
Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom,
Ng_Mesh ** mesh,
Ng_Meshing_Parameters * mp)
{
- MeshingParameters mparam;
+ // use global variable mparam
+ // MeshingParameters mparam;
mparam.maxh = mp->maxh;
mparam.meshsizefilename = mp->meshsize_filename;
+ mparam.quad = mp->quad_dominated;
Mesh * m;
MeshFromSpline2D (*(SplineGeometry2d*)geom, m, mparam);
@@ -270,10 +284,20 @@ Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom,
cout << m->GetNSE() << " elements, " << m->GetNP() << " points" << endl;
*mesh = (Ng_Mesh*)m;
+ return NG_OK;
}
+void Ng_HP_Refinement (Ng_Geometry_2D * geom,
+ Ng_Mesh * mesh,
+ int levels)
+{
+ Refinement2d ref(*(SplineGeometry2d*)geom);
+ HPRefinement (*(Mesh*)mesh, &ref, levels);
+}
+
+
@@ -288,13 +312,20 @@ Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom,
ARRAY<STLReadTriangle> readtrias; //only before initstlgeometry
ARRAY<Point<3> > readedges; //only before init stlgeometry
-void Ng_SaveMesh(Ng_Mesh * mesh, char* filename)
+void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename)
{
((Mesh*)mesh)->Save(filename);
}
+Ng_Mesh * Ng_LoadMesh(const char* filename)
+{
+ Mesh * mesh = new Mesh;
+ mesh->Load(filename);
+ return ( (Ng_Mesh*)mesh );
+}
+
// loads geometry from STL file
-Ng_STL_Geometry * Ng_STL_LoadGeometry (char * filename, int binary)
+Ng_STL_Geometry * Ng_STL_LoadGeometry (const char * filename, int binary)
{
int i;
STLGeometry geom;
@@ -387,12 +418,15 @@ Ng_Result Ng_STL_MakeEdges (Ng_STL_Geometry * geom,
stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10),
0.3);
+ me -> LoadLocalMeshSize (mp->meshsize_filename);
+ /*
if (mp->meshsize_filename)
{
ifstream infile (mp->meshsize_filename);
if (!infile.good()) return NG_FILE_NOT_FOUND;
me -> LoadLocalMeshSize (infile);
}
+ */
STLMeshing (*stlgeometry, *me);
@@ -496,10 +530,11 @@ Ng_Meshing_Parameters :: Ng_Meshing_Parameters()
fineness = 0.5;
secondorder = 0;
meshsize_filename = 0;
+ quad_dominated = 0;
}
-
+}
// compatibility functions:
diff --git a/Netgen/libsrc/interface/nglib.h b/Netgen/libsrc/interface/nglib.h
index 592517c945..20d745d470 100644
--- a/Netgen/libsrc/interface/nglib.h
+++ b/Netgen/libsrc/interface/nglib.h
@@ -13,8 +13,6 @@
*/
-
-
/// Data type for NETGEN mesh
typedef void * Ng_Mesh;
@@ -34,7 +32,7 @@ typedef void * Ng_STL_Geometry;
// implemented element types:
enum Ng_Volume_Element_Type { NG_TET = 1, NG_PYRAMID = 2, NG_PRISM = 3,
- NG_TET10 = 4 };
+ NG_TET10 = 4 };
// max number of nodes per surface element
#define NG_SURFACE_ELEMENT_MAXPOINTS 6
@@ -53,6 +51,7 @@ class Ng_Meshing_Parameters
double fineness; // 0 .. coarse, 1 .. fine
int secondorder;
char * meshsize_filename;
+ int quad_dominated;
Ng_Meshing_Parameters();
};
@@ -69,10 +68,10 @@ enum Ng_Result { NG_OK = 0,
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+// #ifdef __cplusplus
+// extern "C"
+// {
+// #endif
// initialize, deconstruct Netgen library:
void Ng_Init ();
@@ -115,7 +114,8 @@ extern "C"
// generates volume mesh from surface mesh
Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp);
- void Ng_SaveMesh(Ng_Mesh * mesh, char* filename);
+ void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename);
+ Ng_Mesh * Ng_LoadMesh(const char* filename);
@@ -147,14 +147,16 @@ extern "C"
// load 2d netgen spline geometry
- Ng_Geometry_2D * Ng_LoadGeometry_2D (char * filename);
+ Ng_Geometry_2D * Ng_LoadGeometry_2D (const char * filename);
// generate 2d mesh, mesh is allocated by function
Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom,
Ng_Mesh ** mesh,
Ng_Meshing_Parameters * mp);
-
+ void Ng_HP_Refinement (Ng_Geometry_2D * geom,
+ Ng_Mesh * mesh,
+ int levels);
@@ -166,7 +168,7 @@ extern "C"
// loads geometry from STL file
- Ng_STL_Geometry * Ng_STL_LoadGeometry (char * filename, int binary = 0);
+ Ng_STL_Geometry * Ng_STL_LoadGeometry (const char * filename, int binary = 0);
// generate new STL Geometry
@@ -198,9 +200,9 @@ extern "C"
Ng_Mesh * mesh,
Ng_Meshing_Parameters * mp);
-#ifdef __cplusplus
- }
-#endif
+// #ifdef __cplusplus
+// }
+// #endif
#endif
diff --git a/Netgen/libsrc/interface/readuser.cpp b/Netgen/libsrc/interface/readuser.cpp
index 0a9d2b6802..f7d4d1eae8 100644
--- a/Netgen/libsrc/interface/readuser.cpp
+++ b/Netgen/libsrc/interface/readuser.cpp
@@ -16,10 +16,12 @@ namespace netgen
#include "writeuser.hpp"
void ReadFile (Mesh & mesh,
- const char * filename)
+ const string & hfilename)
{
cout << "Read User File" << endl;
+ const char * filename = hfilename.c_str();
+
int i, j;
char reco[100];
@@ -70,7 +72,7 @@ void ReadFile (Mesh & mesh,
/*
if (invert)
- Swap (el.PNum(2), el.PNum(3));
+ swap (el.PNum(2), el.PNum(3));
*/
mesh.AddSurfaceElement (el);
@@ -154,7 +156,7 @@ void ReadFile (Mesh & mesh,
in >> el.PNum(1) >> el.PNum(2) >> el.PNum(3);
if (invert)
- Swap (el.PNum(2), el.PNum(3));
+ swap (el.PNum(2), el.PNum(3));
mesh.AddSurfaceElement (el);
for (j = 1; j <= 5; j++)
@@ -200,7 +202,7 @@ void ReadFile (Mesh & mesh,
{
int mat, nelp;
in >> mat >> nelp;
- Element2d el (nelp);
+ Element2d el (nelp == 3 ? TRIG : QUAD);
el.SetIndex (mat);
for (j = 1; j <= nelp; j++)
in >> el.PNum(j);
@@ -222,42 +224,62 @@ void ReadFile (Mesh & mesh,
{
cout << "Reading Neutral Format" << endl;
- char buf[100];
int np, ne, nse, i, j;
ifstream in (filename);
in >> np;
- for (i = 1; i <= np; i++)
- {
- Point3d p(0,0,0);
- in >> p.X() >> p.Y() >> p.Z();
- mesh.AddPoint (p);
- }
- in >> ne;
- for (i = 1; i <= ne; i++)
+ if (in.good())
{
- int mat;
- in >> mat;
- Element el (4);
- el.SetIndex (mat);
- for (j = 1; j <= 4; j++)
- in >> el.PNum(j);
- mesh.AddVolumeElement (el);
- }
+ // file starts with an integer
-
- in >> nse;
- for (i = 1; i <= nse; i++)
+ for (i = 1; i <= np; i++)
+ {
+ Point3d p(0,0,0);
+ in >> p.X() >> p.Y() >> p.Z();
+ mesh.AddPoint (p);
+ }
+
+ in >> ne;
+ for (i = 1; i <= ne; i++)
+ {
+ int mat;
+ in >> mat;
+ Element el (4);
+ el.SetIndex (mat);
+ for (j = 1; j <= 4; j++)
+ in >> el.PNum(j);
+ mesh.AddVolumeElement (el);
+ }
+
+ in >> nse;
+ for (i = 1; i <= nse; i++)
+ {
+ int mat, nelp;
+ in >> mat;
+ Element2d el (TRIG);
+ el.SetIndex (mat);
+ for (j = 1; j <= 3; j++)
+ in >> el.PNum(j);
+ mesh.AddSurfaceElement (el);
+ }
+ }
+ else
{
- int mat, nelp;
- in >> mat;
- Element2d el (3);
- el.SetIndex (mat);
- for (j = 1; j <= 3; j++)
- in >> el.PNum(j);
- mesh.AddSurfaceElement (el);
+ char buf[100];
+ in.clear();
+ do
+ {
+ in >> buf;
+ cout << "buf = " << buf << endl;
+ if (strcmp (buf, "points") == 0)
+ {
+ in >> np;
+ cout << "np = " << np << endl;
+ }
+ }
+ while (in.good());
}
}
@@ -306,7 +328,7 @@ void ReadFile (Mesh & mesh,
{
inemt >> p1 >> p2 >> p3 >> bcprop >> value;
- if (bcprop < 1 >> bcprop > 4)
+ if (bcprop < 1 || bcprop > 4)
cerr << "bcprop out of range, bcprop = " << bcprop << endl;
p1++;
p2++;
diff --git a/Netgen/libsrc/interface/writeelmer.cpp b/Netgen/libsrc/interface/writeelmer.cpp
new file mode 100644
index 0000000000..caf02e2c68
--- /dev/null
+++ b/Netgen/libsrc/interface/writeelmer.cpp
@@ -0,0 +1,127 @@
+
+//
+// Write Elmer file
+//
+//
+
+#include <mystdlib.h>
+
+#include <myadt.hpp>
+#include <linalg.hpp>
+#include <csg.hpp>
+#include <meshing.hpp>
+
+namespace netgen
+{
+#include "writeuser.hpp"
+
+#include <sys/stat.h>
+
+
+void WriteElmerFormat (const Mesh &mesh,
+ const string &filename)
+{
+ cout << "write elmer mesh files" << endl;
+ int np = mesh.GetNP();
+ int ne = mesh.GetNE();
+ int nse = mesh.GetNSE();
+ int i, j, rc;
+ char str[200];
+
+ int inverttets = mparam.inverttets;
+ int invertsurf = mparam.inverttrigs;
+
+#ifdef WIN32
+ cerr << "not yet implemented for Windows platforms." << endl;
+ return;
+#else
+ rc = mkdir(filename.c_str(), S_IRWXU|S_IRWXG);
+#endif
+ sprintf( str, "%s/mesh.header", filename.c_str() );
+ ofstream outfile_h(str);
+ sprintf( str, "%s/mesh.nodes", filename.c_str() );
+ ofstream outfile_n(str);
+ sprintf( str, "%s/mesh.elements", filename.c_str() );
+ ofstream outfile_e(str);
+ sprintf( str, "%s/mesh.boundary", filename.c_str() );
+ ofstream outfile_b(str);
+
+ // fill hashtable
+
+ INDEX_3_HASHTABLE<int> face2volelement(ne);
+
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ INDEX_3 i3;
+ int k, l;
+ for (j = 1; j <= 4; j++) // loop over faces of tet
+ {
+ l = 0;
+ for (k = 1; k <= 4; k++)
+ if (k != j)
+ {
+ l++;
+ i3.I(l) = el.PNum(k);
+ }
+ i3.Sort();
+ face2volelement.Set (i3, i);
+ }
+ }
+
+// outfile.precision(6);
+// outfile.setf (ios::fixed, ios::floatfield);
+// outfile.setf (ios::showpoint);
+
+ outfile_h << np << " " << ne << " " << nse << "\n";
+ outfile_h << "1" << "\n";
+ outfile_h << "504 1" << "\n";
+
+ for (i = 1; i <= np; i++)
+ {
+ const Point3d & p = mesh.Point(i);
+
+ outfile_n << i << " -1 ";
+ outfile_n << p.X() << " ";
+ outfile_n << p.Y() << " ";
+ outfile_n << p.Z() << "\n";
+ }
+
+ for (i = 1; i <= ne; i++)
+ {
+ Element el = mesh.VolumeElement(i);
+ if (inverttets) el.Invert();
+ sprintf( str, "5%02d", (int)el.GetNP() );
+ outfile_e << i << " " << el.GetIndex() << " " << str << " ";
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile_e << " ";
+ outfile_e << el.PNum(j);
+ }
+ outfile_e << "\n";
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ Element2d el = mesh.SurfaceElement(i);
+ if (invertsurf) el.Invert();
+ sprintf( str, "3%02d", (int)el.GetNP() );
+ {
+ INDEX_3 i3;
+ for (j = 1; j <= 3; j++) i3.I(j) = el.PNum(j);
+ i3.Sort();
+
+ int elind = face2volelement.Get(i3);
+ outfile_b << i << " " << mesh.GetFaceDescriptor(el.GetIndex()).BCProperty() <<
+ " " << elind << " 0 " << str << " ";
+ }
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile_b << " ";
+ outfile_b << el.PNum(j);
+ }
+ outfile_b << "\n";
+ }
+}
+
+}
diff --git a/Netgen/libsrc/interface/writefluent.cpp b/Netgen/libsrc/interface/writefluent.cpp
index 1a214089e3..5c08d59857 100644
--- a/Netgen/libsrc/interface/writefluent.cpp
+++ b/Netgen/libsrc/interface/writefluent.cpp
@@ -17,21 +17,10 @@ namespace netgen
-static char* CHex(int i)
-{
- static char str[100];
- sprintf(str,"%x",i); //hex
- return str;
-}
-
-
-
-
void WriteFluentFormat (const Mesh & mesh,
const string & filename)
{
- // Simple output
cout << "start writing fluent export" << endl;
int np = mesh.GetNP();
@@ -46,7 +35,7 @@ void WriteFluentFormat (const Mesh & mesh,
//outfile.setf (ios::fixed, ios::floatfield);
//outfile.setf (ios::showpoint);
- outfile << "(0 \"Exported file from NETGEN (c) Joachim Schoeberl and Johannes Gerstmayr\")" << endl;
+ outfile << "(0 \"Exported file from NETGEN \")" << endl;
outfile << "(0 \"Dimension:\")" << endl;
outfile << "(2 3)" << endl << endl;
@@ -129,7 +118,6 @@ void WriteFluentFormat (const Mesh & mesh,
int eli2 = 0;
int stopsig = 0;
-
for (i2 = 1; i2 <= nel; i2++)
{
locind = locels.Get(i2);
@@ -153,8 +141,11 @@ void WriteFluentFormat (const Mesh & mesh,
if (eli2 > i) //dont write faces two times!
{
//i: left cell, eli: right cell
- outfile << CHex(face.PNum(2)) << " " << CHex(face.PNum(1)) << " " << CHex(face.PNum(3)) << " ";
- outfile << CHex(i) << " " << CHex(eli2) << "\n";
+ outfile << hex << face.PNum(2) << " "
+ << hex << face.PNum(1) << " "
+ << hex << face.PNum(3) << " "
+ << hex << i << " "
+ << hex << eli2 << "\n";
}
if (eli2 == 0)
{
@@ -170,8 +161,10 @@ void WriteFluentFormat (const Mesh & mesh,
for (i = 1; i <= surfaceelp.Size(); i++)
{
- outfile << CHex(surfaceelp.Get(i).I1()) << " " << CHex(surfaceelp.Get(i).I2()) << " " << CHex(surfaceelp.Get(i).I3()) << " ";
- outfile << CHex(surfaceeli.Get(i)) << " " << 0 << "\n";
+ outfile << hex << surfaceelp.Get(i).I1() << " "
+ << hex << surfaceelp.Get(i).I2() << " "
+ << hex << surfaceelp.Get(i).I3() << " "
+ << hex << surfaceeli.Get(i) << " " << 0 << "\n";
}
outfile << "))" << endl << endl;
diff --git a/Netgen/libsrc/interface/writegmsh.cpp b/Netgen/libsrc/interface/writegmsh.cpp
new file mode 100644
index 0000000000..93def67783
--- /dev/null
+++ b/Netgen/libsrc/interface/writegmsh.cpp
@@ -0,0 +1,200 @@
+/*************************************
+ * Write Gmsh file
+ * First issue the 04/26/2004 by Paul CARRICO (paul.carrico@free.fr)
+ * At the moment, the GMSH format is available for
+ * linear tetrahedron elements i.e. in 3D
+ * (based on Neutral Format)
+ *
+ * Second issue the 05/05/2004 by Paul CARRICO
+ * Thanks to Joachim Schoeberl for the correction of a minor bug
+ * the 2 initial Gmsh Format (i.e. volume format and surface format) are group together)
+ * in only one file
+ **************************************/
+
+#include <mystdlib.h>
+
+#include <myadt.hpp>
+#include <linalg.hpp>
+#include <csg.hpp>
+#include <meshing.hpp>
+
+namespace netgen
+{
+#include "writeuser.hpp"
+
+
+
+/*
+ * GMSH mesh format
+ * points, elements, surface elements and physical entities
+ */
+
+void WriteGmshFormat (const Mesh & mesh,
+ const CSGeometry & geom,
+ const string & filename)
+{
+ ofstream outfile (filename.c_str());
+ outfile.precision(6);
+ outfile.setf (ios::fixed, ios::floatfield);
+ outfile.setf (ios::showpoint);
+
+ int np = mesh.GetNP(); /// number of point
+ int ne = mesh.GetNE(); /// number of element
+ int nse = mesh.GetNSE(); /// number of surface element (BC)
+ int i, j, k, l;
+
+
+ /*
+ * 3D section : Linear volume elements (only tetrahedra)
+ */
+
+ if (ne > 0 && mesh.VolumeElement(1).GetNP() == 4)
+ {
+ cout << "Write GMSH Format \n";
+ cout << "The GMSH format is available for linear tetrahedron elements only in 3D\n" << endl;
+
+ int inverttets = mparam.inverttets;
+ int invertsurf = mparam.inverttrigs;
+
+
+ /// Write nodes
+ outfile << "$NOD\n";
+ outfile << np << "\n";
+
+ for (i = 1; i <= np; i++)
+ {
+ const Point3d & p = mesh.Point(i);
+ outfile << i << " "; /// node number
+ outfile << p.X() << " ";
+ outfile << p.Y() << " ";
+ outfile << p.Z() << "\n";
+ }
+ outfile << "$ENDNOD\n";
+
+ /// write elements
+ outfile << "$ELM\n";
+ outfile << ne + nse << "\n"; //// number of elements + number of surfaces BC
+
+ for (i = 1; i <= nse; i++)
+ {
+ Element2d el = mesh.SurfaceElement(i);
+ if (invertsurf) el.Invert();
+ outfile << i;
+ outfile << " ";
+ outfile << "2";
+ outfile << " ";
+ outfile << mesh.GetFaceDescriptor (el.GetIndex()).BCProperty() << " ";
+ /// that means that physical entity = elementary entity (arbitrary approach)
+ outfile << mesh.GetFaceDescriptor (el.GetIndex()).BCProperty() << " ";
+ outfile << "3";
+ outfile << " ";
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile << " ";
+ outfile << el.PNum(j);
+ }
+ outfile << "\n";
+ }
+
+
+ for (i = 1; i <= ne; i++)
+ {
+ Element el = mesh.VolumeElement(i);
+ if (inverttets) el.Invert();
+ outfile << nse + i; /// element number
+ outfile << " ";
+ outfile << "4"; /// element type i.e. Tetraedron == 4
+ outfile << " ";
+ outfile << 100000 + el.GetIndex();
+ /// that means that physical entity = elementary entity (arbitrary approach)
+ outfile << " ";
+ outfile << 100000 + el.GetIndex(); /// volume number
+ outfile << " ";
+ outfile << "4"; /// number of nodes i.e. 4 for a tetrahedron
+
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile << " ";
+ outfile << el.PNum(j);
+ }
+ outfile << "\n";
+ }
+
+
+ outfile << "$ENDELM\n";
+ }
+
+ /*
+ * End of 3D section
+ */
+
+
+
+
+
+ /*
+ * 2D section : available for triangles and quadrangles
+ */
+ else if (ne == 0) /// means that there's no 3D element
+ {
+ cout << "\n Write Gmsh Surface Mesh (triangle and/or quadrangles)" << endl;
+
+ /// Write nodes
+ outfile << "$NOD\n";
+ outfile << np << "\n";
+
+ for (i = 1; i <= np; i++)
+ {
+ const Point3d & p = mesh.Point(i);
+ outfile << i << " "; /// node number
+ outfile << p.X() << " ";
+ outfile << p.Y() << " ";
+ outfile << p.Z() << "\n";
+ }
+ outfile << "$ENDNOD\n";
+
+
+ /// write triangles & quadrangles
+ outfile << "$ELM\n";
+ outfile << nse << "\n";
+
+ for (k = 1; k <= nse; k++)
+ {
+ const Element2d & el = mesh.SurfaceElement(k);
+
+
+ outfile << k;
+ outfile << " ";
+ outfile << (el.GetNP()-1); // 2 for a triangle and 3 for a quadrangle
+ outfile << " ";
+ outfile << mesh.GetFaceDescriptor (el.GetIndex()).BCProperty() << " ";
+ /// that means that physical entity = elementary entity (arbitrary approach)
+ outfile << mesh.GetFaceDescriptor (el.GetIndex()).BCProperty() << " ";
+ outfile << (el.GetNP()); // number of node per surfacic element
+ outfile << " ";
+
+ for (l = 1; l <= el.GetNP(); l++)
+ {
+ outfile << " ";
+ outfile << el.PNum(l);
+ }
+ outfile << "\n";
+
+ }
+ outfile << "$ENDELM$ \n";
+ }
+
+ /*
+ * End of 2D section
+ */
+
+ else
+ {
+ cout << " Invalide element type for Gmsh volume Format !\n";
+ }
+
+
+}
+}
+
+
diff --git a/Netgen/libsrc/interface/writepermas.cpp b/Netgen/libsrc/interface/writepermas.cpp
index 824a36bc9b..9dc7662458 100644
--- a/Netgen/libsrc/interface/writepermas.cpp
+++ b/Netgen/libsrc/interface/writepermas.cpp
@@ -10,160 +10,199 @@
#include <csg.hpp>
#include <meshing.hpp>
-namespace netgen
-{
-#include "writeuser.hpp"
+#include <string>
+using namespace std;
-
-void WritePermasFormat (const Mesh & mesh,
- const string & filename)
-
+namespace netgen
{
-
- ofstream outfile (filename.c_str());
-
- outfile.precision(8);
-
- int np = mesh.GetNP();
- int ne = mesh.GetNE();
- int nse = mesh.GetNSE();
- int i, j, k;
+#include "writeuser.hpp"
+ // Forward declarations (don't know, where to define them, sorry)
+ int addComponent(string &strComp, string &strSitu, ofstream &out);
- if (ne == 0)
+ // This should be the new function to export a PERMAS file
+ void WritePermasFormat (const Mesh &mesh, const string &filename,
+ string &strComp, string &strSitu)
{
- // pure surface mesh
-
- cout << "\nWrite Permas Surface Mesh" << endl;
-
- int elnr = 0;
- for (j = 1; j <= 2; j++)
- {
- int nelp;
- switch (j)
- {
- case 1:
- nelp = 3;
- outfile << "$ELEMENT TYPE = TRIA3 ESET = ALLQUAD" << endl;
- break;
- case 2:
- nelp = 4;
- outfile << "$ELEMENT TYPE = QUAD4 ESET = ALLQUAD" << endl;
- break;
- }
-
- for (i = 1; i <= nse; i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- if (el.GetNP() != nelp)
- continue;
-
- elnr++;
- outfile << elnr << " ";
- for (k = 1; k <= nelp; k++)
- outfile << " " << el.PNum(k);
- outfile << endl;
-
- }
- }
+ ofstream outfile (filename.c_str());
+ addComponent(strComp, strSitu, outfile);
+ WritePermasFormat ( mesh, filename);
}
- else
-
+ void WritePermasFormat (const Mesh &mesh, const string &filename)
{
- cout << "\nWrite Permas Volume Mesh" << endl;
-
-
- int secondorder = (mesh.VolumeElement(1).GetNP() == 10);
-
- if (!secondorder)
- {
- outfile << "$ELEMENT TYPE = TET4 ESET = ALLTET" << endl;
- for (i = 1; i <= ne; i++)
- {
- const Element & el = mesh.VolumeElement(i);
- outfile << i
- << " " << el.PNum(1)
- << " " << el.PNum(2)
- << " " << el.PNum(3)
- << " " << el.PNum(4) << endl;
- }
- }
- else
- {
- outfile << "$ELEMENT TYPE = TET10 ESET = ALLTET" << endl;
- for (i = 1; i <= ne; i++)
- {
- const Element & el = mesh.VolumeElement(i);
- outfile << i
- << " " << el.PNum(1)
- << " " << el.PNum(5)
- << " " << el.PNum(2)
- << " " << el.PNum(8)
- << " " << el.PNum(3)
- << " " << el.PNum(6) << endl << "& "
- << " " << el.PNum(7)
- << " " << el.PNum(9)
- << " " << el.PNum(10)
- << " " << el.PNum(4) << endl;
- }
- }
-
- outfile << endl << endl;
-
-
- outfile << "$SURFACE GEO SURFID = 1 SFSET = ALLSUR" << endl;
- for (i = 1; i <= nse; i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- if (el.GetNP() == 3)
- outfile << "STRIA3"
- << " " << el.PNum(1)
- << " " << el.PNum(2)
- << " " << el.PNum(3) << endl;
- }
-
- for (i = 1; i <= nse; i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- if (el.GetNP() == 4)
- outfile << "SQUAD4"
- << " " << el.PNum(1)
- << " " << el.PNum(2)
- << " " << el.PNum(3)
- << " " << el.PNum(4) << endl;
- }
-
- for (i = 1; i <= nse; i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- if (el.GetNP() == 6)
- outfile << "STRIA6"
- << " " << el.PNum(1)
- << " " << el.PNum(4)
- << " " << el.PNum(2)
- << " " << el.PNum(5)
- << " " << el.PNum(3)
- << " " << el.PNum(6) << endl;
- }
+ string strComp, strSitu;
+ ofstream outfile (filename.c_str());
+
+ outfile.precision(8);
+
+ strSitu = strComp = "";
+ if (addComponent(strComp, strSitu, outfile) == 1) {
+ printf("Error while exporting PERMAS dat!\n");
+ return;
+ }
+
+ int np = mesh.GetNP();
+ int ne = mesh.GetNE();
+ int nse = mesh.GetNSE();
+ int i, j, k;
+
+ if (ne == 0)
+ {
+ // pure surface mesh
+ cout << "\nWrite Permas Surface Mesh" << endl;
+
+ int elnr = 0;
+ for (j = 1; j <= 2; j++)
+ {
+ int nelp;
+ switch (j)
+ {
+ case 1:
+ nelp = 3;
+ outfile << "$ELEMENT TYPE = TRIA3 ESET = ALLQUAD" << endl;
+ break;
+ case 2:
+ nelp = 4;
+ outfile << "$ELEMENT TYPE = QUAD4 ESET = ALLQUAD" << endl;
+ break;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() != nelp)
+ continue;
+
+ elnr++;
+ outfile << elnr << " ";
+ for (k = 1; k <= nelp; k++)
+ outfile << " " << el.PNum(k);
+ outfile << endl;
+
+ }
+ }
+ }
+ else
+ {
+ cout << "\nWrite Permas Volume Mesh" << endl;
+
+ int secondorder = (mesh.VolumeElement(1).GetNP() == 10);
+
+ if (!secondorder)
+ {
+ outfile << "$ELEMENT TYPE = TET4 ESET = ALLTET" << endl;
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ outfile << i
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3)
+ << " " << el.PNum(4) << endl;
+ }
+ }
+ else
+ {
+ outfile << "$ELEMENT TYPE = TET10 ESET = ALLTET" << endl;
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ outfile << i
+ << " " << el.PNum(1)
+ << " " << el.PNum(5)
+ << " " << el.PNum(2)
+ << " " << el.PNum(8)
+ << " " << el.PNum(3)
+ << " " << el.PNum(6) << endl << "& "
+ << " " << el.PNum(7)
+ << " " << el.PNum(9)
+ << " " << el.PNum(10)
+ << " " << el.PNum(4) << endl;
+ }
+ }
+
+ outfile << endl << endl;
+
+
+ outfile << "$SURFACE GEO SURFID = 1 SFSET = ALLSUR" << endl;
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 3)
+ outfile << "STRIA3"
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3) << endl;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 4)
+ outfile << "SQUAD4"
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3)
+ << " " << el.PNum(4) << endl;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 6)
+ outfile << "STRIA6"
+ << " " << el.PNum(1)
+ << " " << el.PNum(4)
+ << " " << el.PNum(2)
+ << " " << el.PNum(5)
+ << " " << el.PNum(3)
+ << " " << el.PNum(6) << endl;
+ }
+ }
+
+
+ outfile << endl << endl;
+
+ outfile << "$COOR NSET = ALLNODES" << endl;
+
+ outfile.precision(6);
+ outfile.setf (ios::fixed, ios::floatfield);
+ outfile.setf (ios::showpoint);
+
+ for (i = 1; i <= np; i++)
+ {
+ outfile << i << " ";
+ outfile << mesh.Point(i).X() << " ";
+ outfile << mesh.Point(i).Y() << " ";
+ outfile << mesh.Point(i).Z() << "\n";
+ }
}
-
-
- outfile << endl << endl;
-
-
-
- outfile << "$COOR NSET = ALLNODES" << endl;
-
- for (i = 1; i <= np; i++)
+ //////////////////////////////////////////////////////////////////////////////////
+ // \brief Writes PERMAS configuration header into export file
+ // Returns >0 in case of errors
+ // \par string &strComp : Reference to component description
+ // \par string &strComp : Reference to situation description
+ //////////////////////////////////////////////////////////////////////////////////
+ int addComponent(string &strComp, string &strSitu, ofstream &out)
{
- outfile << i << " ";
- outfile << mesh.Point(i).X() << " ";
- outfile << mesh.Point(i).Y() << " ";
- outfile << mesh.Point(i).Z() << "\n";
+ if (strComp.size() > 12 || strSitu > 12)
+ return 1;
+
+ if (0 == strComp.size())
+ strComp = "KOMPO1";
+
+ if (0 == strSitu.size())
+ strSitu = "SIT1";
+
+ // Writing description header of configuration
+ out << "$ENTER COMPONENT NAME = " << strComp << " DOFTYPE = DISP MATH" << endl << endl;
+ out << " $SITUATION NAME = " << strSitu << endl;
+ out << " $END SITUATION" << endl << endl;
+ out << " $STRUCTURE" << endl;
+
+ return 0;
}
-}
-
-
+
}
diff --git a/Netgen/libsrc/interface/writepermas2.cpp b/Netgen/libsrc/interface/writepermas2.cpp
new file mode 100644
index 0000000000..f78714c5a4
--- /dev/null
+++ b/Netgen/libsrc/interface/writepermas2.cpp
@@ -0,0 +1,173 @@
+//
+// Write Permas file
+// for Intes GmbH, Stuttgart
+//
+
+#include <mystdlib.h>
+
+#include <myadt.hpp>
+#include <linalg.hpp>
+#include <csg.hpp>
+#include <meshing.hpp>
+
+namespace netgen
+{
+#include "writeuser.hpp"
+
+
+
+void WritePermasFormat (const Mesh & mesh,
+ const string & filename)
+
+{
+
+ ofstream outfile (filename.c_str());
+
+ outfile.precision(8);
+
+ int np = mesh.GetNP();
+ int ne = mesh.GetNE();
+ int nse = mesh.GetNSE();
+ int i, j, k;
+
+
+ if (ne == 0)
+ {
+ // pure surface mesh
+
+ cout << "\nWrite Permas Surface Mesh" << endl;
+
+ int elnr = 0;
+ for (j = 1; j <= 2; j++)
+ {
+ int nelp;
+ switch (j)
+ {
+ case 1:
+ nelp = 3;
+ outfile << "$ELEMENT TYPE = TRIA3 ESET = ALLQUAD" << endl;
+ break;
+ case 2:
+ nelp = 4;
+ outfile << "$ELEMENT TYPE = QUAD4 ESET = ALLQUAD" << endl;
+ break;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() != nelp)
+ continue;
+
+ elnr++;
+ outfile << elnr << " ";
+ for (k = 1; k <= nelp; k++)
+ outfile << " " << el.PNum(k);
+ outfile << endl;
+
+ }
+ }
+ }
+
+ else
+
+ {
+ cout << "\nWrite Permas Volume Mesh" << endl;
+
+
+ int secondorder = (mesh.VolumeElement(1).GetNP() == 10);
+
+ if (!secondorder)
+ {
+ outfile << "$ELEMENT TYPE = TET4 ESET = ALLTET" << endl;
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ outfile << i
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3)
+ << " " << el.PNum(4) << endl;
+ }
+ }
+ else
+ {
+ outfile << "$ELEMENT TYPE = TET10 ESET = ALLTET" << endl;
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ outfile << i
+ << " " << el.PNum(1)
+ << " " << el.PNum(5)
+ << " " << el.PNum(2)
+ << " " << el.PNum(8)
+ << " " << el.PNum(3)
+ << " " << el.PNum(6) << endl << "& "
+ << " " << el.PNum(7)
+ << " " << el.PNum(9)
+ << " " << el.PNum(10)
+ << " " << el.PNum(4) << endl;
+ }
+ }
+
+ outfile << endl << endl;
+
+
+ outfile << "$SURFACE GEO SURFID = 1 SFSET = ALLSUR" << endl;
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 3)
+ outfile << "STRIA3"
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3) << endl;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 4)
+ outfile << "SQUAD4"
+ << " " << el.PNum(1)
+ << " " << el.PNum(2)
+ << " " << el.PNum(3)
+ << " " << el.PNum(4) << endl;
+ }
+
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ if (el.GetNP() == 6)
+ outfile << "STRIA6"
+ << " " << el.PNum(1)
+ << " " << el.PNum(4)
+ << " " << el.PNum(2)
+ << " " << el.PNum(5)
+ << " " << el.PNum(3)
+ << " " << el.PNum(6) << endl;
+ }
+ }
+
+
+ outfile << endl << endl;
+
+
+
+ outfile << "$COOR NSET = ALLNODES" << endl;
+
+ outfile.precision(6);
+ outfile.setf (ios::fixed, ios::floatfield);
+ outfile.setf (ios::showpoint);
+
+ for (i = 1; i <= np; i++)
+ {
+ outfile << i << " ";
+ outfile << mesh.Point(i).X() << " ";
+ outfile << mesh.Point(i).Y() << " ";
+ outfile << mesh.Point(i).Z() << "\n";
+ }
+}
+
+
+}
diff --git a/Netgen/libsrc/interface/writetecplot.cpp b/Netgen/libsrc/interface/writetecplot.cpp
index 1f5e01351b..a3ddda3f9a 100644
--- a/Netgen/libsrc/interface/writetecplot.cpp
+++ b/Netgen/libsrc/interface/writetecplot.cpp
@@ -85,7 +85,7 @@ void WriteTecPlotFormat (const Mesh & mesh,
for (i = 1; i <= np; i++)
if (sn.Elem(i) != 0)
{
- geom.GetSurface(j) -> GetNormalVector ( mesh.Point(i), n );
+ n = geom.GetSurface(j) -> GetNormalVector ( mesh.Point(i) );
outfile << mesh.Point(i).X() << " " /* Knoten Koordinaten */
<< mesh.Point(i).Y() << " "
diff --git a/Netgen/libsrc/interface/writeuser.cpp b/Netgen/libsrc/interface/writeuser.cpp
index 1909eb2193..83b9a050ce 100644
--- a/Netgen/libsrc/interface/writeuser.cpp
+++ b/Netgen/libsrc/interface/writeuser.cpp
@@ -28,9 +28,10 @@ void RegisterUserFormats (ARRAY<const char*> & names)
"Fluent Format",
"Permas Format",
"FEAP Format",
+ "Elmer Format",
"STL Format",
"VRML Format",
- "Fepp Format",
+ "Gmsh Format",
// { "Chemnitz Format" },
0
};
@@ -46,7 +47,8 @@ bool WriteUserFormat (const string & format,
const CSGeometry & geom,
const string & filename)
{
- cout << "Write user format " << format << endl;
+ PrintMessage (1, "Export mesh to file ", filename,
+ ", format is ", format);
if (format == "Neutral Format")
WriteNeutralFormat (mesh, geom, filename);
@@ -76,6 +78,9 @@ bool WriteUserFormat (const string & format,
else if (format == "FEAP Format")
WriteFEAPFormat (mesh, filename);
+ else if (format == "Elmer Format")
+ WriteElmerFormat (mesh, filename);
+
else if (format == "STL Format")
WriteSTLFormat (mesh, filename);
@@ -85,9 +90,15 @@ bool WriteUserFormat (const string & format,
else if (format == "Fepp Format")
WriteFEPPFormat (mesh, geom, filename);
+ else if (format == "EdgeElement Format")
+ WriteEdgeElementFormat (mesh, geom, filename);
+
else if (format == "Chemnitz Format")
WriteUserChemnitz (mesh, filename);
-
+
+ else if (format == "Gmsh Format")
+ WriteGmshFormat (mesh, geom, filename);
+
else
{
return 1;
@@ -112,6 +123,7 @@ void WriteNeutralFormat (const Mesh & mesh,
int np = mesh.GetNP();
int ne = mesh.GetNE();
int nse = mesh.GetNSE();
+ int nseg = mesh.GetNSeg();
int i, j;
int inverttets = mparam.inverttets;
@@ -133,25 +145,32 @@ void WriteNeutralFormat (const Mesh & mesh,
outfile << p.X() << " ";
outfile.width(9);
outfile << p.Y() << " ";
- outfile.width(9);
- outfile << p.Z() << "\n";
+ if (mesh.GetDimension() == 3)
+ {
+ outfile.width(9);
+ outfile << p.Z();
+ }
+ outfile << "\n";
}
- outfile << ne << "\n";
- for (i = 1; i <= ne; i++)
+ if (mesh.GetDimension() == 3)
{
- Element el = mesh.VolumeElement(i);
- if (inverttets)
- el.Invert();
- outfile.width(4);
- outfile << el.GetIndex() << " ";
- for (j = 1; j <= el.GetNP(); j++)
+ outfile << ne << "\n";
+ for (i = 1; i <= ne; i++)
{
- outfile << " ";
- outfile.width(8);
- outfile << el.PNum(j);
+ Element el = mesh.VolumeElement(i);
+ if (inverttets)
+ el.Invert();
+ outfile.width(4);
+ outfile << el.GetIndex() << " ";
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << el.PNum(j);
+ }
+ outfile << "\n";
}
- outfile << "\n";
}
outfile << nse << "\n";
@@ -170,6 +189,27 @@ void WriteNeutralFormat (const Mesh & mesh,
}
outfile << "\n";
}
+
+
+ if (mesh.GetDimension() == 2)
+ {
+ outfile << nseg << "\n";
+ for (i = 1; i <= nseg; i++)
+ {
+ const Segment & seg = mesh.LineSegment(i);
+ outfile.width(4);
+ outfile << seg.si << " ";
+
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.p1;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.p2;
+
+ outfile << "\n";
+ }
+ }
}
@@ -561,6 +601,136 @@ void WriteFEPPFormat (const Mesh & mesh,
+/*
+ * Edge element mesh format
+ * points, elements, edges
+ */
+
+void WriteEdgeElementFormat (const Mesh & mesh,
+ const CSGeometry & geom,
+ const string & filename)
+{
+ cout << "write edge element format" << endl;
+
+ const MeshTopology * top = &mesh.GetTopology();
+ int npoints = mesh.GetNP();
+ int nelements = mesh.GetNE();
+ int nsurfelem = mesh.GetNSE();
+ int nedges = top->GetNEdges();
+ int i, j;
+
+ int inverttets = mparam.inverttets;
+ int invertsurf = mparam.inverttrigs;
+ ARRAY<int> edges;
+
+ ofstream outfile (filename.c_str());
+
+ outfile.precision(6);
+ outfile.setf (ios::fixed, ios::floatfield);
+ outfile.setf (ios::showpoint);
+
+
+ // vertices with coordinates
+ outfile << npoints << "\n";
+ for (i = 1; i <= npoints; i++)
+ {
+ const Point3d & p = mesh.Point(i);
+
+ outfile.width(10);
+ outfile << p.X() << " ";
+ outfile.width(9);
+ outfile << p.Y() << " ";
+ outfile.width(9);
+ outfile << p.Z() << "\n";
+ }
+
+ // element - edge - list
+ outfile << nelements << " " << nedges << "\n";
+ for (i = 1; i <= nelements; i++)
+ {
+ Element el = mesh.VolumeElement(i);
+ if (inverttets)
+ el.Invert();
+ outfile.width(4);
+ outfile << el.GetIndex() << " ";
+ outfile.width(8);
+ outfile << el.GetNP();
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << el.PNum(j);
+ }
+
+ top->GetElementEdges(i,edges);
+ outfile << endl << " ";
+ outfile.width(8);
+ outfile << edges.Size();
+ for (j=1; j <= edges.Size(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << edges[j-1];
+ }
+ outfile << "\n";
+
+ // orientation:
+ top->GetElementEdgeOrientations(i,edges);
+ outfile << " ";
+ for (j=1; j <= edges.Size(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << edges[j-1];
+ }
+ outfile << "\n";
+ }
+
+ // surface element - edge - list (with boundary conditions)
+ outfile << nsurfelem << "\n";
+ for (i = 1; i <= nsurfelem; i++)
+ {
+ Element2d el = mesh.SurfaceElement(i);
+ if (invertsurf)
+ el.Invert();
+ outfile.width(4);
+ outfile << mesh.GetFaceDescriptor (el.GetIndex()).BCProperty() << " ";
+ outfile.width(8);
+ outfile << el.GetNP();
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << el.PNum(j);
+ }
+
+ top->GetSurfaceElementEdges(i,edges);
+ outfile << endl << " ";
+ outfile.width(8);
+ outfile << edges.Size();
+ for (j=1; j <= edges.Size(); j++)
+ {
+ outfile << " ";
+ outfile.width(8);
+ outfile << edges[j-1];
+ }
+ outfile << "\n";
+ }
+
+
+ int v1, v2;
+ // edge - vertex - list
+ outfile << nedges << "\n";
+ for (i=1; i <= nedges; i++)
+ {
+ top->GetEdgeVertices(i,v1,v2);
+ outfile.width(4);
+ outfile << v1;
+ outfile << " ";
+ outfile.width(8);
+ outfile << v2 << endl;
+ }
+}
diff --git a/Netgen/libsrc/interface/writeuser.hpp b/Netgen/libsrc/interface/writeuser.hpp
index 26e8f8eeb1..afb2a6d5e3 100644
--- a/Netgen/libsrc/interface/writeuser.hpp
+++ b/Netgen/libsrc/interface/writeuser.hpp
@@ -20,7 +20,7 @@ void WriteFile (int typ,
extern
void ReadFile (Mesh & mesh,
- const char * filename);
+ const string & filename);
extern
void ImportSolution (const char * filename);
@@ -54,14 +54,16 @@ void WriteFEPPFormat (const Mesh & mesh,
const CSGeometry & geom,
const string & filename);
+extern
+void WriteGmshFormat (const Mesh & mesh,
+ const CSGeometry & geom,
+ const string & filename);
+
extern
void WriteUserChemnitz (const Mesh & mesh,
const string & filename);
-
-
-
extern
void WriteDiffPackFormat (const Mesh & mesh,
const CSGeometry & geom,
@@ -92,6 +94,17 @@ extern
void WriteFEAPFormat (const Mesh & mesh,
const string & filename);
+extern
+void WriteElmerFormat (const Mesh & mesh,
+ const string & filename);
+
+
+extern
+void WriteEdgeElementFormat (const Mesh & mesh,
+ const CSGeometry & geom,
+ const string & filename);
+
+
extern void RegisterUserFormats (ARRAY<const char*> & names);
extern bool WriteUserFormat (const string & format,
diff --git a/Netgen/libsrc/interface/wuchemnitz.cpp b/Netgen/libsrc/interface/wuchemnitz.cpp
index 306cbe6268..82a513d1ca 100644
--- a/Netgen/libsrc/interface/wuchemnitz.cpp
+++ b/Netgen/libsrc/interface/wuchemnitz.cpp
@@ -225,7 +225,7 @@ void Convert ()
i2.I2() = faces.Get(i).p2;
break;
}
- if (i2.I1() > i2.I2()) Swap (i2.I1(), i2.I2());
+ if (i2.I1() > i2.I2()) swap (i2.I1(), i2.I2());
if (edgeindex.Used (i2))
edgei = edgeindex.Get(i2);
else
diff --git a/Netgen/libsrc/linalg/Makefile b/Netgen/libsrc/linalg/Makefile
index a3ca3763d9..0cb19b0932 100644
--- a/Netgen/libsrc/linalg/Makefile
+++ b/Netgen/libsrc/linalg/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for linear algebra library
#
-src = densemat.cpp vector.cpp polynomial.cpp
+src = basemat.cpp densemat.cpp vector.cpp sparsmat.cpp polynomial.cpp
#
lib = la
libpath = libsrc/linalg
diff --git a/Netgen/libsrc/linalg/basemat.cpp b/Netgen/libsrc/linalg/basemat.cpp
index 49fd4c2e41..889d79d668 100644
--- a/Netgen/libsrc/linalg/basemat.cpp
+++ b/Netgen/libsrc/linalg/basemat.cpp
@@ -1,3 +1,5 @@
+#ifdef ABC
+
#include <mystdlib.h>
#include <linalg.hpp>
@@ -71,8 +73,8 @@ ostream & BaseMatrix :: Print (ostream & s) const
}
-
-TempVector BaseMatrix :: operator* (const BaseVector & v) const
+ /*
+TempVector BaseMatrix :: operator* (const Vector & v) const
{
Vector * prod = new Vector(Height());
@@ -91,7 +93,7 @@ TempVector BaseMatrix :: operator* (const BaseVector & v) const
return *prod;
}
-
+ */
DenseMatrix operator* (const BaseMatrix & m1, const BaseMatrix & m2)
@@ -147,14 +149,17 @@ DenseMatrix operator+ (const BaseMatrix & m1, const BaseMatrix & m2)
}
-void BaseMatrix :: Mult (const BaseVector & /* v */,
- BaseVector & /* prod */) const
+void BaseMatrix :: Mult (const FlatVector & /* v */,
+ FlatVector & /* prod */) const
{
- (*myerr) << "BaseMatrix :: Mult called" << endl;
+ (*myerr) << "BaseMatrix :: Mult called" << endl;
+ double * x = 0;
+ *x = 1;
+ assert (1);
}
-void BaseMatrix :: MultTrans (const BaseVector & v,
- BaseVector & prod) const
+void BaseMatrix :: MultTrans (const Vector & v,
+ Vector & prod) const
{
if (Symmetric())
Mult (v, prod);
@@ -162,16 +167,16 @@ void BaseMatrix :: MultTrans (const BaseVector & v,
(*myerr) << "BaseMatrix :: MultTrans called for non symmetric matrix" << endl;
}
-void BaseMatrix :: Residuum (const BaseVector & x,
- const BaseVector & b, BaseVector & res) const
+void BaseMatrix :: Residuum (const Vector & x,
+ const Vector & b, Vector & res) const
{
Mult (x, res);
res *= -1;
res.Add (1, b);
}
-void BaseMatrix :: ResiduumTrans (const BaseVector & x,
- const BaseVector & b, BaseVector & res) const
+void BaseMatrix :: ResiduumTrans (const Vector & x,
+ const Vector & b, Vector & res) const
{
MultTrans (x, res);
res *= -1;
@@ -185,7 +190,7 @@ BaseMatrix * BaseMatrix :: Copy () const
}
-BaseVector * BaseMatrix :: CreateVector () const
+Vector * BaseMatrix :: CreateVector () const
{
return new Vector (Height());
}
@@ -296,14 +301,14 @@ void BaseMatrix :: SolveDestroy (const Vector & v, Vector & sol)
(*myerr) << "SolveDestroy: Matrix not square";
return;
}
- if (Width() != v.Length())
+ if (Width() != v.Size())
{
(*myerr) << "SolveDestroy: Matrix and Vector don't fit";
return;
}
sol = v;
- if (Height() != sol.Length())
+ if (Height() != sol.Size())
{
(*myerr) << "SolveDestroy: Solution Vector not ok";
return;
@@ -324,12 +329,12 @@ void BaseMatrix :: SolveDestroy (const Vector & v, Vector & sol)
for (i = Height(); i >= 1; i--)
{
- q = sol(i);
+ q = sol.Elem(i);
for (j = i+1; j <= Height(); j++)
{
q -= (*this)(i,j) * sol.Get(j);
}
- sol.Set(i, q / (*this)(i,i));
+ sol.Elem(i) = q / (*this)(i,i);
}
}
@@ -349,28 +354,29 @@ void BaseMatrix :: Solve (const Vector & v, Vector & sol) const
}
-Vector BaseMatrix :: SolveDestroyFunc (const Vector & /* b */) const
+ /*
+Vector BaseMatrix :: SolveDestroyFunc (const Vector & b) const
{
return Vector(0);
}
-
+*/
Vector BaseMatrix :: Solve (const Vector & v) const
{
- Vector sol (v.Length());
+ Vector sol (v.Size());
if (Width() != Height())
{
(*myerr) << "Solve: Matrix not square";
return v;
}
- if (Width() != v.Length())
+ if (Width() != v.Size())
{
(*myerr) << "Solve: Matrix and Vector don't fit";
return v;
}
- if (Width() != sol.Length())
+ if (Width() != sol.Size())
{
(*myerr) << "Solve: Vector sol not allocated" << endl;
}
@@ -463,3 +469,4 @@ BaseMatrix * BaseMatrix :: InverseMatrix (const BitArray * /* inner */) const
}
+#endif
diff --git a/Netgen/libsrc/linalg/basemat.hpp b/Netgen/libsrc/linalg/basemat.hpp
index 89a9e21411..d47abe790d 100644
--- a/Netgen/libsrc/linalg/basemat.hpp
+++ b/Netgen/libsrc/linalg/basemat.hpp
@@ -1,3 +1,5 @@
+#ifdef NONE
+
#ifndef FILE_BASEMAT
#define FILE_BASEMAT
@@ -55,32 +57,32 @@ public:
virtual ostream & Print (ostream & s) const;
///
- TempVector operator* (const BaseVector & v) const;
+ // TempVector operator* (const Vector & v) const;
///
- virtual void Mult (const BaseVector & v, BaseVector & prod) const;
+ virtual void Mult (const FlatVector & v, FlatVector & prod) const;
///
- virtual void MultTrans (const BaseVector & v, BaseVector & prod) const;
+ virtual void MultTrans (const Vector & v, Vector & prod) const;
///
- virtual void Residuum (const BaseVector & x, const BaseVector & b, BaseVector & res) const;
+ virtual void Residuum (const Vector & x, const Vector & b, Vector & res) const;
///
- virtual void ResiduumTrans (const BaseVector & x, const BaseVector & b, BaseVector & res) const;
- // virtual double EvaluateBilinearform (const BaseVector & x);
+ virtual void ResiduumTrans (const Vector & x, const Vector & b, Vector & res) const;
+ // virtual double EvaluateBilinearform (const Vector & x);
virtual BaseMatrix * Copy () const;
///
- virtual BaseVector * CreateVector () const;
+ virtual Vector * CreateVector () const;
///
virtual void AddElementMatrix (const ARRAY<INDEX> & /* pnum */,
const BaseMatrix & /* elemmat */) { };
///
virtual void MultElementMatrix (const ARRAY<INDEX> & /* pnum */,
- const BaseVector & /* x */, BaseVector & /* y */) { };
+ const Vector & /* x */, Vector & /* y */) { };
///
virtual void MultTransElementMatrix (const ARRAY<INDEX> & /* pnum */,
- const BaseVector & /* x */, BaseVector & /* y */) { };
+ const Vector & /* x */, Vector & /* y */) { };
///
@@ -94,7 +96,7 @@ public:
///
void Solve (const Vector & b, Vector & x) const;
///
- virtual Vector SolveDestroyFunc (const Vector & b) const;
+ // virtual Vector SolveDestroyFunc (const Vector & b) const;
///
Vector Solve (const Vector & b) const;
///
@@ -102,4 +104,6 @@ public:
};
+#endif
+
#endif
diff --git a/Netgen/libsrc/linalg/densemat.hpp b/Netgen/libsrc/linalg/densemat.hpp
index f2dc9bd605..fadb128d6a 100644
--- a/Netgen/libsrc/linalg/densemat.hpp
+++ b/Netgen/libsrc/linalg/densemat.hpp
@@ -39,6 +39,8 @@ public:
double & operator() (int i, int j) { return data[i*width+j]; }
double operator() (int i, int j) const { return data[i*width+j]; }
+ double & operator() (int i) { return data[i]; }
+ double operator() (int i) const { return data[i]; }
///
DenseMatrix & operator= (const DenseMatrix & m2);
@@ -59,6 +61,7 @@ public:
const double * mp, * sp;
double * dp;
+#ifdef DEBUG
if (prod.Size() != height)
{
cerr << "Mult: wrong vector size " << endl;
@@ -66,7 +69,7 @@ public:
// prod.SetSize (height);
}
-#ifdef DEBUG
+
if (!height)
{
cout << "DenseMatrix::Mult height = 0" << endl;
@@ -183,21 +186,18 @@ public:
}
}
+ ///
int Height() const { return height; }
- int Width() const { return WIDTH; }
- /*
- ///
- virtual double & operator() (INDEX i, INDEX j);
///
- virtual double operator() (INDEX i, INDEX j) const;
- */
+ int Width() const { return WIDTH; }
///
MatrixFixWidth & operator= (double v)
{
for (int i = 0; i < height*WIDTH; i++)
- data[i] = 0;
+ data[i] = v;
+ return *this;
}
///
diff --git a/Netgen/libsrc/linalg/linalg.hpp b/Netgen/libsrc/linalg/linalg.hpp
index 3dd73e8ef0..4599fad48d 100644
--- a/Netgen/libsrc/linalg/linalg.hpp
+++ b/Netgen/libsrc/linalg/linalg.hpp
@@ -25,7 +25,9 @@
namespace netgen
{
#include "vector.hpp"
+ // #include "basemat.hpp"
#include "densemat.hpp"
+ // #include "sparsmat.hpp"
#include "polynomial.hpp"
}
#endif
diff --git a/Netgen/libsrc/linalg/sparsmat.cpp b/Netgen/libsrc/linalg/sparsmat.cpp
index cb2f32a233..f3249f82e6 100644
--- a/Netgen/libsrc/linalg/sparsmat.cpp
+++ b/Netgen/libsrc/linalg/sparsmat.cpp
@@ -1,3 +1,6 @@
+//#include <algorithm>
+#ifdef ABC
+
#include <mystdlib.h>
#include <linalg.hpp>
@@ -165,7 +168,7 @@ SparseMatrix :: SparseMatrix (INDEX h, INDEX w)
-void SparseMatrix :: Mult (const BaseVector & bv, BaseVector & bprod) const
+void SparseMatrix :: Mult (const Vector & v, Vector & prod) const
{
double sum, vi;
INDEX i, j, n;
@@ -173,13 +176,13 @@ void SparseMatrix :: Mult (const BaseVector & bv, BaseVector & bprod) const
const INDEX * col;
const double * valp;
- const Vector & v = bv.CastToVector();
- Vector & prod = bprod.CastToVector();
+ // const Vector & v = bv.CastToVector();
+ // Vector & prod = bprod.CastToVector();
- prod.SetLength (Height());
+ prod.SetSize (Height());
/*
- if (prod.Length() != Height() || v.Length() != Width())
+ if (prod.Size() != Height() || v.Size() != Width())
{
(*myerr) << "SparseMatrix::Mult: Dimensions don't fit" << endl;
return;
@@ -229,7 +232,7 @@ void SparseMatrix :: Mult (const BaseVector & bv, BaseVector & bprod) const
linep++;
- prod.Set (i, sum);
+ prod.Elem(i) = sum;
}
}
@@ -261,18 +264,18 @@ void SparseMatrix :: Mult (const BaseVector & bv, BaseVector & bprod) const
}
}
-void SparseMatrix :: MultTrans (const BaseVector & bv, BaseVector & bprod) const
+void SparseMatrix :: MultTrans (const Vector & v, Vector & prod) const
{
INDEX i, j, n, coln;
- const Vector & v = bv.CastToVector();
- Vector & prod = bprod.CastToVector();
+ // const Vector & v = bv.CastToVector();
+ // Vector & prod = bprod.CastToVector();
const INDEX * col;
const double * valp;
double val;
- prod.SetLength (Width());
+ prod.SetSize (Width());
- if (prod.Length() != Width() || v.Length() != Height())
+ if (prod.Size() != Width() || v.Size() != Height())
{
(*myerr) << "SparseMatrix::Mult: Dimensions don't fit" << endl;
return;
@@ -307,8 +310,8 @@ void SparseMatrix :: MultTrans (const BaseVector & bv, BaseVector & bprod) const
-void SparseMatrix :: Residuum (const BaseVector & bx, const BaseVector & bb,
- BaseVector & bres) const
+void SparseMatrix :: Residuum (const Vector & bx, const Vector & bb,
+ Vector & bres) const
{
BaseMatrix :: Residuum (bx, bb, bres);
/*
@@ -320,10 +323,10 @@ void SparseMatrix :: Residuum (const BaseVector & bx, const BaseVector & bb,
const Vector & b = bb.CastToVector();
Vector & res = bres.CastToVector();
- res.SetLength (b.Length());
+ res.SetSize (b.Size());
- if (res.Length() != b.Length() || b.Length() != Height() ||
- x.Length() != Width())
+ if (res.Size() != b.Size() || b.Size() != Height() ||
+ x.Size() != Width())
{
(*myerr) << "SparseMatrix::Residuum: Dimensions don't fit" << endl;
return;
@@ -368,9 +371,9 @@ void SparseMatrix :: Residuum (const BaseVector & bx, const BaseVector & bb,
}
-void SparseMatrix :: ResiduumTrans (const BaseVector & /* bx */,
- const BaseVector & /* bb */,
- BaseVector & /* bres */) const
+void SparseMatrix :: ResiduumTrans (const Vector & /* bx */,
+ const Vector & /* bb */,
+ Vector & /* bres */) const
{
cerr << "SparseMastrix :: Residuumtrans called, but not implemented" << endl;
@@ -383,10 +386,10 @@ void SparseMatrix :: ResiduumTrans (const BaseVector & /* bx */,
Vector & res = bres.CastToVector();
- res.SetLength (Width());
+ res.SetSize (Width());
- if (res.Length() != b.Length() || b.Length() != Width() ||
- x.Length() != Height())
+ if (res.Size() != b.Size() || b.Size() != Width() ||
+ x.Size() != Height())
{
(*myerr) << "SparseMatrix::ResiduumTrans: Dimensions don't fit" << endl;
return;
@@ -534,7 +537,7 @@ double SparseMatrix :: RowTimesVector (INDEX i, const Vector & v) const
int j;
/*
- if (Width() > v.Length())
+ if (Width() > v.Size())
{
cerr << "SparseMatrix::RowTimesVector: Size doesn't fit" << endl;
return 0;
@@ -578,10 +581,10 @@ void SparseMatrix :: AddRowToVector (INDEX i, double s, Vector & v) const
int coln, j;
#ifdef debug
- if (Width() > v.Length())
+ if (Width() > v.Size())
{
cerr << "SparseMatrix::AddRowToVector: Size doesn't fit"
- << "w = " << Width() << " len = " << v.Length() << endl;
+ << "w = " << Width() << " len = " << v.Size() << endl;
return;
}
#endif
@@ -1550,7 +1553,7 @@ double SparseMatrix :: RowTimesVector (INDEX i, const Vector & v) const
double sum;
int j;
- if (Width() > v.Length())
+ if (Width() > v.Size())
{
cerr << "SparseMatrix::RowTimesVector: Size doesn't fit" << endl;
return 0;
@@ -1572,10 +1575,10 @@ void SparseMatrix :: AddRowToVector (INDEX i, double s, Vector & v) const
const colstruct * col;
int j;
- if (Width() > v.Length())
+ if (Width() > v.Size())
{
cerr << "SparseMatrix::AddRowToVector: Size doesn't fit"
- << "w = " << Width() << " len = " << v.Length() << endl;
+ << "w = " << Width() << " len = " << v.Size() << endl;
return;
}
@@ -1701,3 +1704,4 @@ void SparseMatrix :: SetGraph (const class TABLE<INDEX> & graph)
#endif
}
+#endif
diff --git a/Netgen/libsrc/linalg/sparsmat.hpp b/Netgen/libsrc/linalg/sparsmat.hpp
index 884ab6575c..74aaa3134e 100644
--- a/Netgen/libsrc/linalg/sparsmat.hpp
+++ b/Netgen/libsrc/linalg/sparsmat.hpp
@@ -1,3 +1,5 @@
+#ifdef NONE
+
#ifndef FILE_SPARSMAT
#define FILE_SPARSMAT
@@ -86,15 +88,15 @@ public:
/// prod = matrix x v
- virtual void Mult (const BaseVector & v, BaseVector & prod) const;
+ virtual void Mult (const Vector & v, Vector & prod) const;
/// prod = matrix^T x v
- virtual void MultTrans (const BaseVector & v, BaseVector & prod) const;
+ virtual void MultTrans (const Vector & v, Vector & prod) const;
/// res = b - mat x x
- virtual void Residuum (const BaseVector & x, const BaseVector & b,
- BaseVector & res) const;
+ virtual void Residuum (const Vector & x, const Vector & b,
+ Vector & res) const;
/// res = b - mat^T x x
- virtual void ResiduumTrans (const BaseVector & x, const BaseVector & b,
- BaseVector & res) const;
+ virtual void ResiduumTrans (const Vector & x, const Vector & b,
+ Vector & res) const;
/**
@@ -258,4 +260,6 @@ protected:
};
+#endif
+
#endif
diff --git a/Netgen/libsrc/linalg/vector.cpp b/Netgen/libsrc/linalg/vector.cpp
index 47be4eefd9..05b5a0a71e 100644
--- a/Netgen/libsrc/linalg/vector.cpp
+++ b/Netgen/libsrc/linalg/vector.cpp
@@ -1,6 +1,7 @@
#ifdef abc
#include <mystdlib.h>
#include <linalg.hpp>
+#include <algorithm>
namespace netgen
{
diff --git a/Netgen/libsrc/makefile.inc b/Netgen/libsrc/makefile.inc
index 6a98d84e43..76369d5fb6 100644
--- a/Netgen/libsrc/makefile.inc
+++ b/Netgen/libsrc/makefile.inc
@@ -7,10 +7,10 @@
CPP_DIR=../..
LIBSRC_DIR=$(CPP_DIR)/libsrc
LIB_DIR=$(CPP_DIR)/lib/$(MACHINE)
+
OCC_DIR=../../occ
-# OCC_DIR=/opt/OpenCASCADE5.1/ros
OCCINC_DIR=$(OCC_DIR)/inc
-# OCCLIB_DIR=$(OCC_DIR)/lib
+OCCLIB_DIR=$(OCC_DIR)/lib
#
include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
#
@@ -20,11 +20,13 @@ ARFLAGS = r
#
LIBB=$(LIB_DIR)/lib$(lib).a
#
-.PRECIOUS: .cpp .hh
-.SUFFIXES: .cpp .o
+.PRECIOUS: .cpp .c
+.SUFFIXES: .cpp .c .o
#
.cpp.o:
$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
+.c.o:
+ $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
#
#
$(LIBB):: $(LIB_DIR)
diff --git a/Netgen/libsrc/makefile.mach.FREEBSD b/Netgen/libsrc/makefile.mach.FREEBSD
new file mode 100644
index 0000000000..6f903d4e60
--- /dev/null
+++ b/Netgen/libsrc/makefile.mach.FREEBSD
@@ -0,0 +1,26 @@
+#
+# Machine dependent make include file for gcc
+#
+#
+#CC=gcc
+CPLUSPLUS=$(CC)
+AR=ar
+LINK=$(CC)
+#MAKE=make
+RM=rm
+RANLIB=ranlib
+#
+# Machine dependent flags:
+#
+include $(LOCALBASE)/lib/tixConfig.sh
+include $(LOCALBASE)/lib/tcl$(TCL_VER)/tclConfig.sh
+include $(LOCALBASE)/lib/tk$(TK_VER)/tkConfig.sh
+tcltklib = `echo $(TIX_BUILD_LIB_SPEC)` `echo $(TK_LIB_SPEC)` `echo $(TCL_LIB_FLAG)`
+
+CFLAGS2 =
+CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL
+CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)`
+#
+LINKFLAGS2 = -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+
+SYSLIB2 = -lstdc++
diff --git a/Netgen/libsrc/makefile.mach.INTEL b/Netgen/libsrc/makefile.mach.INTEL
index c445191a24..deef5b091c 100644
--- a/Netgen/libsrc/makefile.mach.INTEL
+++ b/Netgen/libsrc/makefile.mach.INTEL
@@ -1,5 +1,5 @@
#
-# Machine dependent make include file for Intel compiler
+# Machine dependent make include file
#
CC=icc
CPLUSPLUS=$(CC)
@@ -12,7 +12,23 @@ RANLIB=ranlib
# Machine dependent flags:
#
CFLAGS2 =
-CPLUSPLUSFLAGS2 = -O2 -wd654 -DLINUX -DOPENGL
+CPLUSPLUSFLAGS2 = -O2 -wd1572 -Ob2 -DLINUX -DOPENGL -DNGSOLVE \
+ -Qoption,c,-ip_ninl_max_stats=1000 \
+ -Qoption,c,-ip_ninl_min_stats=50 \
+ -Qoption,c,-ip_ninl_max_total_stats=1000 \
+ -gcc-name=/usr/bin/g++
#
-LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5
+LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 \
+ -gcc-name=/usr/bin/g++
+#
+# SYSLIB2 = /opt/experimental/lib/libstdc++.a
+# SYSLIB2 = -lstdc++
+# -lgcc_s
+# SYSLIB2 = -L/usr/lib/lapack -lblas -lstdc++
+
+# goalngs = goalngs
+
+
+goalngs=goalngs
+appngs = lib/$(MACHINE)/*.o -lngsolvebasic
\ No newline at end of file
diff --git a/Netgen/libsrc/makefile.mach.LINUX b/Netgen/libsrc/makefile.mach.LINUX
index 44e4a5ccdd..f5df356167 100644
--- a/Netgen/libsrc/makefile.mach.LINUX
+++ b/Netgen/libsrc/makefile.mach.LINUX
@@ -1,7 +1,9 @@
#
-# Machine dependent make include file for gcc
+# Machine dependent make include file
#
#
+# CC=/opt/gcc-dev/bin/gcc
+# CC=/usr/local/bin/gcc
CC=gcc
CPLUSPLUS=$(CC)
AR=ar
@@ -13,8 +15,17 @@ RANLIB=ranlib
# Machine dependent flags:
#
CFLAGS2 =
-CPLUSPLUSFLAGS2 = -O2 -I/usr/X11R6/include -DLINUX -DOPENGL
-#
-LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib
-SYSLIB2 = -lstdc++
+CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \
+ -ftemplate-depth-99 -finline-limit=20000 \
+ -funroll-loops -DNGSOLVE
+
+LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++
+
+
+goalngs=goalngs
+
+# lapack = -llapack -lblas -lgmp -lg2c
+
+
+appngs = lib/$(MACHINE)/*.o -lngsolvebasic
\ No newline at end of file
diff --git a/Netgen/libsrc/makefile.mach.LINUXGCC33 b/Netgen/libsrc/makefile.mach.LINUXGCC33
new file mode 100644
index 0000000000..0a6ee84afb
--- /dev/null
+++ b/Netgen/libsrc/makefile.mach.LINUXGCC33
@@ -0,0 +1,33 @@
+#
+# Machine dependent make include file
+#
+#
+# CC=/opt/gcc33/bin/gcc
+# CC=/usr/local/bin/gcc
+CC=gcc
+CPLUSPLUS=$(CC)
+AR=ar
+LINK=$(CC)
+MAKE=make
+RM=rm
+RANLIB=ranlib
+#
+#
+CFLAGS2 =
+CPLUSPLUSFLAGS2 = -O2 -DLINUX -DOPENGL \
+ -ftemplate-depth-99 -finline-limit=20000 \
+ -mcpu=pentium4 -fforce-addr -funroll-loops \
+ -DnoTRAFO -DNGSOLVE -DnoADDON -DnoPML -DnoLAPACK \
+ -DnoOCCGEOMETRY -I/usr/include/g++/backward -I./occ/inc -DnoDEBUG
+#
+#
+#
+LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5
+
+SYSLIB2 = -lstdc++
+
+goalngs = goalngs
+
+appngs = lib/$(MACHINE)/*.o -lngsolvebasic
+
+# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL
\ No newline at end of file
diff --git a/Netgen/libsrc/meshing/adfront2.cpp b/Netgen/libsrc/meshing/adfront2.cpp
index e273144501..01b591f477 100644
--- a/Netgen/libsrc/meshing/adfront2.cpp
+++ b/Netgen/libsrc/meshing/adfront2.cpp
@@ -142,6 +142,8 @@ INDEX AdFront2 :: AddLine (INDEX pi1, INDEX pi2,
FrontPoint2 & p1 = points.Elem(pi1);
FrontPoint2 & p2 = points.Elem(pi2);
+
+
nfl++;
p1.AddLine();
@@ -265,7 +267,8 @@ void AdFront2 :: ResetClass (INDEX li)
int AdFront2 :: SelectBaseLine (Point3d & p1, Point3d & p2,
const PointGeomInfo *& geominfo1,
- const PointGeomInfo *& geominfo2)
+ const PointGeomInfo *& geominfo2,
+ int & qualclass)
{
int i, hi;
@@ -315,7 +318,7 @@ int AdFront2 :: SelectBaseLine (Point3d & p1, Point3d & p2,
if (!baselineindex)
{
- (*testout) << "nfl = " << nfl << " tot l = " << lines.Size() << endl;
+ // (*testotu) << "nfl = " << nfl << " tot l = " << lines.Size() << endl;
minval = INT_MAX;
for (i = 1; i <= lines.Size(); i++)
if (lines.Get(i).Valid())
@@ -339,6 +342,9 @@ int AdFront2 :: SelectBaseLine (Point3d & p1, Point3d & p2,
p2 = points.Get(lines.Get(baselineindex).L().I2()).P();
geominfo1 = &lines.Get(baselineindex).GetGeomInfo(1);
geominfo2 = &lines.Get(baselineindex).GetGeomInfo(2);
+
+ qualclass = lines.Get(baselineindex).LineClass();
+
return baselineindex;
}
@@ -367,24 +373,22 @@ int AdFront2 :: GetLocals (int baselineindex,
static ARRAY<int> nearlines;
nearlines.SetSize(0);
- double dist = xh;
- linesearchtree.GetIntersecting (p0 - Vec3d(dist, dist, dist),
- p0 + Vec3d(dist, dist, dist),
+
+ linesearchtree.GetIntersecting (p0 - Vec3d(xh, xh, xh),
+ p0 + Vec3d(xh, xh, xh),
nearlines);
- // for (i = 1; i <= lines.Size(); i++)
for (ii = 1; ii <= nearlines.Size(); ii++)
{
i = nearlines.Get(ii);
if (lines.Get(i).Valid() && i != baselineindex)
{
- const Point3d & p1 = points.Get(lines.Get(i).L().I1()).P();
- const Point3d & p2 = points.Get(lines.Get(i).L().I2()).P();
+ // const Point3d & p1 = points.Get(lines.Get(i).L().I1()).P();
+ // const Point3d & p2 = points.Get(lines.Get(i).L().I2()).P();
- midp = Center (p1, p2);
-
- if (Dist (midp, p0) <= xh + 0.5 * Dist (p1, p2))
+ // midp = Center (p1, p2);
+ // if (Dist (midp, p0) <= xh + 0.5 * Dist (p1, p2))
{
loclines.Append(lines.Get(i).L());
lindex.Append(i);
@@ -396,8 +400,10 @@ int AdFront2 :: GetLocals (int baselineindex,
invpindex.SetSize (points.Size());
for (i = 1; i <= loclines.Size(); i++)
- for (j = 1; j <= 2; j++)
- invpindex.Elem(loclines.Get(i).I(j)) = 0;
+ {
+ invpindex.Elem(loclines.Get(i).I1()) = 0;
+ invpindex.Elem(loclines.Get(i).I2()) = 0;
+ }
for (i = 1; i <= loclines.Size(); i++)
{
@@ -454,22 +460,10 @@ int AdFront2 :: GetLocals (int baselineindex,
for (i = 1; i <= locpoints.Size(); i++)
{
int pi = pindex.Get(i);
-
-
if (points.Get(pi).mgi)
for (j = 1; j <= points.Get(pi).mgi->GetNPGI(); j++)
pgeominfo.Elem(i).AddPointGeomInfo (points.Get(pi).mgi->GetPGI(j));
-/*
- {
- for (j = 0; j < points.Get(pi).mgi->cnt; j++)
- {
- pgeominfo.Elem(i).mgi[pgeominfo.Elem(i).cnt] =
- points.Get(pi).mgi->mgi[j];
- pgeominfo.Elem(i).cnt++;
- }
- }
-*/
}
@@ -485,7 +479,6 @@ int AdFront2 :: GetLocals (int baselineindex,
}
*/
-
if (loclines.Size() == 1)
{
cout << "loclines.Size = 1" << endl;
@@ -495,8 +488,6 @@ int AdFront2 :: GetLocals (int baselineindex,
<< " p0 = " << p0 << endl;
}
-
-
return lines.Get(baselineindex).LineClass();
}
diff --git a/Netgen/libsrc/meshing/adfront2.hpp b/Netgen/libsrc/meshing/adfront2.hpp
index b7a45e34e8..4e72c087fb 100644
--- a/Netgen/libsrc/meshing/adfront2.hpp
+++ b/Netgen/libsrc/meshing/adfront2.hpp
@@ -192,7 +192,8 @@ public:
///
int SelectBaseLine (Point3d & p1, Point3d & p2,
const PointGeomInfo *& geominfo1,
- const PointGeomInfo *& geominfo2);
+ const PointGeomInfo *& geominfo2,
+ int & qualclass);
///
int GetLocals (int baseline,
diff --git a/Netgen/libsrc/meshing/adfront3.cpp b/Netgen/libsrc/meshing/adfront3.cpp
index 657d0bc12b..1bf686e103 100644
--- a/Netgen/libsrc/meshing/adfront3.cpp
+++ b/Netgen/libsrc/meshing/adfront3.cpp
@@ -9,7 +9,7 @@ namespace netgen
FrontPoint3 :: FrontPoint3 ()
{
- globalindex = 0;
+ globalindex = -1;
nfacetopoint = 0;
frontnr = 1000;
cluster = 0;
@@ -47,7 +47,7 @@ FrontFace :: FrontFace (const Element2d & af)
void FrontFace :: Invalidate ()
{
- f.Delete(); // PNum(1) = 0;
+ f.Delete();
oldfront = 0;
qualclass = 1000;
}
@@ -67,9 +67,7 @@ AdFront3 :: AdFront3 ()
hashon = 1;
hashcreated = 0;
if (hashon)
- {
- hashtable.Init(&points, &faces);
- }
+ hashtable.Init(&points, &faces);
facetree = NULL;
connectedpairs = NULL;
@@ -82,10 +80,8 @@ AdFront3 :: AdFront3 ()
AdFront3 :: ~AdFront3 ()
{
- if (facetree)
- delete facetree;
- if (connectedpairs)
- delete connectedpairs;
+ delete facetree;
+ delete connectedpairs;
}
void AdFront3 :: GetPoints (ARRAY<Point3d> & apoints) const
@@ -97,7 +93,7 @@ void AdFront3 :: GetPoints (ARRAY<Point3d> & apoints) const
}
-INDEX AdFront3 :: AddPoint (const Point3d & p, PointIndex globind)
+PointIndex AdFront3 :: AddPoint (const Point3d & p, PointIndex globind)
{
if (delpointl.Size())
{
@@ -177,23 +173,20 @@ INDEX AdFront3 :: AddFace (const Element2d & aface)
void AdFront3 :: DeleteFace (INDEX fi)
{
- int i;
- INDEX pi;
-
nff--;
- for (i = 1; i <= faces.Get(fi).Face().GetNP(); i++)
+ for (int i = 1; i <= faces.Get(fi).Face().GetNP(); i++)
{
- pi = faces.Get(fi).Face().PNum(i);
- points.Elem(pi).RemoveFace();
- if (!points.Elem(pi).Valid())
+ PointIndex pi = faces.Get(fi).Face().PNum(i);
+ points[pi].RemoveFace();
+ if (!points[pi].Valid())
delpointl.Append (pi);
}
const Element2d & face = faces.Get(fi).Face();
- const Point3d & p1 = points.Get(face.PNum(1)).P();
- const Point3d & p2 = points.Get(face.PNum(2)).P();
- const Point3d & p3 = points.Get(face.PNum(3)).P();
+ const Point3d & p1 = points[face.PNum(1)].P();
+ const Point3d & p2 = points[face.PNum(2)].P();
+ const Point3d & p3 = points[face.PNum(3)].P();
vol -= 1.0/6.0 * (p1.X() + p2.X() + p3.X()) *
( (p2.Y() - p1.Y()) * (p3.Z() - p1.Z()) -
@@ -201,7 +194,7 @@ void AdFront3 :: DeleteFace (INDEX fi)
if (face.GetNP() == 4)
{
- const Point3d & p4 = points.Get(face.PNum(4)).P();
+ const Point3d & p4 = points[face.PNum(4)].P();
vol -= 1.0/6.0 * (p1.X() + p3.X() + p4.X()) *
( (p3.Y() - p1.Y()) * (p4.Z() - p1.Z()) -
(p3.Z() - p1.Z()) * (p4.Y() - p1.Y()) );
@@ -209,7 +202,6 @@ void AdFront3 :: DeleteFace (INDEX fi)
nff4--;
}
-
faces.Elem(fi).Invalidate();
}
@@ -217,11 +209,10 @@ void AdFront3 :: DeleteFace (INDEX fi)
INDEX AdFront3 :: AddConnectedPair (const INDEX_2 & apair)
{
if (!connectedpairs)
- connectedpairs = new TABLE<int> (GetNP());
+ connectedpairs = new TABLE<int, PointIndex::BASE> (GetNP());
- // (*testout) << "addconnectedpair " << apair << endl;
- connectedpairs->Add1 (apair.I1(), apair.I2());
- connectedpairs->Add1 (apair.I2(), apair.I1());
+ connectedpairs->Add (apair.I1(), apair.I2());
+ connectedpairs->Add (apair.I2(), apair.I1());
return 0;
}
@@ -265,9 +256,8 @@ void AdFront3 :: CreateTrees ()
pmax = pmax + 0.5 * (pmax - pmin);
pmin = pmin + 0.5 * (pmin - pmax);
- if (facetree)
- delete facetree;
+ delete facetree;
facetree = new Box3dTree (pmin, pmax);
for (i = 1; i <= GetNF(); i++)
@@ -312,16 +302,17 @@ void AdFront3 :: RebuildInternalTables ()
if (faces.Get(i).Valid())
{
hi++;
- faces.Elem(hi) = faces.Get(i);
+ if (hi < i)
+ faces.Elem(hi) = faces.Get(i);
}
faces.SetSize (nff);
int np = points.Size();
-
- for (i = 1; i <= np; i++)
- points.Elem(i).cluster = i;
+ for (i = PointIndex::BASE;
+ i < np+PointIndex::BASE; i++)
+ points[i].cluster = i;
int change;
do
@@ -331,12 +322,12 @@ void AdFront3 :: RebuildInternalTables ()
{
const Element2d & el = faces.Get(i).Face();
- int mini = points.Get(el.PNum(1)).cluster;
+ int mini = points[el.PNum(1)].cluster;
int maxi = mini;
for (j = 2; j <= 3; j++)
{
- int ci = points.Get(el.PNum(j)).cluster;
+ int ci = points[el.PNum(j)].cluster;
if (ci < mini) mini = ci;
if (ci > maxi) maxi = ci;
}
@@ -345,37 +336,36 @@ void AdFront3 :: RebuildInternalTables ()
{
change = 1;
for (j = 1; j <= 3; j++)
- points.Elem(el.PNum(j)).cluster = mini;
+ points[el.PNum(j)].cluster = mini;
}
}
}
while (change);
- BitArray usecl(np);
+ BitArrayChar<PointIndex::BASE> usecl(np);
usecl.Clear();
for (i = 1; i <= faces.Size(); i++)
{
- usecl.Set (points.Get(faces.Get(i).Face().PNum(1)).cluster);
+ usecl.Set (points[faces.Get(i).Face().PNum(1)].cluster);
faces.Elem(i).cluster =
- points.Get(faces.Get(i).Face().PNum(1)).cluster;
+ points[faces.Get(i).Face().PNum(1)].cluster;
}
int cntcl = 0;
- for (i = 1; i <= np; i++)
+ for (i = PointIndex::BASE;
+ i < np+PointIndex::BASE; i++)
if (usecl.Test(i))
cntcl++;
- ARRAY<double> clvol (np);
- for (i = 1; i <= np; i++)
- clvol.Elem(i) = 0;
+ ARRAY<double, PointIndex::BASE> clvol (np);
+ clvol = 0.0;
for (i = 1; i <= faces.Size(); i++)
{
const Element2d & face = faces.Get(i).Face();
- const Point3d & p1 = points.Get(face.PNum(1)).P();
- const Point3d & p2 = points.Get(face.PNum(2)).P();
- const Point3d & p3 = points.Get(face.PNum(3)).P();
-
+ const Point3d & p1 = points[face.PNum(1)].P();
+ const Point3d & p2 = points[face.PNum(2)].P();
+ const Point3d & p3 = points[face.PNum(3)].P();
double vi = 1.0/6.0 * (p1.X() + p2.X() + p3.X()) *
( (p2.Y() - p1.Y()) * (p3.Z() - p1.Z()) -
@@ -383,31 +373,31 @@ void AdFront3 :: RebuildInternalTables ()
if (face.GetNP() == 4)
{
- const Point3d & p4 = points.Get(face.PNum(4)).P();
+ const Point3d & p4 = points[face.PNum(4)].P();
vi += 1.0/6.0 * (p1.X() + p3.X() + p4.X()) *
( (p3.Y() - p1.Y()) * (p4.Z() - p1.Z()) -
(p3.Z() - p1.Z()) * (p4.Y() - p1.Y()) );
}
- clvol.Elem (faces.Get(i).cluster) += vi;
+ clvol[faces.Get(i).cluster] += vi;
}
int negvol = 0;
- for (i = 1; i <= clvol.Size(); i++)
+ for (i = PointIndex::BASE;
+ i < clvol.Size()+PointIndex::BASE; i++)
{
- if (clvol.Elem(i) < 0)
- {
- negvol = 1;
- }
+ if (clvol[i] < 0)
+ negvol = 1;
}
if (negvol)
{
for (i = 1; i <= faces.Size(); i++)
faces.Elem(i).cluster = 1;
- for (i = 1; i <= points.Size(); i++)
- points.Elem(i).cluster = 1;
+ for (i = PointIndex::BASE;
+ i < points.Size()+PointIndex::BASE; i++)
+ points[i].cluster = 1;
}
if (hashon)
@@ -450,9 +440,9 @@ int AdFront3 :: SelectBaseElement ()
if (faces.Elem(i).Valid())
{
hi = faces.Get(i).QualClass() +
- points.Get(faces.Get(i).Face().PNum(1)).FrontNr() +
- points.Get(faces.Get(i).Face().PNum(2)).FrontNr() +
- points.Get(faces.Get(i).Face().PNum(3)).FrontNr();
+ points[faces.Get(i).Face().PNum(1)].FrontNr() +
+ points[faces.Get(i).Face().PNum(2)].FrontNr() +
+ points[faces.Get(i).Face().PNum(3)].FrontNr();
if (hi <= minval)
{
@@ -469,9 +459,9 @@ int AdFront3 :: SelectBaseElement ()
if (faces.Elem(i).Valid())
{
hi = faces.Get(i).QualClass() +
- points.Get(faces.Get(i).Face().PNum(1)).FrontNr() +
- points.Get(faces.Get(i).Face().PNum(2)).FrontNr() +
- points.Get(faces.Get(i).Face().PNum(3)).FrontNr();
+ points[faces.Get(i).Face().PNum(1)].FrontNr() +
+ points[faces.Get(i).Face().PNum(2)].FrontNr() +
+ points[faces.Get(i).Face().PNum(3)].FrontNr();
if (hi <= minval)
{
@@ -501,14 +491,16 @@ int AdFront3 :: GetLocals (int fstind,
if (hashon && faces.Size() < 500) { hashon=0; }
if (hashon && !hashcreated)
{
- hashtable.Create(); hashcreated=1;
+ hashtable.Create();
+ hashcreated=1;
}
INDEX i, j;
- INDEX pstind;
+ PointIndex pstind;
INDEX pi;
Point3d midp, p0;
- static ARRAY<int> invpindex;
+
+ static ARRAY<int, PointIndex::BASE> invpindex;
static ARRAY<Element2d> locfaces2; //all local faces in radius xh
static ARRAY<int> locfaces3; // all faces in outer radius relh
@@ -521,7 +513,7 @@ int AdFront3 :: GetLocals (int fstind,
int cluster = faces.Get(fstind).cluster;
pstind = faces.Get(fstind).Face().PNum(1);
- p0 = points.Get(pstind).P();
+ p0 = points[pstind].P();
locfaces2.Append(faces.Get(fstind).Face());
findex2.Append(fstind);
@@ -540,9 +532,9 @@ int AdFront3 :: GetLocals (int fstind,
const Element2d & face = faces.Get(i).Face();
if (faces.Get(i).cluster == cluster && faces.Get(i).Valid() && i != fstind)
{
- const Point3d & p1 = points.Get(face.PNum(1)).P();
- const Point3d & p2 = points.Get(face.PNum(2)).P();
- const Point3d & p3 = points.Get(face.PNum(3)).P();
+ const Point3d & p1 = points[face.PNum(1)].P();
+ const Point3d & p2 = points[face.PNum(2)].P();
+ const Point3d & p3 = points[face.PNum(3)].P();
Box3d b2;
b2.SetPoint (p1);
@@ -571,9 +563,9 @@ int AdFront3 :: GetLocals (int fstind,
for (i = 1; i <= locfaces2.Size(); i++)
{
const Element2d & face = locfaces2.Get(i);
- const Point3d & p1 = points.Get(face.PNum(1)).P();
- const Point3d & p2 = points.Get(face.PNum(2)).P();
- const Point3d & p3 = points.Get(face.PNum(3)).P();
+ const Point3d & p1 = points[face.PNum(1)].P();
+ const Point3d & p2 = points[face.PNum(2)].P();
+ const Point3d & p3 = points[face.PNum(3)].P();
midp = Center (p1, p2, p3);
@@ -602,26 +594,22 @@ int AdFront3 :: GetLocals (int fstind,
for (j = 1; j <= locfaces.Get(i).GetNP(); j++)
{
pi = locfaces.Get(i).PNum(j);
- invpindex.Elem(pi) = 0;
+ invpindex[pi] = -1;
}
- /*
- for (i = 1; i <= points.Size(); i++)
- invpindex.Elem(i) = 0;
- */
for (i = 1; i <= locfaces.Size(); i++)
{
for (j = 1; j <= locfaces.Get(i).GetNP(); j++)
{
pi = locfaces.Get(i).PNum(j);
- if (invpindex.Get(pi) == 0)
+ if (invpindex[pi] == -1)
{
pindex.Append (pi);
- invpindex.Elem(pi) = pindex.Size();
- locfaces.Elem(i).PNum(j) = locpoints.Append (points.Get(pi).P());
+ invpindex[pi] = pindex.Size(); // -1+PointIndex::BASE;
+ locfaces.Elem(i).PNum(j) = locpoints.Append (points[pi].P());
}
else
- locfaces.Elem(i).PNum(j) = invpindex.Get(pi);
+ locfaces.Elem(i).PNum(j) = invpindex[pi];
}
}
@@ -775,7 +763,7 @@ void AdFront3 :: SetStartFront (int /* baseelnp */)
{
const Element2d & face = faces.Get(i).Face();
for (j = 1; j <= 3; j++)
- points.Elem(face.PNum(j)).DecFrontNr(0);
+ points[face.PNum(j)].DecFrontNr(0);
}
/*
diff --git a/Netgen/libsrc/meshing/adfront3.hpp b/Netgen/libsrc/meshing/adfront3.hpp
index 50e30c56cb..2c43f9334b 100644
--- a/Netgen/libsrc/meshing/adfront3.hpp
+++ b/Netgen/libsrc/meshing/adfront3.hpp
@@ -110,23 +110,24 @@ public:
}
///
- int Valid () const
- {
- return !f.IsDeleted(); // PNum(1) != 0;
- }
+ bool Valid () const
+ { return !f.IsDeleted(); }
///
void Invalidate ();
+
///
- int HashValue() const {return hashvalue;}
+ int HashValue() const
+ { return hashvalue; }
+
///
- void SetHashValue(int hv) {hashvalue = hv;}
+ void SetHashValue(int hv)
+ { hashvalue = hv; }
///
friend class AdFront3;
int Cluster () const { return cluster; }
-
};
@@ -136,14 +137,14 @@ public:
class AdFront3
{
///
- ARRAY<FrontPoint3,PointIndex::BASE> points;
+ ARRAY<FrontPoint3, PointIndex::BASE> points;
///
ARRAY<FrontFace> faces;
///
ARRAY<PointIndex> delpointl;
/// which points are connected to pi ?
- TABLE<int> * connectedpairs;
+ TABLE<int, PointIndex::BASE> * connectedpairs;
/// number of total front faces;
int nff;
@@ -194,10 +195,10 @@ public:
///
void Print () const;
///
- int Empty () const
+ bool Empty () const
{ return nff == 0; }
///
- int Empty (int elnp) const
+ bool Empty (int elnp) const
{
if (elnp == 4)
return (nff4 == 0);
@@ -238,7 +239,7 @@ public:
///
void DeleteFace (INDEX fi);
///
- INDEX AddPoint (const Point3d & p, PointIndex globind);
+ PointIndex AddPoint (const Point3d & p, PointIndex globind);
///
INDEX AddFace (const Element2d & e);
///
@@ -253,7 +254,8 @@ public:
/// is Point p inside Surface ?
int Inside (const Point3d & p) const;
/// both points on same side ?
- int SameSide (const Point3d & lp1, const Point3d & lp2, const ARRAY<int> * testfaces = NULL) const;
+ int SameSide (const Point3d & lp1, const Point3d & lp2,
+ const ARRAY<int> * testfaces = NULL) const;
///
diff --git a/Netgen/libsrc/meshing/bisect.cpp b/Netgen/libsrc/meshing/bisect.cpp
index 39420983c8..45d72b50d4 100644
--- a/Netgen/libsrc/meshing/bisect.cpp
+++ b/Netgen/libsrc/meshing/bisect.cpp
@@ -4,7 +4,7 @@
namespace netgen
{
-#include "../interface/writeuser.hpp"
+//#include "../interface/writeuser.hpp"
class MarkedTet;
class MarkedPrism;
@@ -1491,6 +1491,49 @@ void Refinement :: Bisect (Mesh & mesh,
*/
+
+ if (opt.refine_p)
+ {
+ int ne = mesh.GetNE();
+ int nse = mesh.GetNSE();
+ int ii = 0;
+ for (ElementIndex ei = 0; ei < ne; ei++)
+ if (mesh[ei].TestRefinementFlag())
+ mesh[ei].SetOrder (mesh[ei].GetOrder()+1);
+
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
+ if (mesh[sei].TestRefinementFlag())
+ mesh[sei].SetOrder (mesh[sei].GetOrder()+1);
+
+
+ ARRAY<int,PointIndex::BASE> v_order (mesh.GetNP());
+ v_order = 0;
+
+ for (ElementIndex ei = 0; ei < ne; ei++)
+ for (j = 0; j < mesh[ei].GetNP(); j++)
+ if (mesh[ei].GetOrder() > v_order[mesh[ei][j]])
+ v_order[mesh[ei][j]] = mesh[ei].GetOrder();
+
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
+ for (j = 0; j < mesh[sei].GetNP(); j++)
+ if (mesh[sei].GetOrder() > v_order[mesh[sei][j]])
+ v_order[mesh[sei][j]] = mesh[sei].GetOrder();
+
+ for (ElementIndex ei = 0; ei < ne; ei++)
+ for (j = 0; j < mesh[ei].GetNP(); j++)
+ if (mesh[ei].GetOrder() < v_order[mesh[ei][j]]-1)
+ mesh[ei].SetOrder(v_order[mesh[ei][j]]-1);
+
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
+ for (j = 0; j < mesh[sei].GetNP(); j++)
+ if (mesh[sei].GetOrder() < v_order[mesh[sei][j]]-1)
+ mesh[sei].SetOrder(v_order[mesh[sei][j]]-1);
+
+ return;
+ }
+
+
+
// INDEX_2_HASHTABLE<int> cutedges(10 + 5 * (mtets.Size()+mprisms.Size()+mtris.Size()+mquads.Size()));
INDEX_2_CLOSED_HASHTABLE<int> cutedges(10 + 9 * (mtets.Size()+mprisms.Size()+mtris.Size()+mquads.Size()));
@@ -1526,7 +1569,7 @@ void Refinement :: Bisect (Mesh & mesh,
mesh.VolumeElement(i).GetType() == TET10)
{
cnttet++;
- mtets.Elem(cnttet).marked =
+ mtets.Elem(cnttet).marked =
3 * mesh.VolumeElement(i).TestRefinementFlag();
if (mtets.Elem(cnttet).marked)
cntm++;
@@ -1534,18 +1577,18 @@ void Refinement :: Bisect (Mesh & mesh,
else
{
cntprism++;
- mprisms.Elem(cntprism).marked =
+ mprisms.Elem(cntprism).marked =
2 * mesh.VolumeElement(i).TestRefinementFlag();
if (mprisms.Elem(cntprism).marked)
- cntm++;
+ cntm++;
}
-
+
}
}
else
for (i = 1; i <= mtets.Size(); i++)
{
- mtets.Elem(i).marked =
+ mtets.Elem(i).marked =
3 * mesh.VolumeElement(i).TestRefinementFlag();
if (mtets.Elem(i).marked)
cntm++;
@@ -1570,8 +1613,8 @@ void Refinement :: Bisect (Mesh & mesh,
mesh.SurfaceElement(i).GetType() == TRIG6)
{
cnttrig++;
- mtris.Elem(cnttrig).marked =
- 2*mesh.SurfaceElement(i).TestRefinementFlag();
+ mtris.Elem(cnttrig).marked =
+ mesh.SurfaceElement(i).TestRefinementFlag() ? 2 : 0;
// mtris.Elem(cnttrig).marked = 0;
if (mtris.Elem(cnttrig).marked)
cntm++;
@@ -1579,7 +1622,7 @@ void Refinement :: Bisect (Mesh & mesh,
else
{
cntquad++;
- mquads.Elem(cntquad).marked =
+ mquads.Elem(cntquad).marked =
mesh.SurfaceElement(i).TestRefinementFlag();
// mquads.Elem(cntquad).marked = 0;
if (mquads.Elem(cntquad).marked)
@@ -1594,13 +1637,13 @@ void Refinement :: Bisect (Mesh & mesh,
cntm = 0;
for (i = 1; i <= mtris.Size(); i++)
{
- mtris.Elem(i).marked =
+ mtris.Elem(i).marked =
2 * mesh.SurfaceElement(i).TestRefinementFlag();
// mtris.Elem(i).marked = 2;
if (mtris.Elem(i).marked)
cntm++;
}
-
+
if (!cntm)
{
for (i = 1; i <= mtris.Size(); i++)
@@ -1623,13 +1666,42 @@ void Refinement :: Bisect (Mesh & mesh,
if (!marked) break;
+ if (opt.refine_p)
+ {
+ cout << "refine p" << endl;
+
+ for (i = 1; i <= mtets.Size(); i++)
+ mtets.Elem(i).incorder = mtets.Elem(i).marked ? 1 : 0;
+
+ for (i = 1; i <= mtets.Size(); i++)
+ if (mtets.Elem(i).incorder)
+ mtets.Elem(i).marked = 0;
+
+
+ for (i = 1; i <= mprisms.Size(); i++)
+ mprisms.Elem(i).incorder = mprisms.Elem(i).marked ? 1 : 0;
+
+ for (i = 1; i <= mprisms.Size(); i++)
+ if (mprisms.Elem(i).incorder)
+ mprisms.Elem(i).marked = 0;
+
+
+ for (i = 1; i <= mtris.Size(); i++)
+ mtris.Elem(i).incorder = mtris.Elem(i).marked ? 1 : 0;
+
+ for (i = 1; i <= mtris.Size(); i++)
+ {
+ if (mtris.Elem(i).incorder)
+ mtris.Elem(i).marked = 0;
+ }
+ }
if (opt.refine_hp)
{
cout << "refine hp" << endl;
BitArray singv(np);
singv.Clear();
-
+
if (mesh.GetDimension() == 3)
for (i = 1; i <= mesh.GetNSeg(); i++)
{
@@ -1655,7 +1727,7 @@ void Refinement :: Bisect (Mesh & mesh,
}
}
}
-
+
for (i = 1; i <= mtets.Size(); i++)
@@ -2267,6 +2339,7 @@ BisectionOptions :: BisectionOptions ()
maxlevel = 50;
usemarkedelements = 0;
refine_hp = 0;
+ refine_p = 0;
}
diff --git a/Netgen/libsrc/meshing/bisect.hpp b/Netgen/libsrc/meshing/bisect.hpp
index 2d8988de0e..8a1e836116 100644
--- a/Netgen/libsrc/meshing/bisect.hpp
+++ b/Netgen/libsrc/meshing/bisect.hpp
@@ -11,6 +11,7 @@ public:
int maxlevel;
int usemarkedelements;
bool refine_hp;
+ bool refine_p;
BisectionOptions ();
};
@@ -43,7 +44,7 @@ public:
Refinement ();
virtual ~Refinement ();
- void Refine (Mesh & mesh, int levels);
+ void Refine (Mesh & mesh);
void Bisect (Mesh & mesh, class BisectionOptions & opt);
void MakeSecondOrder (Mesh & mesh);
@@ -61,6 +62,11 @@ public:
virtual void ProjectToSurface (Point<3> & p, int surfi);
+ virtual void ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & /* gi */)
+ {
+ ProjectToSurface (p, surfi);
+ }
+
void ValidateSecondOrder (Mesh & mesh);
void ValidateRefinedMesh (Mesh & mesh,
diff --git a/Netgen/libsrc/meshing/clusters.cpp b/Netgen/libsrc/meshing/clusters.cpp
index ed76676746..5eef2078e7 100644
--- a/Netgen/libsrc/meshing/clusters.cpp
+++ b/Netgen/libsrc/meshing/clusters.cpp
@@ -91,9 +91,13 @@ void AnisotropicClusters :: Update()
cluster_reps.Elem(nnums[j]) = nnums[j];
}
-
-
-
+ static const int hex_cluster[] =
+ {
+ 1, 2, 3, 4, 1, 2, 3, 4,
+ 5, 6, 7, 8, 5, 6, 7, 8, 1, 2, 3, 4,
+ 9, 9, 5, 8, 6, 7,
+ 9
+ };
static const int prism_cluster[] =
{
@@ -162,6 +166,9 @@ void AnisotropicClusters :: Update()
case PRISM12:
clustertab = prism_cluster;
break;
+ case HEX:
+ clustertab = hex_cluster;
+ break;
case PYRAMID:
clustertab = pyramid_cluster;
break;
diff --git a/Netgen/libsrc/meshing/curvedelems.cpp b/Netgen/libsrc/meshing/curvedelems.cpp
index fc0e590366..bce489fc84 100644
--- a/Netgen/libsrc/meshing/curvedelems.cpp
+++ b/Netgen/libsrc/meshing/curvedelems.cpp
@@ -132,18 +132,24 @@ namespace netgen
vdshape[0] = 1;
vdshape[1] = -1;
+ /*
if (edgeorient == -1)
{
Swap (vshape[0], vshape[1]);
Swap (vdshape[0], vdshape[1]);
}
+ */
+
}
void BaseFiniteElement1D :: CalcEdgeShapes ()
{
b.SetOrder (edgeorder);
- b.CalcFDf( 1-xi(0) );
+ if (edgeorient == 1)
+ b.CalcFDf( 1-xi(0) );
+ else
+ b.CalcFDf( xi(0) );
for (int k = 2; k <= edgeorder; k++)
{
@@ -156,7 +162,10 @@ namespace netgen
void BaseFiniteElement1D :: CalcEdgeLaplaceShapes ()
{
b.SetOrder (edgeorder);
- b.CalcDDf( 1-xi(0) );
+ if (edgeorient == 1)
+ b.CalcDDf( 1-xi(0) );
+ else
+ b.CalcDDf( xi(0) );
for (int k = 2; k <= edgeorder; k++)
eddshape[k-2] = b.GetDDf(k);
@@ -175,7 +184,7 @@ namespace netgen
int locmaxedgeorder = -1;
BaseFiniteElement<2> :: SetElementNumber (aelnr);
- Element2d elem = mesh[(SurfaceElementIndex) (elnr-1)];
+ const Element2d & elem = mesh[(SurfaceElementIndex) (elnr-1)];
top.GetSurfaceElementEdges (elnr, &(edgenr[0]), &(edgeorient[0]));
facenr = top.GetSurfaceElementFace (elnr);
faceorient = top.GetSurfaceElementFaceOrientation (elnr);
@@ -233,19 +242,19 @@ namespace netgen
for (f = 0; f < nfaces; f++)
{
surfacenr[f] = top.GetFace2SurfaceElement (facenr[f]);
- surfaceorient[f] = top.GetSurfaceElementFaceOrientation (surfacenr[f]);
+ // surfaceorient[f] = top.GetSurfaceElementFaceOrientation (surfacenr[f]);
}
for (e = 0; e < nedges; e++)
{
edgeorder[e] = curv.GetEdgeOrder (edgenr[e]-1); // 1-based
- locmaxedgeorder = max2 (edgeorder[e], locmaxedgeorder);
+ locmaxedgeorder = max (edgeorder[e], locmaxedgeorder);
}
for (f = 0; f < nfaces; f++)
{
faceorder[f] = curv.GetFaceOrder (facenr[f]-1); // 1-based
- locmaxfaceorder = max2 (faceorder[f], locmaxfaceorder);
+ locmaxfaceorder = max (faceorder[f], locmaxfaceorder);
}
CalcNFaceShapes ();
@@ -333,6 +342,8 @@ namespace netgen
int index = 0;
for (int e = 0; e < nedges; e++)
{
+ if (edgeorder[e] <= 1) continue;
+
int i0 = eledge[e][0]-1;
int i1 = eledge[e][1]-1;
@@ -382,6 +393,8 @@ namespace netgen
}
}
// (*testout) << "eshape = " << eshape << ", edshape = " << edshape << endl;
+
+
/*
index = 0;
for (int e = 0; e < nedges; e++)
@@ -916,6 +929,8 @@ namespace netgen
for (int f = 0; f < nfaces; f++)
{
+ if (faceorder[f] <= 2) continue;
+
int i0 = elface[f][0]-1;
int i1 = elface[f][1]-1;
int i2 = elface[f][2]-1;
@@ -1562,6 +1577,17 @@ namespace netgen
int CurvedElements :: IsSurfaceElementCurved (int elnr) const
{
+ if (mesh.coarsemesh)
+ {
+ const HPRefElement & hpref_el =
+ (*mesh.hpelements) [ mesh[(SurfaceElementIndex) elnr].hp_elnr];
+
+ return mesh.coarsemesh->GetCurvedElements().IsSurfaceElementCurved (hpref_el.coarse_elnr);
+ }
+
+
+
+
Element2d elem = mesh[(SurfaceElementIndex) elnr];
switch (elem.GetType())
@@ -1590,6 +1616,16 @@ namespace netgen
int CurvedElements :: IsElementCurved (int elnr) const
{
+ if (mesh.coarsemesh)
+ {
+ const HPRefElement & hpref_el =
+ (*mesh.hpelements) [ mesh[(ElementIndex) elnr].hp_elnr];
+
+ return mesh.coarsemesh->GetCurvedElements().IsElementCurved (hpref_el.coarse_elnr);
+ }
+
+
+
Element elem = mesh[(ElementIndex) elnr];
switch (elem.GetType())
@@ -1682,9 +1718,50 @@ namespace netgen
void CurvedElements :: CalcSurfaceTransformation (Point<2> xi, int elnr,
Point<3> * x, Mat<3,2> * dxdxi)
{
- Element2d elem = mesh[(SurfaceElementIndex) elnr];
- BaseFiniteElement2D * fe2d;
+ if (mesh.coarsemesh)
+ {
+ const HPRefElement & hpref_el =
+ (*mesh.hpelements) [ mesh[(SurfaceElementIndex) elnr].hp_elnr];
+
+ // xi umrechnen
+ double lami[4];
+ switch (mesh[(SurfaceElementIndex) elnr].GetType())
+ {
+ case TRIG:
+ {
+ lami[0] = xi(0);
+ lami[1] = xi(1);
+ lami[2] = 1-xi(0)-xi(1);
+ lami[3] = 0;
+ break;
+ }
+ case QUAD:
+ {
+ lami[0] = (1-xi(0))*(1-xi(1));
+ lami[1] = xi(0) * (1-xi(1));
+ lami[2] = xi(0) * xi(1);
+ lami[3] = (1-xi(0))*xi(1);
+ break;
+ }
+ }
+ Point<2> coarse_xi(0,0);
+ for (int i = 0; i < 4; i++)
+ {
+ coarse_xi(0) += hpref_el.param[i][0] * lami[i];
+ coarse_xi(1) += hpref_el.param[i][1] * lami[i];
+ }
+ mesh.coarsemesh->GetCurvedElements().CalcSurfaceTransformation (coarse_xi, hpref_el.coarse_elnr, x, dxdxi);
+
+ return;
+ }
+
+
+
+
+ const Element2d & elem = mesh[(SurfaceElementIndex) elnr];
+
+ BaseFiniteElement2D * fe2d;
// char locmem[max2(sizeof(FEQuad), sizeof(FETrig))];
char locmemtrig[sizeof(FETrig)];
@@ -1798,8 +1875,58 @@ namespace netgen
void CurvedElements :: CalcElementTransformation (Point<3> xi, int elnr,
- Point<3> * x, Mat<3,3> * dxdxi)
+ Point<3> * x, Mat<3,3> * dxdxi)
{
+
+ if (mesh.coarsemesh)
+ {
+ const HPRefElement & hpref_el =
+ (*mesh.hpelements) [ mesh[(ElementIndex) elnr].hp_elnr];
+
+
+ double lami[8];
+ FlatVector vlami(8, lami);
+ vlami = 0;
+ mesh[(ElementIndex) elnr] . GetShapeNew (xi, vlami);
+
+ Point<3> coarse_xi(0,0,0);
+ for (int i = 0; i < 8; i++)
+ for (int l = 0; l < 3; l++)
+ coarse_xi(l) += hpref_el.param[i][l] * lami[i];
+
+ Mat<3,3> trans, dxdxic;
+ if (dxdxi)
+ {
+ MatrixFixWidth<3> dlami(8);
+ dlami = 0;
+ mesh[(ElementIndex) elnr] . GetDShapeNew (xi, dlami);
+
+ trans = 0;
+ for (int k = 0; k < 3; k++)
+ for (int l = 0; l < 3; l++)
+ {
+ double sum = 0;
+ for (int i = 0; i < 8; i++)
+ sum += hpref_el.param[i][l] * dlami(i, k);
+ trans(l,k) = sum;
+ }
+ }
+
+ mesh.coarsemesh->GetCurvedElements().CalcElementTransformation (coarse_xi, hpref_el.coarse_elnr, x, &dxdxic);
+
+ if (dxdxi)
+ *dxdxi = dxdxic * trans;
+ return;
+ }
+
+
+
+
+
+
+
+
+
Element elem = mesh[(ElementIndex) elnr];
BaseFiniteElement3D * fe3d;
diff --git a/Netgen/libsrc/meshing/curvedelems.hpp b/Netgen/libsrc/meshing/curvedelems.hpp
index 7328d27d66..dd11eef051 100644
--- a/Netgen/libsrc/meshing/curvedelems.hpp
+++ b/Netgen/libsrc/meshing/curvedelems.hpp
@@ -78,6 +78,8 @@ public:
bool IsHighOrder() const
{ return isHighOrder; };
+ void SetHighOrder () { isHighOrder = 1; }
+
int GetNVisualSubsecs() const
{ return nvisualsubsecs; };
@@ -547,7 +549,7 @@ public:
virtual ~FEQuad()
{};
- virtual void SetVertexSingularity (int v, int exponent)
+ virtual void SetVertexSingularity (int /* v */, int /* exponent */)
{};
virtual void CalcVertexShapes();
@@ -580,7 +582,7 @@ protected:
int faceorient[6];
int faceorder[6];
int surfacenr[6];
- int surfaceorient[6];
+ // int surfaceorient[6];
int nfaceshapes[6];
diff --git a/Netgen/libsrc/meshing/curvedelems2.cpp b/Netgen/libsrc/meshing/curvedelems2.cpp
index d01a13af79..6b79ee5fe9 100644
--- a/Netgen/libsrc/meshing/curvedelems2.cpp
+++ b/Netgen/libsrc/meshing/curvedelems2.cpp
@@ -27,6 +27,15 @@ namespace netgen
void CurvedElements :: BuildCurvedElements(Refinement * ref, int polydeg)
{
+ if (mesh.coarsemesh)
+ {
+ mesh.coarsemesh->GetCurvedElements().BuildCurvedElements (ref, polydeg);
+ SetHighOrder();
+ return;
+ }
+
+ PrintMessage (2, "Build curved elements, order = ", polydeg);
+
NgLock lock(const_cast<Mesh&>(mesh).Mutex(), 1);
isHighOrder = 0;
lock.UnLock();
@@ -51,7 +60,7 @@ namespace netgen
edgeorder.SetSize (top.GetNEdges());
faceorder.SetSize (top.GetNFaces());
- int nedgestocurve = top.GetNEdges();
+ int nedgestocurve = mesh.GetNSeg();
edgedone = 0;
edgeorder = 1;
@@ -174,13 +183,12 @@ namespace netgen
segm.CalcEdgeLaplaceShapes ();
Point<3> xv(0,0,0);
+
for (int v = 0; v < 2; v++)
xv = xv + segm.GetVertexShape(v) * mesh.Point(segm.GetVertexNr(v));
-
+
double secpoint = xi[l];
- if (segm.GetEdgeOrientation() == -1) secpoint = 1. - secpoint; // reverse orientation
-
ref->PointBetween (mesh.Point(segm.GetVertexNr(1)),
mesh.Point(segm.GetVertexNr(0)), secpoint,
s.surfnr2, s.surfnr1,
@@ -207,11 +215,12 @@ namespace netgen
if (mesh.GetDimension() == 3)
{
+ int nedgescurved = mesh.GetNSeg();
for (int i=0; i<mesh.GetNSE(); i++)
{
if (multithread.terminate) return;
- SetThreadPercent( double(100*(mesh.GetNSeg()+i)/nedgestocurve) );
+ // SetThreadPercent( double(100*(mesh.GetNSeg()+i)/nedgestocurve) );
Element2d elem = mesh[(SurfaceElementIndex) i];
const ELEMENT_EDGE * eledges = MeshTopology::GetEdges(elem.GetType());
@@ -219,13 +228,19 @@ namespace netgen
ARRAY<int> orient;
top.GetSurfaceElementEdges(i+1, edgenrs);
top.GetSurfaceElementEdgeOrientations(i+1, orient);
-
+
for (int e = 0; e < top.GetNEdges(elem.GetType()); e++)
{
+// cout << "e = " << e << "/" << top.GetNEdges(elem.GetType()) << endl;
+
+ nedgescurved++;
+
if (edgedone[edgenrs[e]-1]) continue;
edgedone[edgenrs[e]-1] = 1;
+ SetThreadPercent( double(100*(nedgescurved)/nedgestocurve) );
+
edge.SetElementNumber (edgenrs[e]);
for (k = 2; k <= edge.GetEdgeOrder(); k++)
@@ -233,6 +248,7 @@ namespace netgen
for (int l = 0; l < nIntegrationPoints; l++)
{
+// cout << "." << flush;
edge.SetReferencePoint (Point<1>(xi[l]));
edge.CalcVertexShapes ();
edge.CalcEdgeLaplaceShapes ();
@@ -243,18 +259,26 @@ namespace netgen
double secpoint = xi[l];
- ref->PointBetween (mesh.Point(edge.GetVertexNr(1)),
- mesh.Point(edge.GetVertexNr(0)), secpoint,
- mesh.GetFaceDescriptor(elem.GetIndex()).SurfNr(),
- elem.GeomInfoPi(eledges[e][1]),
- elem.GeomInfoPi(eledges[e][0]),
- xexact, newgi);
+ if (orient[e] == 1)
+ ref->PointBetween (mesh.Point(edge.GetVertexNr(1)),
+ mesh.Point(edge.GetVertexNr(0)), secpoint,
+ mesh.GetFaceDescriptor(elem.GetIndex()).SurfNr(),
+ elem.GeomInfoPi(eledges[e][1]),
+ elem.GeomInfoPi(eledges[e][0]),
+ xexact, newgi);
+ else
+ ref->PointBetween (mesh.Point(edge.GetVertexNr(1)),
+ mesh.Point(edge.GetVertexNr(0)), secpoint,
+ mesh.GetFaceDescriptor(elem.GetIndex()).SurfNr(),
+ elem.GeomInfoPi(eledges[e][0]),
+ elem.GeomInfoPi(eledges[e][1]),
+ xexact, newgi);
for (k = 2; k <= edge.GetEdgeOrder(); k++)
edgecoeffs[edgecoeffsindex[edgenrs[e]-1]+k-2] -=
wi[l] * edge.GetEdgeLaplaceShape(k-2) * Vec<3>(xexact - xv);
}
-
+// cout << endl;
for (k = 2; k <= edge.GetEdgeOrder(); k++)
edgecoeffs[edgecoeffsindex[edgenrs[e]-1]+k-2] =
(2.0*(k-1.0)+1.0)*edgecoeffs[edgecoeffsindex[edgenrs[e]-1]+k-2];
@@ -512,11 +536,20 @@ namespace netgen
// integration over the difference between the exact geometry and the one
// defined by vertex and edge shape functions times face shape
+ // double giu = 0, giv = 0;
+ PointGeomInfo gi;
+ gi.trignum = elem.GeomInfoPi(1).trignum;
+ gi.u = 0.0;
+ gi.v = 0.0;
Point<3> xve(0.,0.,0.);
// vertex shape functions
for (int v = 0; v < fe2d->GetNVertices(); v++)
- xve = xve + fe2d->GetVertexShape(v) * mesh.Point(fe2d->GetVertexNr(v));
+ {
+ xve = xve + fe2d->GetVertexShape(v) * mesh.Point(fe2d->GetVertexNr(v));
+ gi.u += fe2d->GetVertexShape(v) * elem.GeomInfoPi(v+1).u;
+ gi.v += fe2d->GetVertexShape(v) * elem.GeomInfoPi(v+1).v;
+ }
// edge shape functions
int index = 0;
@@ -530,7 +563,7 @@ namespace netgen
// exact point
Point<3> xexact = xve;
- ref->ProjectToSurface (xexact, mesh.GetFaceDescriptor(elem.GetIndex()).SurfNr());
+ ref->ProjectToSurface (xexact, mesh.GetFaceDescriptor(elem.GetIndex()).SurfNr(), gi);
Vec<3> v2 = w*(Vec<3>(xexact)-Vec<3>(xve));
@@ -704,7 +737,7 @@ namespace netgen
double maxcoeff = 0.;
for (i = facecoeffsindex[f]; i < facecoeffsindex[f+1]; i++)
- maxcoeff = max2 (maxcoeff, facecoeffs[i].Length());
+ maxcoeff = max (maxcoeff, facecoeffs[i].Length());
if (maxcoeff < 1e-12) faceorder[f] = 1;
}
diff --git a/Netgen/libsrc/meshing/delaunay.cpp b/Netgen/libsrc/meshing/delaunay.cpp
index 8e44c5f739..505a8c193f 100644
--- a/Netgen/libsrc/meshing/delaunay.cpp
+++ b/Netgen/libsrc/meshing/delaunay.cpp
@@ -2,11 +2,18 @@
#include "meshing.hpp"
-// #define TEST
-// #define TEST2
namespace netgen
{
+
+
+ static const int deltetfaces[][3] =
+ { { 1, 2, 3 },
+ { 2, 0, 3 },
+ { 0, 1, 3 },
+ { 1, 0, 2 } };
+
+
class DelaunayTet
{
PointIndex pnums[4];
@@ -27,53 +34,62 @@ namespace netgen
pnums[i] = el[i];
}
- PointIndex & PNum(int i) { return pnums[i-1]; }
- PointIndex PNum(int i) const { return pnums[i-1]; }
-
PointIndex & operator[] (int i) { return pnums[i]; }
PointIndex operator[] (int i) const { return pnums[i]; }
- int & NB(int i) { return nb[i-1]; }
- int NB(int i) const { return nb[i-1]; }
-
- inline void GetFace (int i, INDEX_3 & face) const;
- inline int FaceNr (INDEX_3 & face) const; // which face nr is it ?
- inline void GetFace (int i, Element2d & face) const;
- };
+ int & NB1(int i) { return nb[i-1]; }
+ int NB1(int i) const { return nb[i-1]; }
+ int & NB(int i) { return nb[i]; }
+ int NB(int i) const { return nb[i]; }
- inline int DelaunayTet :: FaceNr (INDEX_3 & face) const
- {
- for (int i = 0; i < 3; i++)
- if (pnums[i] != face.I1() &&
- pnums[i] != face.I2() &&
- pnums[i] != face.I3())
- return i+1;
- return 4;
- }
-
- static const int deltetfaces[][3] =
- { { 2, 3, 4 },
- { 3, 1, 4 },
- { 1, 2, 4 },
- { 2, 1, 3 } };
-
+ int FaceNr (INDEX_3 & face) const // which face nr is it ?
+ {
+ for (int i = 0; i < 3; i++)
+ if (pnums[i] != face.I1() &&
+ pnums[i] != face.I2() &&
+ pnums[i] != face.I3())
+ return i;
+ return 3;
+ }
+
+ void GetFace1 (int i, INDEX_3 & face) const
+ {
+ face.I(1) = pnums[deltetfaces[i-1][0]];
+ face.I(2) = pnums[deltetfaces[i-1][1]];
+ face.I(3) = pnums[deltetfaces[i-1][2]];
+ }
- inline void DelaunayTet :: GetFace (int i, INDEX_3 & face) const
- {
- face.I(1) = PNum(deltetfaces[i-1][0]);
- face.I(2) = PNum(deltetfaces[i-1][1]);
- face.I(3) = PNum(deltetfaces[i-1][2]);
- }
+ void GetFace (int i, INDEX_3 & face) const
+ {
+ face.I(1) = pnums[deltetfaces[i][0]];
+ face.I(2) = pnums[deltetfaces[i][1]];
+ face.I(3) = pnums[deltetfaces[i][2]];
+ }
+
+ INDEX_3 GetFace1 (int i) const
+ {
+ return INDEX_3 (pnums[deltetfaces[i-1][0]],
+ pnums[deltetfaces[i-1][1]],
+ pnums[deltetfaces[i-1][2]]);
+ }
- inline void DelaunayTet :: GetFace (int i, Element2d & face) const
- {
- face.SetType(TRIG);
- face[0] = PNum(deltetfaces[i-1][0]);
- face[1] = PNum(deltetfaces[i-1][1]);
- face[2] = PNum(deltetfaces[i-1][2]);
- }
+ INDEX_3 GetFace (int i) const
+ {
+ return INDEX_3 (pnums[deltetfaces[i][0]],
+ pnums[deltetfaces[i][1]],
+ pnums[deltetfaces[i][2]]);
+ }
+
+ void GetFace1 (int i, Element2d & face) const
+ {
+ // face.SetType(TRIG);
+ face[0] = pnums[deltetfaces[i-1][0]];
+ face[1] = pnums[deltetfaces[i-1][1]];
+ face[2] = pnums[deltetfaces[i-1][2]];
+ }
+ };
@@ -90,8 +106,10 @@ namespace netgen
{
// face nodes -> one element
INDEX_3_CLOSED_HASHTABLE<int> faces;
- //
+
+ //
ARRAY<DelaunayTet> & tets;
+
public:
// estimated number of points
@@ -99,48 +117,48 @@ namespace netgen
: faces(200), tets(atets)
{ ; }
-
// add element with 4 nodes
void Add (int elnr);
// delete element with 4 nodes
- void Delete (int elnr);
+ void Delete (int elnr)
+ {
+ DelaunayTet & el = tets.Elem(elnr);
+ for (int i = 0; i < 4; i++)
+ faces.Set (el.GetFace(i).Sort(), el.NB(i));
+ }
// get neighbour of element elnr in direction fnr
int GetNB (int elnr, int fnr)
- { return tets.Get(elnr).NB(fnr); }
+ {
+ return tets.Get(elnr).NB1(fnr);
+ }
//
void ResetFaceHT (int size)
{
faces.SetSize (size);
}
-
- void PrintMemInfo (ostream & ost) const;
};
void MeshNB :: Add (int elnr)
{
- INDEX_3 i3, i32;
-
DelaunayTet & el = tets.Elem(elnr);
- for (int i = 1; i <= 4; i++)
+ for (int i = 0; i < 4; i++)
{
- el.GetFace (i, i3);
- i3.Sort();
-
- int bnr, posnr, othertet;
+ INDEX_3 i3 = INDEX_3::Sort (el.GetFace(i));
+ int posnr;
+
if (!faces.PositionCreate (i3, posnr))
{
// face already in use
- faces.GetData (posnr, othertet);
+ int othertet = faces.GetData (posnr);
el.NB(i) = othertet;
-
if (othertet)
{
int fnr = tets.Get(othertet).FaceNr (i3);
@@ -156,36 +174,6 @@ namespace netgen
}
- void MeshNB :: Delete (int elnr)
- {
- INDEX_3 i3;
- DelaunayTet & el = tets.Elem(elnr);
-
- for (int i = 1; i <= 4; i++)
- {
- el.GetFace (i, i3);
- i3.Sort();
- faces.Set (i3, el.NB(i));
- }
- }
-
-
- void MeshNB :: PrintMemInfo (ostream & ost) const
- {
- /*
- int uf = 0;
- for (int i = 1; i <= face2el.Size(); i++)
- if (face2el.Get(i).I1())
- uf++;
-
- ost << "MeshNB: "
- << "validels = " << validels << " totels = " << el2face.Size() << endl
- << "validfaces = " << uf << " totfaces = " << face2el.Size() << endl
- << "face2el: " << face2el.Size() * sizeof(INDEX_2) << endl
- << "el2face: " << el2face.Size() * sizeof(INDEX_4) << endl;
- */
- }
-
@@ -197,30 +185,30 @@ namespace netgen
{
ARRAY<int> links;
public:
- SphereList () { ; }
- inline void AddElement (int elnr);
- inline void DeleteElement (int elnr);
- inline void ConnectElement (int eli, int toi);
- void GetList (int eli, ARRAY<int> & linked) const;
- };
+ SphereList ()
+ { ; }
- inline void SphereList :: AddElement (int elnr)
- {
- if (elnr > links.Size())
- links.Append (1);
- links.Elem(elnr) = elnr;
- }
+ void AddElement (int elnr)
+ {
+ if (elnr > links.Size())
+ links.Append (1);
+ links.Elem(elnr) = elnr;
+ }
- inline void SphereList :: DeleteElement (int elnr)
- {
- links.Elem(elnr) = 0;
- }
+ void DeleteElement (int elnr)
+ {
+ links.Elem(elnr) = 0;
+ }
+
+ void ConnectElement (int eli, int toi)
+ {
+ links.Elem (eli) = links.Get (toi);
+ links.Elem (toi) = eli;
+ }
+
+ void GetList (int eli, ARRAY<int> & linked) const;
+ };
- inline void SphereList :: ConnectElement (int eli, int toi)
- {
- links.Elem (eli) = links.Get (toi);
- links.Elem (toi) = eli;
- }
void SphereList :: GetList (int eli, ARRAY<int> & linked) const
{
@@ -262,10 +250,6 @@ namespace netgen
IndexSet & insphere, IndexSet & closesphere)
{
int i, j, k, l;
-
-#ifdef TEST2
- (*testout) << endl << "add point " << newp << endl;
-#endif
/*
find any sphere, such that newp is contained in
@@ -369,7 +353,7 @@ namespace netgen
{
int celind = connected.Get(k);
- if (tempels.Get(celind).PNum(1) != -1 &&
+ if (tempels.Get(celind)[0] != -1 &&
!insphere.IsIn (celind))
{
changed = 1;
@@ -402,19 +386,28 @@ namespace netgen
}
else
{
+ /*
Element2d face;
tempels.Get(helind).GetFace (k, face);
const Point3d & p1 = mesh.Point (face.PNum(1));
- const Point3d & p2 = mesh.Point (face.PNum(2));
- const Point3d & p3 = mesh.Point (face.PNum(3));
+ const Point3d & p2 = mesh.Point (face[1]);
+ const Point3d & p3 = mesh.Point (face[2]);
+ */
+
+ INDEX_3 i3 = tempels.Get(helind).GetFace (k-1);
+
+ const Point3d & p1 = mesh.Point ( PointIndex (i3.I1()));
+ const Point3d & p2 = mesh.Point ( PointIndex (i3.I2()));
+ const Point3d & p3 = mesh.Point ( PointIndex (i3.I3()));
+
Vec3d v1(p1, p2);
Vec3d v2(p1, p3);
Vec3d n = Cross (v1, v2);
n /= n.Length();
- if (n * Vec3d (p1, mesh.Point (tempels.Get(helind).PNum(k))) > 0)
+ if (n * Vec3d (p1, mesh.Point (tempels.Get(helind)[k-1])) > 0)
n *= -1;
double dist = n * Vec3d (p1, newp);
@@ -435,6 +428,7 @@ namespace netgen
// (*testout) << "newels: " << endl;
ARRAY<Element> newels;
+ Element2d face(TRIG);
for (j = 1; j <= insphere.Array().Size(); j++)
for (k = 1; k <= 4; k++)
{
@@ -444,26 +438,25 @@ namespace netgen
if (!nbind || !insphere.IsIn (nbind))
{
- Element2d face;
- tempels.Get (celind).GetFace (k, face);
+ tempels.Get (celind).GetFace1 (k, face);
- Element newel(4);
+ Element newel(TET);
for (l = 1; l <= 3; l++)
newel.PNum(l) = face.PNum(l);
- newel.PNum(4) = newpi;
+ newel[3] = newpi;
newels.Append (newel);
- Vec3d v1(mesh.Point (face.PNum(1)), mesh.Point (face.PNum(2)));
- Vec3d v2(mesh.Point (face.PNum(1)), mesh.Point (face.PNum(3)));
+ Vec3d v1(mesh.Point (face[0]), mesh.Point (face[1]));
+ Vec3d v2(mesh.Point (face[0]), mesh.Point (face[2]));
Vec3d n = Cross (v1, v2);
n /= n.Length();
- if (n * Vec3d(mesh.Point (face.PNum(1)),
- mesh.Point (tempels.Get(insphere.Array().Get(j)).PNum(k)))
+ if (n * Vec3d(mesh.Point (face[0]),
+ mesh.Point (tempels.Get(insphere.Array().Get(j))[k-1]))
> 0)
n *= -1;
- double hval = n * Vec3d (mesh.Point (face.PNum(1)), newp);
+ double hval = n * Vec3d (mesh.Point (face[0]), newp);
if (hval > -1e-12)
{
@@ -471,9 +464,9 @@ namespace netgen
(*testout) << "vec to outer, hval = " << hval << endl;
(*testout) << "v1 x v2 = " << Cross (v1, v2) << endl;
(*testout) << "facep: "
- << mesh.Point (face.PNum(1)) << " "
- << mesh.Point (face.PNum(2)) << " "
- << mesh.Point (face.PNum(3)) << endl;
+ << mesh.Point (face[0]) << " "
+ << mesh.Point (face[1]) << " "
+ << mesh.Point (face[2]) << endl;
}
}
}
@@ -488,8 +481,8 @@ namespace netgen
meshnb.Delete (celind);
list.DeleteElement (celind);
- for (k = 1; k <= 4; k++)
- tempels.Elem(celind).PNum(k) = -1;
+ for (k = 0; k < 4; k++)
+ tempels.Elem(celind)[k] = -1;
((ADTree6&)tettree.Tree()).DeleteElement (celind);
freelist.Append (celind);
@@ -600,7 +593,7 @@ namespace netgen
// new: local box
- mesh.GetBox (pmax, pmin);
+ mesh.GetBox (pmax, pmin); // lower bound for pmax, upper for pmin
for (i = 1; i <= adfront->GetNF(); i++)
{
const Element2d & face = adfront->GetFace(i);
@@ -611,6 +604,13 @@ namespace netgen
}
}
+ for (i = 0; i < mesh.LockedPoints().Size(); i++)
+ {
+ pmin.SetToMin (mesh.Point (mesh.LockedPoints()[i]));
+ pmax.SetToMax (mesh.Point (mesh.LockedPoints()[i]));
+ }
+
+
Vec3d vdiag(pmin, pmax);
// double r1 = vdiag.Length();
@@ -631,10 +631,10 @@ namespace netgen
int np = mesh.GetNP();
- startel.PNum(1) = mesh.AddPoint (cp1);
- startel.PNum(2) = mesh.AddPoint (cp2);
- startel.PNum(3) = mesh.AddPoint (cp3);
- startel.PNum(4) = mesh.AddPoint (cp4);
+ startel[0] = mesh.AddPoint (cp1);
+ startel[1] = mesh.AddPoint (cp2);
+ startel[2] = mesh.AddPoint (cp3);
+ startel[3] = mesh.AddPoint (cp4);
// flag points to use for Delaunay:
BitArrayChar<PointIndex::BASE> usep(np);
@@ -674,11 +674,11 @@ namespace netgen
ARRAY<int> connected, treesearch;
- tpmin = tpmax = mesh.Point(startel.PNum(1));
- for (k = 2; k <= 4; k++)
+ tpmin = tpmax = mesh.Point(startel[0]);
+ for (k = 1; k < 4; k++)
{
- tpmin.SetToMin (mesh.Point (startel.PNum(k)));
- tpmax.SetToMax (mesh.Point (startel.PNum(k)));
+ tpmin.SetToMin (mesh.Point (startel[k]));
+ tpmax.SetToMax (mesh.Point (startel[k]));
}
tpmax = tpmax + 0.01 * (tpmax - tpmin);
tettree.Insert (tpmin, tpmax, 1);
@@ -686,8 +686,8 @@ namespace netgen
Point3d pc;
- for (k = 1; k <= 4; k++)
- pp[k-1] = &mesh.Point (startel.PNum(k));
+ for (k = 0; k < 4; k++)
+ pp[k] = &mesh.Point (startel[k]);
CalcSphereCenter (&pp[0], pc);
@@ -748,7 +748,7 @@ namespace netgen
for (i = tempels.Size(); i >= 1; i--)
- if (tempels.Get(i).PNum(1) <= 0)
+ if (tempels.Get(i)[0] <= 0)
tempels.DeleteElement (i);
PrintDot ('\n');
@@ -816,14 +816,15 @@ namespace netgen
for (i = 1; i <= tempels.Size(); i++)
{
Element el(4);
- for (j = 1; j <= 4; j++)
- el.PNum(j) = tempels.Elem(i).PNum(j);
+ for (j = 0; j < 4; j++)
+ el[j] = tempels.Elem(i)[j];
el.SetIndex (1);
- const Point3d & lp1 = mesh.Point (el.PNum(1));
- const Point3d & lp2 = mesh.Point (el.PNum(2));
- const Point3d & lp3 = mesh.Point (el.PNum(3));
- const Point3d & lp4 = mesh.Point (el.PNum(4));
+
+ const Point3d & lp1 = mesh.Point (el[0]);
+ const Point3d & lp2 = mesh.Point (el[1]);
+ const Point3d & lp3 = mesh.Point (el[2]);
+ const Point3d & lp4 = mesh.Point (el[3]);
Vec3d v1(lp1, lp2);
Vec3d v2(lp1, lp3);
Vec3d v3(lp1, lp4);
@@ -831,11 +832,12 @@ namespace netgen
double vol = n * v3;
if (vol > 0)
- Swap (el.PNum(3), el.PNum(4));
+ swap (el[2], el[3]);
tempmesh.AddVolumeElement (el);
}
+
MeshQuality3d (tempmesh);
for (i = 1; i <= mesh.GetNOpenElements(); i++)
@@ -843,23 +845,23 @@ namespace netgen
Element2d sel = mesh.OpenElement(i);
sel.SetIndex(1);
tempmesh.AddSurfaceElement (sel);
- Swap (sel.PNum(2), sel.PNum(3));
+ swap (sel[1], sel[2]);
tempmesh.AddSurfaceElement (sel);
}
for (i = 1; i <= 4; i++)
{
- Element2d self(3);
+ Element2d self(TRIG);
self.SetIndex (1);
- startel.GetFace (i, self);
+ startel.GetFace1 (i, self);
tempmesh.AddSurfaceElement (self);
}
tempmesh.AddFaceDescriptor (FaceDescriptor (1, 1, 0, 0));
tempmesh.AddFaceDescriptor (FaceDescriptor (2, 1, 0, 0));
-
+
// for (i = mesh.GetNP() - 3; i <= mesh.GetNP(); i++)
// tempmesh.AddLockedPoint (i);
@@ -899,7 +901,6 @@ namespace netgen
-
// remove degenerated
BitArray badnode(mesh.GetNP());
@@ -908,13 +909,13 @@ namespace netgen
for (i = 1; i <= tempels.Size(); i++)
{
Element el(4);
- for (j = 1; j <= 4; j++)
- el.PNum(j) = tempels.Elem(i).PNum(j);
+ for (j = 0; j < 4; j++)
+ el[j] = tempels.Elem(i)[j];
// Element & el = tempels.Elem(i);
- const Point3d & lp1 = mesh.Point (el.PNum(1));
- const Point3d & lp2 = mesh.Point (el.PNum(2));
- const Point3d & lp3 = mesh.Point (el.PNum(3));
- const Point3d & lp4 = mesh.Point (el.PNum(4));
+ const Point3d & lp1 = mesh.Point (el[0]);
+ const Point3d & lp2 = mesh.Point (el[1]);
+ const Point3d & lp3 = mesh.Point (el[2]);
+ const Point3d & lp4 = mesh.Point (el[3]);
Vec3d v1(lp1, lp2);
Vec3d v2(lp1, lp3);
Vec3d v3(lp1, lp4);
@@ -923,29 +924,29 @@ namespace netgen
double h = v1.Length() + v2.Length() + v3.Length();
if (fabs (vol) < 1e-8 * (h * h * h) &&
- (el.PNum(1) <= np && el.PNum(2) <= np &&
- el.PNum(3) <= np && el.PNum(4) <= np) ) // old: 1e-12
+ (el[0] <= np && el[1] <= np &&
+ el[2] <= np && el[3] <= np) ) // old: 1e-12
{
- badnode.Set(el.PNum(1));
- badnode.Set(el.PNum(2));
- badnode.Set(el.PNum(3));
- badnode.Set(el.PNum(4));
+ badnode.Set(el[0]);
+ badnode.Set(el[1]);
+ badnode.Set(el[2]);
+ badnode.Set(el[3]);
ndeg++;
(*testout) << "vol = " << vol << " h = " << h << endl;
}
if (vol > 0)
- Swap (el.PNum(3), el.PNum(4));
+ Swap (el[2], el[3]);
}
ne = tempels.Size();
for (i = ne; i >= 1; i--)
{
const DelaunayTet & el = tempels.Get(i);
- if (badnode.Test(el.PNum(1)) ||
- badnode.Test(el.PNum(2)) ||
- badnode.Test(el.PNum(3)) ||
- badnode.Test(el.PNum(4)) )
+ if (badnode.Test(el[0]) ||
+ badnode.Test(el[1]) ||
+ badnode.Test(el[2]) ||
+ badnode.Test(el[3]) )
tempels.DeleteElement(i);
}
@@ -959,18 +960,16 @@ namespace netgen
for (i = 1; i <= mesh.GetNOpenElements(); i++)
{
const Element2d & tri = mesh.OpenElement(i);
- INDEX_3 i3(tri.PNum(1), tri.PNum(2), tri.PNum(3));
+ INDEX_3 i3(tri[0], tri[1], tri[2]);
i3.Sort();
openeltab.Set (i3, i);
}
for (i = 1; i <= tempels.Size(); i++)
{
- for (j = 1; j <= 4; j++)
+ for (j = 0; j < 4; j++)
{
- Element2d face;
- tempels.Get(i).GetFace (j, face);
- INDEX_3 i3(face.PNum(1), face.PNum(2), face.PNum(3));
+ INDEX_3 i3 = tempels.Get(i).GetFace (j);
i3.Sort();
if (openeltab.Used(i3))
openeltab.Set (i3, 0);
@@ -1028,12 +1027,12 @@ namespace netgen
{
switch (j)
{
- case 1: i2 = INDEX_2(el.PNum(1), el.PNum(2)); break;
- case 2: i2 = INDEX_2(el.PNum(1), el.PNum(3)); break;
- case 3: i2 = INDEX_2(el.PNum(1), el.PNum(4)); break;
- case 4: i2 = INDEX_2(el.PNum(2), el.PNum(3)); break;
- case 5: i2 = INDEX_2(el.PNum(2), el.PNum(4)); break;
- case 6: i2 = INDEX_2(el.PNum(3), el.PNum(4)); break;
+ case 1: i2 = INDEX_2(el[0], el[1]); break;
+ case 2: i2 = INDEX_2(el[0], el[2]); break;
+ case 3: i2 = INDEX_2(el[0], el[3]); break;
+ case 4: i2 = INDEX_2(el[1], el[2]); break;
+ case 5: i2 = INDEX_2(el[1], el[3]); break;
+ case 6: i2 = INDEX_2(el[2], el[3]); break;
}
i2.Sort();
tetedges.Set (i2, 1);
@@ -1042,6 +1041,35 @@ namespace netgen
// cout << "tetedges:";
// tetedges.PrintMemInfo (cout);
+
+ for (INDEX_2_HASHTABLE<INDEX_2>::Iterator it = twotrias.Begin();
+ it != twotrias.End(); it++)
+ {
+ INDEX_2 hi2, hi3;
+ twotrias.GetData (it, hi2, hi3);
+ hi3.Sort();
+ if (tetedges.Used (hi3))
+ {
+ const Point3d & p1 = mesh.Point ( PointIndex (hi2.I1()));
+ const Point3d & p2 = mesh.Point ( PointIndex (hi2.I2()));
+ const Point3d & p3 = mesh.Point ( PointIndex (hi3.I1()));
+ const Point3d & p4 = mesh.Point ( PointIndex (hi3.I2()));
+ Vec3d v1(p1, p2);
+ Vec3d v2(p1, p3);
+ Vec3d v3(p1, p4);
+ Vec3d n = Cross (v1, v2);
+ double vol = n * v3;
+
+ double h = v1.Length() + v2.Length() + v3.Length();
+ if (fabs (vol) < 1e-4 * (h * h * h)) // old: 1e-12
+ {
+ badnode.Set(hi3.I1());
+ badnode.Set(hi3.I2());
+ }
+ }
+ }
+
+ /*
for (i = 1; i <= twotrias.GetNBags(); i++)
for (j = 1; j <= twotrias.GetBagSize (i); j++)
{
@@ -1068,16 +1096,16 @@ namespace netgen
}
}
}
-
+ */
ne = tempels.Size();
for (i = ne; i >= 1; i--)
{
const DelaunayTet & el = tempels.Get(i);
- if (badnode.Test(el.PNum(1)) ||
- badnode.Test(el.PNum(2)) ||
- badnode.Test(el.PNum(3)) ||
- badnode.Test(el.PNum(4)) )
+ if (badnode.Test(el[0]) ||
+ badnode.Test(el[1]) ||
+ badnode.Test(el[2]) ||
+ badnode.Test(el[3]) )
tempels.DeleteElement(i);
}
@@ -1103,7 +1131,7 @@ namespace netgen
{
const Element2d & tri = mesh.OpenElement(fnr);
- Point3d ltpmin (mesh.Point(tri.PNum(1)));
+ Point3d ltpmin (mesh.Point(tri[0]));
Point3d ltpmax (tpmin);
for (k = 2; k <= 3; k++)
@@ -1124,10 +1152,10 @@ namespace netgen
int intersect = 0;
- for (j = 1; j <= 4; j++)
+ for (j = 0; j < 4; j++)
{
- pp[j-1] = &mesh.Point(el.PNum(j));
- tetpi[j-1] = el.PNum(j);
+ pp[j] = &mesh.Point(el[j]);
+ tetpi[j] = el[j];
}
Point3d tetpmin(*pp[0]);
@@ -1161,6 +1189,7 @@ namespace netgen
if (IntersectTetTriangle (&pp[0], &tripp[0], tetpi, tripi))
{
+ /*
int il1, il2;
(*testout) << "intersect !" << endl;
(*testout) << "triind: ";
@@ -1180,7 +1209,7 @@ namespace netgen
for (il2 = 0; il2 < 4; il2++)
(*testout) << " " << *pp[il2];
(*testout) << endl;
-
+ */
intersect = 1;
@@ -1220,7 +1249,7 @@ namespace netgen
for (i = 1; i <= mesh.GetNOpenElements(); i++)
{
const Element2d & tri = mesh.OpenElement(i);
- INDEX_3 i3 (tri.PNum(1), tri.PNum(2), tri.PNum(3));
+ INDEX_3 i3 (tri[0], tri[1], tri[2]);
i3.Sort();
boundaryfaces.PrepareSet (i3);
}
@@ -1228,14 +1257,14 @@ namespace netgen
for (i = 1; i <= mesh.GetNOpenElements(); i++)
{
const Element2d & tri = mesh.OpenElement(i);
- INDEX_3 i3 (tri.PNum(1), tri.PNum(2), tri.PNum(3));
+ INDEX_3 i3 (tri[0], tri[1], tri[2]);
i3.Sort();
boundaryfaces.Set (i3, 1);
}
- for (i = 1; i <= tempels.Size(); i++)
- for (j = 1; j <= 4; j++)
- tempels.Elem(i).NB(j) = 0;
+ for (i = 0; i < tempels.Size(); i++)
+ for (j = 0; j < 4; j++)
+ tempels[i].NB(j) = 0;
TABLE<int,PointIndex::BASE> elsonpoint(mesh.GetNP());
for (i = 0; i < tempels.Size(); i++)
@@ -1263,7 +1292,7 @@ namespace netgen
INDEX_3_CLOSED_HASHTABLE<INDEX_2> faceht(100);
- Element2d hel(3);
+ Element2d hel(TRIG);
for (pi = PointIndex::BASE;
pi < mesh.GetNP()+PointIndex::BASE; pi++)
{
@@ -1275,13 +1304,13 @@ namespace netgen
for (j = 1; j <= 4; j++)
{
- el.GetFace (j, hel);
+ el.GetFace1 (j, hel);
hel.Invert();
hel.NormalizeNumbering();
- if (hel.PNum(1) == pi)
+ if (hel[0] == pi)
{
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
if (!boundaryfaces.Used (i3))
{
@@ -1289,14 +1318,14 @@ namespace netgen
{
INDEX_2 i2 = faceht.Get(i3);
- tempels.Elem(i).NB(j) = i2.I1();
- tempels.Elem(i2.I1()).NB(i2.I2()) = i;
+ tempels.Elem(i).NB1(j) = i2.I1();
+ tempels.Elem(i2.I1()).NB1(i2.I2()) = i;
}
else
{
hel.Invert();
hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
INDEX_2 i2(i, j);
faceht.Set (i3, i2);
}
@@ -1314,7 +1343,7 @@ namespace netgen
{
INDEX_3 i3;
Element2d face;
- el.GetFace (j, face);
+ el.GetFace1 (j, face);
for (int kk = 1; kk <= 3; kk++)
i3.I(kk) = face.PNum(kk);
@@ -1346,7 +1375,7 @@ namespace netgen
{
(*testout) << i << " ";
for (j = 1; j <= 4; j++)
- (*testout) << tempels.Get(i).NB(j) << " ";
+ (*testout) << tempels.Get(i).NB1(j) << " ";
(*testout) << endl;
}
@@ -1415,10 +1444,10 @@ namespace netgen
if (done) break;
const DelaunayTet & el = tempels.Get(i);
- const Point3d & p1 = mesh.Point (el.PNum(1));
- const Point3d & p2 = mesh.Point (el.PNum(2));
- const Point3d & p3 = mesh.Point (el.PNum(3));
- const Point3d & p4 = mesh.Point (el.PNum(4));
+ const Point3d & p1 = mesh.Point (el[0]);
+ const Point3d & p2 = mesh.Point (el[1]);
+ const Point3d & p3 = mesh.Point (el[2]);
+ const Point3d & p4 = mesh.Point (el[3]);
Point3d ci = Center (p1, p2, p3, p4);
@@ -1449,16 +1478,18 @@ namespace netgen
for (j = 1; j <= 4; j++)
{
- INDEX_3 i3;
+ INDEX_3 i3 = tempels.Get(ei).GetFace1(j);
+ /*
Element2d face;
tempels.Get(ei).GetFace(j, face);
for (int kk = 1; kk <= 3; kk++)
i3.I(kk) = face.PNum(kk);
+ */
i3.Sort();
- if (tempels.Get(ei).NB(j))
- elstack.Append (tempels.Get(ei).NB(j));
+ if (tempels.Get(ei).NB1(j))
+ elstack.Append (tempels.Get(ei).NB1(j));
/*
if (innerfaces.Used(i3))
@@ -1466,7 +1497,7 @@ namespace netgen
INDEX_2 i2 = innerfaces.Get(i3);
int other = i2.I1() + i2.I2() - ei;
- if (other != tempels.Get(ei).NB(j))
+ if (other != tempels.Get(ei).NB1(j))
cerr << "different1 !!" << endl;
if (other)
@@ -1475,7 +1506,7 @@ namespace netgen
}
}
else
- if (tempels.Get(ei).NB(j))
+ if (tempels.Get(ei).NB1(j))
cerr << "different2 !!" << endl;
*/
@@ -1492,10 +1523,10 @@ namespace netgen
for (i = 1; i <= ne; i++)
{
const DelaunayTet & el = tempels.Get(i);
- const Point3d & p1 = mesh.Point (el.PNum(1));
- const Point3d & p2 = mesh.Point (el.PNum(2));
- const Point3d & p3 = mesh.Point (el.PNum(3));
- const Point3d & p4 = mesh.Point (el.PNum(4));
+ const Point3d & p1 = mesh.Point (el[0]);
+ const Point3d & p2 = mesh.Point (el[1]);
+ const Point3d & p3 = mesh.Point (el[2]);
+ const Point3d & p4 = mesh.Point (el[3]);
Point3d ci = Center (p1, p2, p3, p4);
@@ -1636,8 +1667,8 @@ namespace netgen
for (i = 1; i <= tempels.Size(); i++)
{
Element el(4);
- for (j = 1; j <= 4; j++)
- el.PNum(j) = tempels.Elem(i).PNum(j);
+ for (j = 0; j < 4; j++)
+ el[j] = tempels.Elem(i)[j];
mesh.AddVolumeElement (el);
}
diff --git a/Netgen/libsrc/meshing/findip.hpp b/Netgen/libsrc/meshing/findip.hpp
index b47c3ac6dc..a0aed91b6c 100644
--- a/Netgen/libsrc/meshing/findip.hpp
+++ b/Netgen/libsrc/meshing/findip.hpp
@@ -1,13 +1,5 @@
-/*
// find inner point
-#include <mystdlib.h>
-#include "meshing.hpp"
-
-namespace netgen
-{
-*/
-
template <typename POINTARRAY, typename FACEARRAY>
inline int FindInnerPoint (POINTARRAY & points,
FACEARRAY & faces,
diff --git a/Netgen/libsrc/meshing/geomsearch.cpp b/Netgen/libsrc/meshing/geomsearch.cpp
index 53c04e12ac..1b4641308a 100644
--- a/Netgen/libsrc/meshing/geomsearch.cpp
+++ b/Netgen/libsrc/meshing/geomsearch.cpp
@@ -4,262 +4,260 @@
namespace netgen
{
-GeomSearch3d :: GeomSearch3d()
-{
- size.i1 = 0; size.i2 = 0; size.i3 = 0;
-};
+ GeomSearch3d :: GeomSearch3d()
+ {
+ size.i1 = 0; size.i2 = 0; size.i3 = 0;
+ };
-GeomSearch3d :: ~GeomSearch3d()
-{
- //delete old Hashtable:
- if (size.i1 != 0)
- {
- for (int i = 1; i <= size.i1*size.i2*size.i3; i++)
- {
- delete hashtable.Get(i);
- }
- }
-}
+ GeomSearch3d :: ~GeomSearch3d()
+ {
+ //delete old Hashtable:
+ if (size.i1 != 0)
+ {
+ for (int i = 0; i < size.i1*size.i2*size.i3; i++)
+ delete hashtable[i];
+ }
+ }
-void GeomSearch3d :: Init (ARRAY <FrontPoint3,PointIndex::BASE> *pointsi, ARRAY <FrontFace> *facesi)
-{
- points = pointsi;
- faces = facesi;
- size.i1 = 0; size.i2 = 0; size.i3 = 0;
- reset = 1;
- hashcount = 1;
-}
+ void GeomSearch3d :: Init (ARRAY <FrontPoint3,PointIndex::BASE> *pointsi, ARRAY <FrontFace> *facesi)
+ {
+ points = pointsi;
+ faces = facesi;
+ size.i1 = 0; size.i2 = 0; size.i3 = 0;
+ reset = 1;
+ hashcount = 1;
+ }
-void GeomSearch3d :: ElemMaxExt(Point3d& minp, Point3d& maxp, const Element2d& elem)
-{
- maxp.X()=points->Get(elem.PNum(1)).P().X();
- maxp.Y()=points->Get(elem.PNum(1)).P().Y();
- maxp.Z()=points->Get(elem.PNum(1)).P().Z();
- minp.X()=points->Get(elem.PNum(1)).P().X();
- minp.Y()=points->Get(elem.PNum(1)).P().Y();
- minp.Z()=points->Get(elem.PNum(1)).P().Z();
+ void GeomSearch3d :: ElemMaxExt(Point3d& minp, Point3d& maxp, const Element2d& elem)
+ {
+ maxp.X()=(*points)[elem.PNum(1)].P().X();
+ maxp.Y()=(*points)[elem.PNum(1)].P().Y();
+ maxp.Z()=(*points)[elem.PNum(1)].P().Z();
+ minp.X()=(*points)[elem.PNum(1)].P().X();
+ minp.Y()=(*points)[elem.PNum(1)].P().Y();
+ minp.Z()=(*points)[elem.PNum(1)].P().Z();
- for (int i=2; i <= 3; i++)
- {
- maxp.X()=max2(points->Get(elem.PNum(i)).P().X(),maxp.X());
- maxp.Y()=max2(points->Get(elem.PNum(i)).P().Y(),maxp.Y());
- maxp.Z()=max2(points->Get(elem.PNum(i)).P().Z(),maxp.Z());
- minp.X()=min2(points->Get(elem.PNum(i)).P().X(),minp.X());
- minp.Y()=min2(points->Get(elem.PNum(i)).P().Y(),minp.Y());
- minp.Z()=min2(points->Get(elem.PNum(i)).P().Z(),minp.Z());
- }
-}
+ for (int i=2; i <= 3; i++)
+ {
+ maxp.X()=max2((*points)[elem.PNum(i)].P().X(),maxp.X());
+ maxp.Y()=max2((*points)[elem.PNum(i)].P().Y(),maxp.Y());
+ maxp.Z()=max2((*points)[elem.PNum(i)].P().Z(),maxp.Z());
+ minp.X()=min2((*points)[elem.PNum(i)].P().X(),minp.X());
+ minp.Y()=min2((*points)[elem.PNum(i)].P().Y(),minp.Y());
+ minp.Z()=min2((*points)[elem.PNum(i)].P().Z(),minp.Z());
+ }
+ }
-void GeomSearch3d :: MinCoords(const Point3d& p1, Point3d& p2)
-{
- p2.X()=min2(p1.X(),p2.X());
- p2.Y()=min2(p1.Y(),p2.Y());
- p2.Z()=min2(p1.Z(),p2.Z());
-}
+ void GeomSearch3d :: MinCoords(const Point3d& p1, Point3d& p2)
+ {
+ p2.X()=min2(p1.X(),p2.X());
+ p2.Y()=min2(p1.Y(),p2.Y());
+ p2.Z()=min2(p1.Z(),p2.Z());
+ }
-void GeomSearch3d :: MaxCoords(const Point3d& p1, Point3d& p2)
-{
- p2.X()=max2(p1.X(),p2.X());
- p2.Y()=max2(p1.Y(),p2.Y());
- p2.Z()=max2(p1.Z(),p2.Z());
-}
+ void GeomSearch3d :: MaxCoords(const Point3d& p1, Point3d& p2)
+ {
+ p2.X()=max2(p1.X(),p2.X());
+ p2.Y()=max2(p1.Y(),p2.Y());
+ p2.Z()=max2(p1.Z(),p2.Z());
+ }
-void GeomSearch3d :: Create()
-{
- INDEX i,j,k;
- if (reset)
- {
- const double hashelemsizefactor = 4;
- reset = 0;
- /*
- minext=Point3d(MAXDOUBLE, MAXDOUBLE, MAXDOUBLE);
- maxext=Point3d(MINDOUBLE, MINDOUBLE, MINDOUBLE);
- */
- ElemMaxExt(minext, maxext, faces->Get(1).Face());
- Point3d maxp, minp;
- Vec3d midext(0,0,0);
+ void GeomSearch3d :: Create()
+ {
+ INDEX i,j,k;
+ if (reset)
+ {
+ const double hashelemsizefactor = 4;
+ reset = 0;
+ /*
+ minext=Point3d(MAXDOUBLE, MAXDOUBLE, MAXDOUBLE);
+ maxext=Point3d(MINDOUBLE, MINDOUBLE, MINDOUBLE);
+ */
+ ElemMaxExt(minext, maxext, faces->Get(1).Face());
+ Point3d maxp, minp;
+ Vec3d midext(0,0,0);
- //get max Extension of Frontfaces
- for (i = 1; i <= faces->Size(); i++)
- {
- ElemMaxExt(minp, maxp, faces->Get(i).Face());
- MinCoords(minp, minext);
- MaxCoords(maxp, maxext);
- midext+=maxp-minp;
- }
+ //get max Extension of Frontfaces
+ for (i = 1; i <= faces->Size(); i++)
+ {
+ ElemMaxExt(minp, maxp, faces->Get(i).Face());
+ MinCoords(minp, minext);
+ MaxCoords(maxp, maxext);
+ midext+=maxp-minp;
+ }
- maxextreal = maxext;
- maxext = maxext + 1e-4 * (maxext - minext);
+ maxextreal = maxext;
+ maxext = maxext + 1e-4 * (maxext - minext);
- midext*=1./faces->Size();
- Vec3d boxext = maxext - minext;
+ midext*=1./faces->Size();
+ Vec3d boxext = maxext - minext;
- //delete old Hashtable:
- if (size.i1 != 0)
- {
- for (i = 1; i <= size.i1*size.i2*size.i3; i++)
- {
- delete hashtable.Get(i);
- }
- }
+ //delete old Hashtable:
+ if (size.i1 != 0)
+ {
+ for (i = 1; i <= size.i1*size.i2*size.i3; i++)
+ {
+ delete hashtable.Get(i);
+ }
+ }
- size.i1 = int (boxext.X()/midext.X()/hashelemsizefactor+1);
- size.i2 = int (boxext.Y()/midext.Y()/hashelemsizefactor+1);
- size.i3 = int (boxext.Z()/midext.Z()/hashelemsizefactor+1);
- PrintMessage (5, "hashsizes = ", size.i1, ", ", size.i2, ", ", size.i3);
+ size.i1 = int (boxext.X()/midext.X()/hashelemsizefactor+1);
+ size.i2 = int (boxext.Y()/midext.Y()/hashelemsizefactor+1);
+ size.i3 = int (boxext.Z()/midext.Z()/hashelemsizefactor+1);
+ PrintMessage (5, "hashsizes = ", size.i1, ", ", size.i2, ", ", size.i3);
- elemsize.X()=boxext.X()/size.i1;
- elemsize.Y()=boxext.Y()/size.i2;
- elemsize.Z()=boxext.Z()/size.i3;
+ elemsize.X()=boxext.X()/size.i1;
+ elemsize.Y()=boxext.Y()/size.i2;
+ elemsize.Z()=boxext.Z()/size.i3;
- //create Hasharrays:
- hashtable.SetSize(size.i1*size.i2*size.i3);
- for (i = 1; i <= size.i1; i++)
- {
- for (j = 1; j <= size.i2; j++)
- {
- for (k = 1; k <= size.i3; k++)
- {
- INDEX ind=i+(j-1)*size.i1+(k-1)*size.i2*size.i1;
- hashtable.Elem(ind) = new ARRAY <int> ();
- }
- }
- }
- }
- else
- {
- //Clear all Hash-Arrays
- for (i = 1; i <= size.i1; i++)
- {
- for (j = 1; j <= size.i2; j++)
- {
- for (k = 1; k <= size.i3; k++)
- {
- INDEX ind=i+(j-1)*size.i1+(k-1)*size.i2*size.i1;
- hashtable.Elem(ind)->SetSize(0);
- }
- }
- }
- }
+ //create Hasharrays:
+ hashtable.SetSize(size.i1*size.i2*size.i3);
+ for (i = 1; i <= size.i1; i++)
+ {
+ for (j = 1; j <= size.i2; j++)
+ {
+ for (k = 1; k <= size.i3; k++)
+ {
+ INDEX ind=i+(j-1)*size.i1+(k-1)*size.i2*size.i1;
+ hashtable.Elem(ind) = new ARRAY <int> ();
+ }
+ }
+ }
+ }
+ else
+ {
+ //Clear all Hash-Arrays
+ for (i = 1; i <= size.i1; i++)
+ {
+ for (j = 1; j <= size.i2; j++)
+ {
+ for (k = 1; k <= size.i3; k++)
+ {
+ INDEX ind=i+(j-1)*size.i1+(k-1)*size.i2*size.i1;
+ hashtable.Elem(ind)->SetSize(0);
+ }
+ }
+ }
+ }
- //Faces in Hashtable einfuegen:
- for (i = 1; i <= faces->Size(); i++)
- {
- AddElem(faces->Get(i).Face(),i);
- }
+ //Faces in Hashtable einfuegen:
+ for (i = 1; i <= faces->Size(); i++)
+ {
+ AddElem(faces->Get(i).Face(),i);
+ }
-}
+ }
-void GeomSearch3d :: AddElem(const Element2d& elem, INDEX elemnum)
-{
- Point3d minp, maxp;
- ElemMaxExt(minp, maxp, elem);
- int sx = int ((minp.X()-minext.X())/elemsize.X()+1.);
- int ex = int ((maxp.X()-minext.X())/elemsize.X()+1.);
- int sy = int ((minp.Y()-minext.Y())/elemsize.Y()+1.);
- int ey = int ((maxp.Y()-minext.Y())/elemsize.Y()+1.);
- int sz = int ((minp.Z()-minext.Z())/elemsize.Z()+1.);
- int ez = int ((maxp.Z()-minext.Z())/elemsize.Z()+1.);
- int ix,iy,iz;
+ void GeomSearch3d :: AddElem(const Element2d& elem, INDEX elemnum)
+ {
+ Point3d minp, maxp;
+ ElemMaxExt(minp, maxp, elem);
+ int sx = int ((minp.X()-minext.X())/elemsize.X()+1.);
+ int ex = int ((maxp.X()-minext.X())/elemsize.X()+1.);
+ int sy = int ((minp.Y()-minext.Y())/elemsize.Y()+1.);
+ int ey = int ((maxp.Y()-minext.Y())/elemsize.Y()+1.);
+ int sz = int ((minp.Z()-minext.Z())/elemsize.Z()+1.);
+ int ez = int ((maxp.Z()-minext.Z())/elemsize.Z()+1.);
+ int ix,iy,iz;
- for (ix = sx; ix <= ex; ix++)
- {
- for (iy = sy; iy <= ey; iy++)
- {
- for (iz = sz; iz <= ez; iz++)
- {
- INDEX ind=ix+(iy-1)*size.i1+(iz-1)*size.i2*size.i1;
- if (ind < 1 || ind > size.i1 * size.i2 * size.i3)
- {
- cerr << "Illegal hash-position";
- cerr << "Position: " << ix << "," << iy << "," << iz << endl;
- }
- hashtable.Elem(ind)->Append(elemnum);
- }
- }
- }
-}
+ for (ix = sx; ix <= ex; ix++)
+ {
+ for (iy = sy; iy <= ey; iy++)
+ {
+ for (iz = sz; iz <= ez; iz++)
+ {
+ INDEX ind=ix+(iy-1)*size.i1+(iz-1)*size.i2*size.i1;
+ if (ind < 1 || ind > size.i1 * size.i2 * size.i3)
+ {
+ cerr << "Illegal hash-position";
+ cerr << "Position: " << ix << "," << iy << "," << iz << endl;
+ }
+ hashtable.Elem(ind)->Append(elemnum);
+ }
+ }
+ }
+ }
-void GeomSearch3d :: GetLocals(ARRAY<Element2d> & locfaces, ARRAY<INDEX> & findex,
- INDEX fstind, const Point3d& p0, double xh)
-{
- hashcount++;
+ void GeomSearch3d :: GetLocals(ARRAY<Element2d> & locfaces, ARRAY<INDEX> & findex,
+ INDEX fstind, const Point3d& p0, double xh)
+ {
+ hashcount++;
- Point3d minp, maxp, midp;
+ Point3d minp, maxp, midp;
- minp=p0-Vec3d(xh,xh,xh); //lay cube over sphere
- maxp=p0+Vec3d(xh,xh,xh);
+ minp=p0-Vec3d(xh,xh,xh); //lay cube over sphere
+ maxp=p0+Vec3d(xh,xh,xh);
- MaxCoords(minext,minp); //cube may not be out of hash-region
- MinCoords(maxextreal,maxp);
+ MaxCoords(minext,minp); //cube may not be out of hash-region
+ MinCoords(maxextreal,maxp);
- int cluster = faces->Get(fstind).Cluster();
+ int cluster = faces->Get(fstind).Cluster();
- int sx = int((minp.X()-minext.X())/elemsize.X()+1.);
- int ex = int((maxp.X()-minext.X())/elemsize.X()+1.);
- int sy = int((minp.Y()-minext.Y())/elemsize.Y()+1.);
- int ey = int((maxp.Y()-minext.Y())/elemsize.Y()+1.);
- int sz = int((minp.Z()-minext.Z())/elemsize.Z()+1.);
- int ez = int((maxp.Z()-minext.Z())/elemsize.Z()+1.);
- int ix,iy,iz,i,k;
+ int sx = int((minp.X()-minext.X())/elemsize.X()+1.);
+ int ex = int((maxp.X()-minext.X())/elemsize.X()+1.);
+ int sy = int((minp.Y()-minext.Y())/elemsize.Y()+1.);
+ int ey = int((maxp.Y()-minext.Y())/elemsize.Y()+1.);
+ int sz = int((minp.Z()-minext.Z())/elemsize.Z()+1.);
+ int ez = int((maxp.Z()-minext.Z())/elemsize.Z()+1.);
+ int ix,iy,iz,i,k;
- int cnt1 = 0; // test, how efficient hashtable is
- int cnt2 = 0;
- int cnt3 = 0;
+ int cnt1 = 0; // test, how efficient hashtable is
+ int cnt2 = 0;
+ int cnt3 = 0;
- for (ix = sx; ix <= ex; ix++)
- {
- for (iy = sy; iy <= ey; iy++)
- {
- for (iz = sz; iz <= ez; iz++)
- {
- INDEX ind=ix+(iy-1)*size.i1+(iz-1)*size.i2*size.i1;
+ for (ix = sx; ix <= ex; ix++)
+ {
+ for (iy = sy; iy <= ey; iy++)
+ {
+ for (iz = sz; iz <= ez; iz++)
+ {
+ INDEX ind=ix+(iy-1)*size.i1+(iz-1)*size.i2*size.i1;
- //go through all elements in one hash area
- const ARRAY <int> & area = *hashtable.Elem(ind);
- for (k = 1; k <= area.Size(); k++)
- {
- cnt2++;
- i = area.Get(k);
- if (faces->Get(i).Cluster() == cluster &&
- faces->Get(i).Valid() &&
- faces->Get(i).HashValue() != hashcount &&
- i != fstind)
- {
- cnt1++;
- const Element2d & face = faces->Get(i).Face();
+ //go through all elements in one hash area
+ const ARRAY <int> & area = *hashtable.Elem(ind);
+ for (k = 1; k <= area.Size(); k++)
+ {
+ cnt2++;
+ i = area.Get(k);
+ if (faces->Get(i).Cluster() == cluster &&
+ faces->Get(i).Valid() &&
+ faces->Get(i).HashValue() != hashcount &&
+ i != fstind)
+ {
+ cnt1++;
+ const Element2d & face = faces->Get(i).Face();
- const Point3d & p1 = points->Get(face.PNum(1)).P();
- const Point3d & p2 = points->Get(face.PNum(2)).P();
- const Point3d & p3 = points->Get(face.PNum(3)).P();
+ const Point3d & p1 = (*points)[face.PNum(1)].P();
+ const Point3d & p2 = (*points)[face.PNum(2)].P();
+ const Point3d & p3 = (*points)[face.PNum(3)].P();
- midp = Center (p1, p2, p3);
+ midp = Center (p1, p2, p3);
- if (Dist2 (midp, p0) <= xh*xh)
- {
- cnt3++;
- locfaces.Append(faces->Get(i).Face());
- findex.Append(i);
- faces->Elem(i).SetHashValue(hashcount);
- }
- }
- }
- }
- }
- }
- /*
- if (faces->Size() != 0 && hashcount % 200 == 0)
- {
+ if (Dist2 (midp, p0) <= xh*xh)
+ {
+ cnt3++;
+ locfaces.Append(faces->Get(i).Face());
+ findex.Append(i);
+ faces->Elem(i).SetHashValue(hashcount);
+ }
+ }
+ }
+ }
+ }
+ }
+ /*
+ if (faces->Size() != 0 && hashcount % 200 == 0)
+ {
(*mycout) << "n.o.f= " << faces->Size();
(*mycout) << ", n.o.lf= " << locfaces.Size();
(*mycout) << ", hashf= " << (double)cnt2/(double)faces->Size();
(*mycout) << " (" << (double)cnt1/(double)faces->Size();
(*mycout) << ", " << (double)cnt3/(double)faces->Size() << ")" << endl;
- }
+ }
*/
-}
+ }
}
diff --git a/Netgen/libsrc/meshing/global.cpp b/Netgen/libsrc/meshing/global.cpp
index b13367b1dc..60a1fbe51d 100644
--- a/Netgen/libsrc/meshing/global.cpp
+++ b/Netgen/libsrc/meshing/global.cpp
@@ -3,10 +3,10 @@
namespace netgen
{
- ostream * testout;
+ ostream * testout = &cout;
- ostream * mycout;
- ostream * myerr;
+ ostream * mycout = &cout;
+ ostream * myerr = &cerr;
// Flags globflags; // not used anymoure
diff --git a/Netgen/libsrc/meshing/hpref_prism.hpp b/Netgen/libsrc/meshing/hpref_prism.hpp
new file mode 100644
index 0000000000..ffbf2d2873
--- /dev/null
+++ b/Netgen/libsrc/meshing/hpref_prism.hpp
@@ -0,0 +1,300 @@
+
+
+
+
+
+ // HP_PRISM ... no refinement
+ int refprism_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_newelstypes[] =
+ {
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_newels[][8] =
+ {
+ { 1, 2, 3, 4, 5, 6 }
+ };
+ HPRef_Struct refprism =
+ {
+ HP_PRISM,
+ refprism_splitedges,
+ 0, 0,
+ refprism_newelstypes,
+ refprism_newels
+ };
+
+
+
+ // HP_PRISM_SINGEDGE ... vertical edge 1-4 is singular
+ int refprism_singedge_splitedges[][3] =
+ {
+ { 1, 2, 7 },
+ { 1, 3, 8 },
+ { 4, 5, 9 },
+ { 4, 6, 10 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_singedge_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_HEX,
+ HP_NONE,
+ };
+ int refprism_singedge_newels[][8] =
+ {
+ { 1, 7, 8, 4, 9, 10 },
+ { 3, 8, 7, 2, 6, 10, 9, 5 }
+ };
+ HPRef_Struct refprism_singedge =
+ {
+ HP_PRISM,
+ refprism_singedge_splitedges,
+ 0, 0,
+ refprism_singedge_newelstypes,
+ refprism_singedge_newels
+ };
+
+
+
+
+
+
+ // HP_PRISM_SINGEDGE_V12 vertical edges 1-4 and 2-5 are singular
+ int refprism_singedge_v12_splitedges[][3] =
+ {
+ { 1, 2, 7 },
+ { 1, 3, 8 },
+ { 2, 1, 9 },
+ { 2, 3, 10 },
+ { 4, 5, 11 },
+ { 4, 6, 12 },
+ { 5, 4, 13 },
+ { 5, 6, 14},
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_singedge_v12_newelstypes[] =
+ {
+ HP_HEX,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_singedge_v12_newels[][8] =
+ {
+ { 7, 9, 10, 8, 11, 13, 14, 12 },
+ { 1, 7, 8, 4, 11, 12 },
+ { 2, 10, 9, 5, 14, 13 },
+ { 3, 8, 10, 6, 12, 14 },
+ };
+ HPRef_Struct refprism_singedge_v12 =
+ {
+ HP_PRISM,
+ refprism_singedge_v12_splitedges,
+ 0, 0,
+ refprism_singedge_v12_newelstypes,
+ refprism_singedge_v12_newels
+ };
+
+
+
+
+
+
+ // HP_PRISM_SINGEDGE_H12
+ int refprism_singedge_h12_splitedges[][3] =
+ {
+ { 1, 3, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 3, 1, 10 },
+
+ { 4, 6, 12 },
+ { 5, 4, 13 },
+ { 5, 6, 14 },
+ { 6, 4, 15 },
+
+ { 0, 0, 0 }
+ };
+
+ int refprism_singedge_h12_splitfaces[][4] =
+ {
+ { 2, 1, 3, 11 },
+ { 5, 4, 6, 16 },
+ { 0, 0, 0, 0 },
+ };
+
+ HPREF_ELEMENT_TYPE refprism_singedge_h12_newelstypes[] =
+ {
+ HP_HEX,
+ HP_HEX,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_singedge_h12_newels[][8] =
+ {
+ { 1, 8, 11, 7, 4, 13, 16, 12 },
+ { 9, 3, 10, 11, 14, 6, 15, 16 },
+ { 7, 11, 10, 12, 16, 15 },
+ { 2, 9, 11, 5, 14, 16 },
+ { 8, 2, 11, 13, 5, 16 }
+ };
+ HPRef_Struct refprism_singedge_h12 =
+ {
+ HP_PRISM,
+ refprism_singedge_h12_splitedges,
+ refprism_singedge_h12_splitfaces,
+ 0,
+ refprism_singedge_h12_newelstypes,
+ refprism_singedge_h12_newels
+ };
+
+
+
+
+
+
+ // HP_PRISM_SINGEDGE_H1
+ int refprism_singedge_h1_splitedges[][3] =
+ {
+ { 1, 3, 7 },
+ { 2, 3, 8 },
+ { 4, 6, 9 },
+ { 5, 6, 10 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_singedge_h1_newelstypes[] =
+ {
+ HP_HEX,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_singedge_h1_newels[][8] =
+ {
+ { 1, 2, 8, 7, 4, 5, 10, 9 },
+ { 3, 7, 8, 6, 9, 10 }
+ };
+ HPRef_Struct refprism_singedge_h1 =
+ {
+ HP_PRISM,
+ refprism_singedge_h1_splitedges,
+ 0, 0,
+ refprism_singedge_h1_newelstypes,
+ refprism_singedge_h1_newels
+ };
+
+
+
+
+
+
+
+// HP_PRISM_1FA_0E_0V
+ int refprism_1fa_0e_0v_splitedges[][3] =
+ {
+ { 1, 4, 7 },
+ { 2, 5, 8 },
+ { 3, 6, 9 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_1fa_0e_0v_newelstypes[] =
+ {
+ HP_PRISM_1FA_0E_0V,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_1fa_0e_0v_newels[][8] =
+ {
+ { 1, 2, 3, 7, 8, 9 },
+ { 7, 8, 9, 4, 5, 6 }
+ };
+ HPRef_Struct refprism_1fa_0e_0v =
+ {
+ HP_PRISM,
+ refprism_1fa_0e_0v_splitedges,
+ 0, 0,
+ refprism_1fa_0e_0v_newelstypes,
+ refprism_1fa_0e_0v_newels
+ };
+
+
+
+
+
+
+// HP_PRISM_1FB_0E_0V ... quad face 1-2-4-5
+ int refprism_1fb_0e_0v_splitedges[][3] =
+ {
+ { 1, 3, 7 },
+ { 2, 3, 8 },
+ { 4, 6, 9 },
+ { 5, 6, 10 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_1fb_0e_0v_newelstypes[] =
+ {
+ HP_HEX_1F_0E_0V,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_1fb_0e_0v_newels[][8] =
+ {
+ { 1, 4, 5, 2, 7, 9, 10, 8 },
+ { 7, 8, 3, 9, 10, 6 }
+ };
+ HPRef_Struct refprism_1fb_0e_0v =
+ {
+ HP_PRISM,
+ refprism_1fb_0e_0v_splitedges,
+ 0, 0,
+ refprism_1fb_0e_0v_newelstypes,
+ refprism_1fb_0e_0v_newels
+ };
+
+
+
+
+
+
+// HP_PRISM_1FB_1EA_0V ... quad face 1-2-4-5
+ int refprism_1fb_1ea_0v_splitedges[][3] =
+ {
+ { 1, 3, 7 },
+ { 2, 3, 8 },
+ { 4, 6, 9 },
+ { 5, 6, 10 },
+ { 1, 2, 11 },
+ { 4, 5, 12 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refprism_1fb_1ea_0v_newelstypes[] =
+ {
+ HP_HEX_1F_0E_0V,
+ HP_PRISM_1FB_1EA_0V,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refprism_1fb_1ea_0v_newels[][8] =
+ {
+ { 11, 12, 5, 2, 7, 9, 10, 8 },
+ { 1, 11, 7, 4, 12, 9 },
+ { 7, 8, 3, 9, 10, 6 }
+ };
+ HPRef_Struct refprism_1fb_1ea_0v =
+ {
+ HP_PRISM,
+ refprism_1fb_1ea_0v_splitedges,
+ 0, 0,
+ refprism_1fb_1ea_0v_newelstypes,
+ refprism_1fb_1ea_0v_newels
+ };
+
+
+
+
+
diff --git a/Netgen/libsrc/meshing/hpref_quad.hpp b/Netgen/libsrc/meshing/hpref_quad.hpp
new file mode 100644
index 0000000000..8802d4539e
--- /dev/null
+++ b/Netgen/libsrc/meshing/hpref_quad.hpp
@@ -0,0 +1,2129 @@
+
+
+
+
+// HP_QUAD
+int refquad_splitedges[][3] =
+{
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_newelstypes[] =
+{
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_newels[][8] =
+{
+ { 1, 2, 3, 4 },
+};
+HPRef_Struct refquad =
+{
+ HP_QUAD,
+ refquad_splitedges,
+ 0, 0,
+ refquad_newelstypes,
+ refquad_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_SINGCORNER
+int refquad_singcorner_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_singcorner_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_TRIG,
+ HP_NONE,
+};
+int refquad_singcorner_newels[][8] =
+{
+ { 1, 5, 6 },
+ { 2, 4, 6, 5 },
+ { 2, 3, 4 },
+};
+HPRef_Struct refquad_singcorner =
+{
+ HP_QUAD,
+ refquad_singcorner_splitedges,
+ 0, 0,
+ refquad_singcorner_newelstypes,
+ refquad_singcorner_newels
+};
+
+
+
+
+
+// HP_DUMMY_QUAD_SINGCORNER
+int refdummyquad_singcorner_splitedges[][3] =
+{
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refdummyquad_singcorner_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG,
+ HP_NONE,
+};
+int refdummyquad_singcorner_newels[][8] =
+{
+ { 1, 2, 4 },
+ { 4, 2, 3 },
+};
+HPRef_Struct refdummyquad_singcorner =
+{
+ HP_QUAD,
+ refdummyquad_singcorner_splitedges,
+ 0, 0,
+ refdummyquad_singcorner_newelstypes,
+ refdummyquad_singcorner_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_SINGEDGE
+int refquad_singedge_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_singedge_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_singedge_newels[][8] =
+{
+ { 1, 2, 6, 5 },
+ { 5, 6, 3, 4 },
+};
+HPRef_Struct refquad_singedge =
+{
+ HP_QUAD,
+ refquad_singedge_splitedges,
+ 0, 0,
+ refquad_singedge_newelstypes,
+ refquad_singedge_newels
+};
+
+
+
+
+
+
+// HP_QUAD_0E_2VA
+int refquad_0e_2va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_0e_2va_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_0e_2va_newels[][8] =
+{
+ { 1, 5, 6 },
+ { 2, 8, 7 },
+ { 5, 7, 8, 6 },
+ { 6, 8, 3, 4 },
+};
+HPRef_Struct refquad_0e_2va =
+{
+ HP_QUAD,
+ refquad_0e_2va_splitedges,
+ 0, 0,
+ refquad_0e_2va_newelstypes,
+ refquad_0e_2va_newels
+};
+
+
+
+// HP_QUAD_0E_2VB
+int refquad_0e_2vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 3, 4, 7 },
+ { 3, 2, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_0e_2vb_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_0e_2vb_newels[][8] =
+{
+ { 1, 5, 6 },
+ { 3, 7, 8 },
+ { 5, 2, 4, 6 },
+ { 2, 8, 7, 4 },
+};
+HPRef_Struct refquad_0e_2vb =
+{
+ HP_QUAD,
+ refquad_0e_2vb_splitedges,
+ 0, 0,
+ refquad_0e_2vb_newelstypes,
+ refquad_0e_2vb_newels
+};
+
+
+
+
+// HP_QUAD_0E_3V
+int refquad_0e_3v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 2, 9 },
+ { 3, 4, 10 },
+ { 0, 0, 0 }
+};
+
+int refquad_0e_3v_splitfaces[][4] =
+{
+ { 2, 3, 1, 14 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_0e_3v_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_0e_3v_newels[][8] =
+{
+ { 1, 5, 6 },
+ { 2, 8, 14, 7 },
+ { 3, 10, 9 },
+ { 5, 7, 14, 6 },
+ { 8, 9, 10, 14 },
+ { 6, 14, 10, 4 },
+};
+HPRef_Struct refquad_0e_3v =
+{
+ HP_QUAD,
+ refquad_0e_3v_splitedges,
+ refquad_0e_3v_splitfaces,
+ 0,
+ refquad_0e_3v_newelstypes,
+ refquad_0e_3v_newels
+};
+
+
+
+
+// HP_QUAD_0E_4V
+int refquad_0e_4v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 2, 9 },
+ { 3, 4, 10 },
+ { 4, 1, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+
+int refquad_0e_4v_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 3, 4, 2, 15 },
+ { 4, 1, 3, 16 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_0e_4v_newelstypes[] =
+{
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+
+ HP_QUAD,
+ HP_QUAD,
+ HP_QUAD,
+ HP_QUAD,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_0e_4v_newels[][8] =
+{
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 3, 10, 15, 9 },
+ { 4, 11, 16, 12 },
+ { 5, 7, 14, 13 },
+ { 8, 9, 15, 14 },
+ { 10, 12, 16, 15 },
+ { 11, 6, 13, 16 },
+ { 13, 14, 15, 16 }
+};
+HPRef_Struct refquad_0e_4v =
+{
+ HP_QUAD,
+ refquad_0e_4v_splitedges,
+ refquad_0e_4v_splitfaces,
+ 0,
+ refquad_0e_4v_newelstypes,
+ refquad_0e_4v_newels
+};
+
+
+
+
+
+
+
+
+// HP_QUAD_1E_1VA
+int refquad_1e_1va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_1va_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_NONE,
+};
+int refquad_1e_1va_newels[][8] =
+{
+ { 7, 2, 6, 5 },
+ { 5, 6, 3, 4 },
+ { 1, 7, 5 },
+};
+HPRef_Struct refquad_1e_1va =
+{
+ HP_QUAD,
+ refquad_1e_1va_splitedges,
+ 0, 0,
+ refquad_1e_1va_newelstypes,
+ refquad_1e_1va_newels
+};
+
+
+
+
+// HP_QUAD_1E_1VB
+int refquad_1e_1vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 2, 1, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_1vb_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_1e_1vb_newels[][8] =
+{
+ { 1, 7, 6, 5 },
+ { 5, 6, 3, 4 },
+ { 7, 2, 6 },
+};
+HPRef_Struct refquad_1e_1vb =
+{
+ HP_QUAD,
+ refquad_1e_1vb_splitedges,
+ 0, 0,
+ refquad_1e_1vb_newelstypes,
+ refquad_1e_1vb_newels
+};
+
+
+
+// HP_QUAD_1E_1VC
+int refquad_1e_1vc_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 3, 4, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_1vc_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_1vc_newels[][8] =
+{
+ { 1, 2, 6, 5 },
+ { 5, 6, 4 },
+ { 4, 6, 7, 8 },
+ { 3, 8, 7 }
+};
+HPRef_Struct refquad_1e_1vc =
+{
+ HP_QUAD,
+ refquad_1e_1vc_splitedges,
+ 0, 0,
+ refquad_1e_1vc_newelstypes,
+ refquad_1e_1vc_newels
+};
+
+
+
+// HP_QUAD_1E_1VD
+int refquad_1e_1vd_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 4, 1, 7 },
+ { 4, 3, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_1vd_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_1vd_newels[][8] =
+{
+ { 1, 2, 6, 5 },
+ { 5, 6, 3 },
+ { 5, 3, 8, 7 },
+ { 4, 7, 8 }
+};
+HPRef_Struct refquad_1e_1vd =
+{
+ HP_QUAD,
+ refquad_1e_1vd_splitedges,
+ 0, 0,
+ refquad_1e_1vd_newelstypes,
+ refquad_1e_1vd_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_1E_2VA
+int refquad_1e_2va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2va_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_1e_2va_newels[][8] =
+{
+ { 7, 8, 6, 5 },
+ { 5, 6, 3, 4 },
+ { 1, 7, 5 },
+ { 8, 2, 6 }
+};
+HPRef_Struct refquad_1e_2va =
+{
+ HP_QUAD,
+ refquad_1e_2va_splitedges,
+ 0, 0,
+ refquad_1e_2va_newelstypes,
+ refquad_1e_2va_newels
+};
+
+
+
+
+// HP_QUAD_1E_2VB
+int refquad_1e_2vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 3, 2, 8 },
+ { 3, 4, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2vb_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_2vb_newels[][8] =
+{
+ { 7, 2, 6, 5 },
+ { 1, 7, 5 },
+ { 5, 6, 4 },
+ { 4, 6, 8, 9 },
+ { 3, 9, 8 }
+};
+HPRef_Struct refquad_1e_2vb =
+{
+ HP_QUAD,
+ refquad_1e_2vb_splitedges,
+ 0, 0,
+ refquad_1e_2vb_newelstypes,
+ refquad_1e_2vb_newels
+};
+
+
+
+
+// HP_QUAD_1E_2VC
+int refquad_1e_2vc_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 4, 1, 8 },
+ { 4, 3, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2vc_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_2vc_newels[][8] =
+{
+ { 7, 2, 6, 5 },
+ { 1, 7, 5 },
+ { 5, 6, 3 },
+ { 5, 3, 9, 8 },
+ { 4, 8, 9 }
+};
+HPRef_Struct refquad_1e_2vc =
+{
+ HP_QUAD,
+ refquad_1e_2vc_splitedges,
+ 0, 0,
+ refquad_1e_2vc_newelstypes,
+ refquad_1e_2vc_newels
+};
+
+
+
+
+// HP_QUAD_1E_2VD
+int refquad_1e_2vd_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 2, 1, 7 },
+ { 3, 2, 8 },
+ { 3, 4, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2vd_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_2vd_newels[][8] =
+{
+ { 1, 7, 6, 5 },
+ { 7, 2, 6 },
+ { 5, 6, 4 },
+ { 4, 6, 8, 9 },
+ { 3, 9, 8 }
+};
+HPRef_Struct refquad_1e_2vd =
+{
+ HP_QUAD,
+ refquad_1e_2vd_splitedges,
+ 0, 0,
+ refquad_1e_2vd_newelstypes,
+ refquad_1e_2vd_newels
+};
+
+
+
+
+
+// HP_QUAD_1E_2VE
+int refquad_1e_2ve_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 2, 1, 7 },
+ { 4, 1, 8 },
+ { 4, 3, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2ve_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_2ve_newels[][8] =
+{
+ { 1, 7, 6, 5 },
+ { 7, 2, 6 },
+ { 5, 6, 3 },
+ { 5, 3, 9, 8 },
+ { 4, 8, 9 }
+};
+HPRef_Struct refquad_1e_2ve =
+{
+ HP_QUAD,
+ refquad_1e_2ve_splitedges,
+ 0, 0,
+ refquad_1e_2ve_newelstypes,
+ refquad_1e_2ve_newels
+};
+
+
+
+
+
+
+// HP_QUAD_1E_2VF
+int refquad_1e_2vf_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 4, 1, 7 },
+ { 4, 3, 8 },
+ { 3, 2, 9 },
+ { 3, 4, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_2vf_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_1e_2vf_newels[][8] =
+{
+ { 1, 2, 6, 5 },
+ { 5, 6, 9, 7 },
+ { 7, 9, 10, 8 },
+ { 4, 7, 8 },
+ { 3, 10, 9 },
+};
+HPRef_Struct refquad_1e_2vf =
+{
+ HP_QUAD,
+ refquad_1e_2vf_splitedges,
+ 0, 0,
+ refquad_1e_2vf_newelstypes,
+ refquad_1e_2vf_newels
+};
+
+
+
+
+
+// HP_QUAD_1E_3VA
+int refquad_1e_3va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 3, 2, 9 },
+ { 3, 4, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_3va_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG,
+ HP_NONE,
+};
+int refquad_1e_3va_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 8, 2, 6 },
+ { 3, 10, 9 },
+ { 7, 8, 6, 5 },
+ { 4, 6, 9, 10 },
+ { 5, 6, 4 }
+};
+HPRef_Struct refquad_1e_3va =
+{
+ HP_QUAD,
+ refquad_1e_3va_splitedges,
+ 0, 0,
+ refquad_1e_3va_newelstypes,
+ refquad_1e_3va_newels
+};
+
+
+
+
+
+// HP_QUAD_1E_3VB
+int refquad_1e_3vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 4, 1, 9 },
+ { 4, 3, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_3vb_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG,
+ HP_NONE,
+};
+int refquad_1e_3vb_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 8, 2, 6 },
+ { 4, 9, 10 },
+ { 7, 8, 6, 5 },
+ { 5, 3, 10, 9 },
+ { 5, 6, 3 }
+};
+HPRef_Struct refquad_1e_3vb =
+{
+ HP_QUAD,
+ refquad_1e_3vb_splitedges,
+ 0, 0,
+ refquad_1e_3vb_newelstypes,
+ refquad_1e_3vb_newels
+};
+
+
+
+
+
+// HP_QUAD_1E_3VC
+int refquad_1e_3vc_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 3, 2, 8 },
+ { 3, 4, 9 },
+ { 4, 3, 10 },
+ { 4, 1, 11 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_3vc_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_1e_3vc_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 3, 9, 8 },
+ { 4, 11, 10 },
+ { 7, 2, 6, 5 },
+ { 5, 6, 8, 11 },
+ { 11, 8, 9, 10 }
+};
+HPRef_Struct refquad_1e_3vc =
+{
+ HP_QUAD,
+ refquad_1e_3vc_splitedges,
+ 0, 0,
+ refquad_1e_3vc_newelstypes,
+ refquad_1e_3vc_newels
+};
+
+
+
+
+// HP_QUAD_1E_3VD
+int refquad_1e_3vd_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 2, 1, 7 },
+ { 3, 2, 8 },
+ { 3, 4, 9 },
+ { 4, 3, 10 },
+ { 4, 1, 11 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_3vd_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_1e_3vd_newels[][8] =
+{
+ { 7, 2, 6 },
+ { 3, 9, 8 },
+ { 4, 11, 10 },
+ { 1, 7, 6, 5 },
+ { 5, 6, 8, 11 },
+ { 11, 8, 9, 10 }
+};
+HPRef_Struct refquad_1e_3vd =
+{
+ HP_QUAD,
+ refquad_1e_3vd_splitedges,
+ 0, 0,
+ refquad_1e_3vd_newelstypes,
+ refquad_1e_3vd_newels
+};
+
+
+
+
+
+
+// HP_QUAD_1E_4V
+int refquad_1e_4v_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 4, 1, 9 },
+ { 3, 2, 10 },
+ { 4, 3, 11 },
+ { 3, 4, 12 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_1e_4v_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_1e_4v_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 8, 2, 6 },
+ { 3, 12, 10 },
+ { 4, 9, 11 },
+ { 7, 8, 6, 5 },
+ { 5, 6, 10, 9 },
+ { 9, 10, 12, 11 }
+};
+HPRef_Struct refquad_1e_4v =
+{
+ HP_QUAD,
+ refquad_1e_4v_splitedges,
+ 0, 0,
+ refquad_1e_4v_newelstypes,
+ refquad_1e_4v_newels
+};
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+
+// HP_QUAD_2E
+int refquad_2e_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 0, 0, 0 }
+};
+int refquad_2e_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2e_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 2, 7, 9 },
+ { 4, 6, 9, 8 },
+ { 9, 7, 3, 8 },
+};
+HPRef_Struct refquad_2e =
+{
+ HP_QUAD,
+ refquad_2e_splitedges,
+ refquad_2e_splitfaces,
+ 0,
+ refquad_2e_newelstypes,
+ refquad_2e_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_2E_1VA
+int refquad_2e_1va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 2, 1, 10 },
+ { 0, 0, 0 }
+};
+int refquad_2e_1va_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_1va_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_2e_1va_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 10, 7, 9 },
+ { 4, 6, 9, 8 },
+ { 9, 7, 3, 8 },
+ { 10, 2, 7 },
+};
+HPRef_Struct refquad_2e_1va =
+{
+ HP_QUAD,
+ refquad_2e_1va_splitedges,
+ refquad_2e_1va_splitfaces,
+ 0,
+ refquad_2e_1va_newelstypes,
+ refquad_2e_1va_newels
+};
+
+
+
+
+
+
+// HP_QUAD_2E_1VB
+int refquad_2e_1vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 0, 0, 0 }
+};
+int refquad_2e_1vb_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_1vb_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int refquad_2e_1vb_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 2, 7, 9 },
+ { 4, 6, 9, 8 },
+ { 7, 8, 9 },
+ { 8, 7, 10, 11 },
+ { 3, 11, 10 }
+};
+HPRef_Struct refquad_2e_1vb =
+{
+ HP_QUAD,
+ refquad_2e_1vb_splitedges,
+ refquad_2e_1vb_splitfaces,
+ 0,
+ refquad_2e_1vb_newelstypes,
+ refquad_2e_1vb_newels
+};
+
+
+
+
+
+// HP_QUAD_2E_1VC
+int refquad_2e_1vc_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 1, 8 },
+ { 4, 3, 9 },
+ { 0, 0, 0 }
+};
+int refquad_2e_1vc_splitfaces[][4] =
+{
+ { 1, 2, 4, 10 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_1vc_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2e_1vc_newels[][8] =
+{
+ { 1, 5, 10 },
+ { 6, 1, 10 },
+ { 4, 8, 9 },
+ { 5, 2, 7, 10 },
+ { 8, 6, 10, 9 },
+ { 10, 7, 3, 9 },
+};
+HPRef_Struct refquad_2e_1vc =
+{
+ HP_QUAD,
+ refquad_2e_1vc_splitedges,
+ refquad_2e_1vc_splitfaces,
+ 0,
+ refquad_2e_1vc_newelstypes,
+ refquad_2e_1vc_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_QUAD_2E
+int refquad_2e_2va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 2, 1, 12 },
+ { 0, 0, 0 }
+};
+int refquad_2e_2va_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_2va_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_2e_2va_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 12, 7, 9 },
+ { 4, 6, 9, 8 },
+ { 7, 8, 9 },
+ { 8, 7, 10, 11 },
+ { 3, 11, 10 },
+ { 12, 2, 7 }
+};
+HPRef_Struct refquad_2e_2va =
+{
+ HP_QUAD,
+ refquad_2e_2va_splitedges,
+ refquad_2e_2va_splitfaces,
+ 0,
+ refquad_2e_2va_newelstypes,
+ refquad_2e_2va_newels
+};
+
+
+
+
+
+
+// HP_QUAD_2E_2VB
+int refquad_2e_2vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 4, 1, 9 },
+ { 4, 3, 10 },
+ { 0, 0, 0 }
+};
+int refquad_2e_2vb_splitfaces[][4] =
+{
+ { 1, 2, 4, 11 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_2vb_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2e_2vb_newels[][8] =
+{
+ { 1, 5, 11 },
+ { 6, 1, 11 },
+ { 4, 9, 10 },
+ { 7, 2, 8 },
+ { 5, 7, 8, 11 },
+ { 9, 6, 11, 10 },
+ { 3, 10, 11, 8 },
+};
+HPRef_Struct refquad_2e_2vb =
+{
+ HP_QUAD,
+ refquad_2e_2vb_splitedges,
+ refquad_2e_2vb_splitfaces,
+ 0,
+ refquad_2e_2vb_newelstypes,
+ refquad_2e_2vb_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_QUAD_2E
+int refquad_2e_2vc_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 1, 12 },
+ { 0, 0, 0 }
+};
+int refquad_2e_2vc_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_2vc_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_2e_2vc_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 2, 7, 9 },
+ { 12, 6, 9, 8 },
+ { 7, 8, 9 },
+ { 8, 7, 10, 11 },
+ { 3, 11, 10 },
+ { 4, 12, 8 }
+};
+HPRef_Struct refquad_2e_2vc =
+{
+ HP_QUAD,
+ refquad_2e_2vc_splitedges,
+ refquad_2e_2vc_splitfaces,
+ 0,
+ refquad_2e_2vc_newelstypes,
+ refquad_2e_2vc_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_QUAD_2E
+int refquad_2e_3v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 4, 3, 8 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 2, 1, 12 },
+ { 4, 1, 13 },
+ { 0, 0, 0 }
+};
+int refquad_2e_3v_splitfaces[][4] =
+{
+ { 1, 2, 4, 9 },
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2e_3v_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_NONE,
+};
+int refquad_2e_3v_newels[][8] =
+{
+ { 1, 5, 9 },
+ { 6, 1, 9 },
+ { 5, 12, 7, 9 },
+ { 13, 6, 9, 8 },
+ { 7, 8, 9 },
+ { 8, 7, 10, 11 },
+ { 3, 11, 10 },
+ { 12, 2, 7 },
+ { 4, 13, 8 }
+};
+HPRef_Struct refquad_2e_3v =
+{
+ HP_QUAD,
+ refquad_2e_3v_splitedges,
+ refquad_2e_3v_splitfaces,
+ 0,
+ refquad_2e_3v_newelstypes,
+ refquad_2e_3v_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_QUAD_2EB_0V
+int refquad_2eb_0v_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 0, 0, 0 }
+};
+int refquad_2eb_0v_splitfaces[][4] =
+{
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2eb_0v_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_0v_newels[][8] =
+{
+ { 1, 2, 6, 5 },
+ { 3, 4, 8, 7 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_0v =
+{
+ HP_QUAD,
+ refquad_2eb_0v_splitedges,
+ refquad_2eb_0v_splitfaces,
+ 0,
+ refquad_2eb_0v_newelstypes,
+ refquad_2eb_0v_newels
+};
+
+
+
+
+
+
+
+
+// HP_QUAD_2EB_1VA
+int refquad_2eb_1va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 1, 2, 9 },
+ { 0, 0, 0 }
+};
+int refquad_2eb_1va_splitfaces[][4] =
+{
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2eb_1va_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_1va_newels[][8] =
+{
+ { 9, 2, 6, 5 },
+ { 3, 4, 8, 7 },
+ { 1, 9, 5 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_1va =
+{
+ HP_QUAD,
+ refquad_2eb_1va_splitedges,
+ refquad_2eb_1va_splitfaces,
+ 0,
+ refquad_2eb_1va_newelstypes,
+ refquad_2eb_1va_newels
+};
+
+
+
+
+// HP_QUAD_2EB_1VB
+int refquad_2eb_1vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 2, 1, 9 },
+ { 0, 0, 0 }
+};
+int refquad_2eb_1vb_splitfaces[][4] =
+{
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2eb_1vb_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_1vb_newels[][8] =
+{
+ { 1, 9, 6, 5 },
+ { 3, 4, 8, 7 },
+ { 9, 2, 6 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_1vb =
+{
+ HP_QUAD,
+ refquad_2eb_1vb_splitedges,
+ refquad_2eb_1vb_splitfaces,
+ 0,
+ refquad_2eb_1vb_newelstypes,
+ refquad_2eb_1vb_newels
+};
+
+
+
+
+
+
+// HP_QUAD_2EB_2VA
+int refquad_2eb_2va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 1, 2, 9 },
+ { 2, 1, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_2eb_2va_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_2va_newels[][8] =
+{
+ { 9, 10, 6, 5 },
+ { 3, 4, 8, 7 },
+ { 1, 9, 5 },
+ { 10, 2, 6 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_2va =
+{
+ HP_QUAD,
+ refquad_2eb_2va_splitedges,
+ 0, 0,
+ refquad_2eb_2va_newelstypes,
+ refquad_2eb_2va_newels
+};
+
+
+
+// HP_QUAD_2EB_2VB
+int refquad_2eb_2vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 1, 2, 9 },
+ { 3, 4, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_2eb_2vb_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_2vb_newels[][8] =
+{
+ { 9, 2, 6, 5 },
+ { 10, 4, 8, 7 },
+ { 1, 9, 5 },
+ { 3, 10, 7 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_2vb =
+{
+ HP_QUAD,
+ refquad_2eb_2vb_splitedges,
+ 0, 0,
+ refquad_2eb_2vb_newelstypes,
+ refquad_2eb_2vb_newels
+};
+
+
+
+// HP_QUAD_2EB_2VC
+int refquad_2eb_2vc_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 1, 2, 9 },
+ { 4, 3, 10 },
+ { 0, 0, 0 }
+};
+int refquad_2eb_2vc_splitfaces[][4] =
+{
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2eb_2vc_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_2vc_newels[][8] =
+{
+ { 9, 2, 6, 5 },
+ { 3, 10, 8, 7 },
+ { 1, 9, 5 },
+ { 10, 4, 8 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_2vc =
+{
+ HP_QUAD,
+ refquad_2eb_2vc_splitedges,
+ refquad_2eb_2vc_splitfaces,
+ 0,
+ refquad_2eb_2vc_newelstypes,
+ refquad_2eb_2vc_newels
+};
+
+
+
+
+// HP_QUAD_2EB_2VD
+int refquad_2eb_2vd_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 2, 1, 9 },
+ { 4, 3, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_2eb_2vd_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_2vd_newels[][8] =
+{
+ { 1, 9, 6, 5 },
+ { 3, 10, 8, 7 },
+ { 9, 2, 6 },
+ { 10, 4, 8 },
+ { 5, 6, 7, 8 }
+};
+HPRef_Struct refquad_2eb_2vd =
+{
+ HP_QUAD,
+ refquad_2eb_2vd_splitedges,
+ 0, 0,
+ refquad_2eb_2vd_newelstypes,
+ refquad_2eb_2vd_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_2EB_3VA
+int refquad_2eb_3va_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 3, 2, 9 },
+ { 4, 1, 10 },
+ { 3, 4, 11 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_2eb_3va_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_3va_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 8, 2, 6 },
+ { 3, 11, 9},
+ { 7, 8, 6, 5 },
+ { 11, 4, 10, 9 },
+ { 5, 6, 9, 10 }
+};
+HPRef_Struct refquad_2eb_3va =
+{
+ HP_QUAD,
+ refquad_2eb_3va_splitedges,
+ 0, 0,
+ refquad_2eb_3va_newelstypes,
+ refquad_2eb_3va_newels
+};
+
+
+
+
+
+// HP_QUAD_2EB_3VB
+int refquad_2eb_3vb_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 1, 2, 7 },
+ { 2, 1, 8 },
+ { 3, 2, 9 },
+ { 4, 1, 10 },
+ { 4, 3, 11 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE refquad_2eb_3vb_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_2eb_3vb_newels[][8] =
+{
+ { 1, 7, 5 },
+ { 8, 2, 6 },
+ { 11, 4, 10 },
+ { 7, 8, 6, 5 },
+ { 3, 11, 10, 9 },
+ { 5, 6, 9, 10 }
+};
+HPRef_Struct refquad_2eb_3vb =
+{
+ HP_QUAD,
+ refquad_2eb_3vb_splitedges,
+ 0, 0,
+ refquad_2eb_3vb_newelstypes,
+ refquad_2eb_3vb_newels
+};
+
+
+
+
+
+
+// HP_QUAD_2EB_4V
+int refquad_2eb_4v_splitedges[][3] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 4, 1, 8 },
+ { 1, 2, 9 },
+ { 2, 1, 10 },
+ { 3, 4, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+int refquad_2eb_4v_splitfaces[][4] =
+{
+ { 0, 0, 0, 0 },
+};
+HPREF_ELEMENT_TYPE refquad_2eb_4v_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_NONE,
+};
+int refquad_2eb_4v_newels[][8] =
+{
+ { 9, 10, 6, 5 },
+ { 11, 12, 8, 7 },
+ { 5, 6, 7, 8 },
+ { 1, 9, 5 },
+ { 10, 2, 6 },
+ { 3, 11, 7 },
+ { 12, 4, 8 },
+};
+HPRef_Struct refquad_2eb_4v =
+{
+ HP_QUAD,
+ refquad_2eb_4v_splitedges,
+ refquad_2eb_4v_splitfaces,
+ 0,
+ refquad_2eb_4v_newelstypes,
+ refquad_2eb_4v_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_3E
+int refquad_3e_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 4, 10 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+
+int refquad_3e_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_3e_newelstypes[] =
+{
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+// HP_TRIG_SINGEDGECORNER1,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER1,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_3e_newels[][8] =
+{
+// { 1, 5, 13 },
+// { 6, 1, 13 },
+// { 7, 2, 14 },
+// { 2, 8, 14 },
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 5, 7, 14, 13 },
+ { 8, 3, 10, 14 },
+ { 4, 6, 13, 12 },
+ { 13, 14, 10, 12 }
+};
+HPRef_Struct refquad_3e =
+{
+ HP_QUAD,
+ refquad_3e_splitedges,
+ refquad_3e_splitfaces,
+ 0,
+ refquad_3e_newelstypes,
+ refquad_3e_newels
+};
+
+
+
+
+
+
+
+// HP_QUAD_3E_3VA
+int refquad_3e_3va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 4, 10 },
+ { 3, 2, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+
+int refquad_3e_3va_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_3e_3va_newelstypes[] =
+{
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+
+// HP_TRIG_SINGEDGECORNER1,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_3e_3va_newels[][8] =
+{
+// { 1, 5, 13 },
+// { 6, 1, 13 },
+// { 7, 2, 14 },
+// { 2, 8, 14 },
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 11, 3, 10 },
+ { 5, 7, 14, 13 },
+ { 8, 11, 10, 14 },
+ { 4, 6, 13, 12 },
+ { 13, 14, 10, 12 }
+};
+HPRef_Struct refquad_3e_3va =
+{
+ HP_QUAD,
+ refquad_3e_3va_splitedges,
+ refquad_3e_3va_splitfaces,
+ 0,
+ refquad_3e_3va_newelstypes,
+ refquad_3e_3va_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_QUAD_3E_3VB
+int refquad_3e_3vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 4, 10 },
+ { 4, 1, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+
+int refquad_3e_3vb_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_3e_3vb_newelstypes[] =
+{
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+
+// HP_TRIG_SINGEDGECORNER1,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER1,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_3e_3vb_newels[][8] =
+{
+// { 1, 5, 13 },
+// { 6, 1, 13 },
+// { 7, 2, 14 },
+// { 2, 8, 14 },
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 4, 11, 12 },
+ { 5, 7, 14, 13 },
+ { 8, 3, 10, 14 },
+ { 11, 6, 13, 12 },
+ { 13, 14, 10, 12 }
+};
+HPRef_Struct refquad_3e_3vb =
+{
+ HP_QUAD,
+ refquad_3e_3vb_splitedges,
+ refquad_3e_3vb_splitfaces,
+ 0,
+ refquad_3e_3vb_newelstypes,
+ refquad_3e_3vb_newels
+};
+
+
+
+
+
+
+
+
+
+// HP_QUAD_3E_4V
+int refquad_3e_4v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 4, 10 },
+ { 3, 2, 11 },
+ { 4, 3, 12 },
+ { 4, 1, 15 },
+ { 0, 0, 0 }
+};
+
+int refquad_3e_4v_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_3e_4v_newelstypes[] =
+{
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+
+// HP_TRIG_SINGEDGECORNER1,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER2,
+// HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_3e_4v_newels[][8] =
+{
+// { 1, 5, 13 },
+// { 6, 1, 13 },
+// { 7, 2, 14 },
+// { 2, 8, 14 },
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 11, 3, 10 },
+ { 4, 15, 12 },
+ { 5, 7, 14, 13 },
+ { 8, 11, 10, 14 },
+ { 15, 6, 13, 12 },
+ { 13, 14, 10, 12 }
+};
+HPRef_Struct refquad_3e_4v =
+{
+ HP_QUAD,
+ refquad_3e_4v_splitedges,
+ refquad_3e_4v_splitfaces,
+ 0,
+ refquad_3e_4v_newelstypes,
+ refquad_3e_4v_newels
+};
+
+
+
+
+
+
+
+
+
+// HP_QUAD_4E
+int refquad_4e_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 3, 2, 9 },
+ { 3, 4, 10 },
+ { 4, 1, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+
+int refquad_4e_splitfaces[][4] =
+{
+ { 1, 2, 4, 13 },
+ { 2, 3, 1, 14 },
+ { 3, 4, 2, 15 },
+ { 4, 1, 3, 16 },
+ { 0, 0, 0, 0 },
+};
+
+HPREF_ELEMENT_TYPE refquad_4e_newelstypes[] =
+{
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+ HP_QUAD_2E,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+
+ HP_QUAD,
+ HP_NONE,
+};
+int refquad_4e_newels[][8] =
+{
+ { 1, 5, 13, 6 },
+ { 2, 8, 14, 7 },
+ { 3, 10, 15, 9 },
+ { 4, 11, 16, 12 },
+ { 5, 7, 14, 13 },
+ { 8, 9, 15, 14 },
+ { 10, 12, 16, 15 },
+ { 11, 6, 13, 16 },
+ { 13, 14, 15, 16 }
+};
+HPRef_Struct refquad_4e =
+{
+ HP_QUAD,
+ refquad_4e_splitedges,
+ refquad_4e_splitfaces,
+ 0,
+ refquad_4e_newelstypes,
+ refquad_4e_newels
+};
+
+
diff --git a/Netgen/libsrc/meshing/hpref_tet.hpp b/Netgen/libsrc/meshing/hpref_tet.hpp
new file mode 100644
index 0000000000..b071269ec8
--- /dev/null
+++ b/Netgen/libsrc/meshing/hpref_tet.hpp
@@ -0,0 +1,2842 @@
+
+
+// HP_TET
+int reftet_splitedges[][3] =
+{
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_newelstypes[] =
+{
+ HP_TET,
+ HP_NONE,
+};
+int reftet_newels[][8] =
+{
+ { 1, 2, 3, 4 },
+};
+HPRef_Struct reftet =
+{
+ HP_TET,
+ reftet_splitedges,
+ 0, 0,
+ reftet_newelstypes,
+ reftet_newels
+};
+
+
+
+/* *********** Tet - Refinement - 0 edges *************** */
+
+// HP_TET_0E_1V
+int reftet_0e_1v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_0e_1v_newelstypes[] =
+{
+ HP_TET_0E_1V,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_0e_1v_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 5, 6, 7, 2, 3, 4 }
+};
+HPRef_Struct reftet_0e_1v =
+{
+ HP_TET,
+ reftet_0e_1v_splitedges,
+ 0, 0,
+ reftet_0e_1v_newelstypes,
+ reftet_0e_1v_newels
+};
+
+
+
+// HP_TET_0E_2V
+int reftet_0e_2v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_0e_2v_newelstypes[] =
+{
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_PRISM,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_0e_2v_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 2, 10, 9, 8 },
+ { 5, 6, 7, 8, 9, 10 },
+ { 4, 10, 7, 3, 9, 6 },
+};
+HPRef_Struct reftet_0e_2v =
+{
+ HP_TET,
+ reftet_0e_2v_splitedges,
+ 0, 0,
+ reftet_0e_2v_newelstypes,
+ reftet_0e_2v_newels
+};
+
+
+
+
+
+// HP_TET_0E_3V
+int reftet_0e_3v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_0e_3v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 14 },
+ { 2, 3, 1, 15 },
+ { 3, 1, 2, 16 },
+ { 0, 0, 0, 0 },
+ };
+HPREF_ELEMENT_TYPE reftet_0e_3v_newelstypes[] =
+{
+ HP_PYRAMID_0E_1V,
+ HP_PYRAMID_0E_1V,
+ HP_PYRAMID_0E_1V,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_0e_3v_newels[][8] =
+{
+ { 1, 5, 14, 6, 7 },
+ { 2, 9, 15, 8, 10 },
+ { 3, 11, 16, 12, 13 },
+ { 5, 14, 7, 8, 15, 10 },
+ { 9, 15, 10, 12, 16, 13 },
+ { 6, 7, 14, 11, 13, 16 },
+ { 14, 15, 16, 7, 10, 13 },
+ { 7, 10, 13, 4 }
+};
+HPRef_Struct reftet_0e_3v =
+{
+ HP_TET,
+ reftet_0e_3v_splitedges,
+ reftet_0e_3v_splitfaces,
+ 0,
+ reftet_0e_3v_newelstypes,
+ reftet_0e_3v_newels
+};
+
+
+
+
+
+// HP_TET_0E_4V
+int reftet_0e_4v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_0e_4v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 1, 2, 4, 18 },
+ { 1, 3, 4, 19 },
+
+ { 2, 1, 3, 20 },
+ { 2, 1, 4, 21 },
+ { 2, 3, 4, 22 },
+
+ { 3, 1, 2, 23 },
+ { 3, 1, 4, 24 },
+ { 3, 2, 4, 25 },
+
+ { 4, 1, 2, 26 },
+ { 4, 1, 3, 27 },
+ { 4, 2, 3, 28 },
+ { 0, 0, 0, 0 },
+ };
+int reftet_0e_4v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 29 },
+ { 2, 3, 4, 1, 30 },
+ { 3, 4, 1, 2, 31 },
+ { 4, 1, 2, 3, 32 },
+ { 0 },
+ };
+HPREF_ELEMENT_TYPE reftet_0e_4v_newelstypes[] =
+{
+ HP_HEX_0E_1V,
+ HP_HEX_0E_1V,
+ HP_HEX_0E_1V,
+ HP_HEX_0E_1V,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ /*
+ HP_HEX,
+ HP_HEX,
+ HP_HEX,
+ HP_HEX,
+ HP_HEX,
+ HP_HEX,
+ */
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_0e_4v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7, 18, 29, 19 },
+ { 2, 9, 20, 8, 10, 22, 30, 21 },
+ { 3, 11, 23, 12, 13, 24, 31, 25 },
+ { 4, 15, 26, 14, 16, 28, 32, 27 },
+ { 5, 17, 18, 8, 20, 21 },
+ { 18, 17, 29, 21, 20, 30 },
+ { 6, 19, 17, 11, 24, 23 },
+ { 17, 19, 29, 23, 24, 31 },
+ { 7, 18, 19, 14, 26, 27 },
+ { 19, 18, 29, 27, 26, 32 },
+ { 9, 20, 22, 12, 23, 25 },
+ { 22, 20, 30, 25, 23, 31 },
+ { 10, 22, 21, 15, 28, 26 },
+ { 21, 22, 30, 26, 28, 32 },
+ { 13, 24, 25, 16, 27, 28 },
+ { 25, 24, 31, 28, 27, 32 },
+ /*
+ { 5, 17, 29, 18, 8, 20, 30, 21 },
+ { 6, 19, 29, 17, 11, 24, 31, 23 },
+ { 7, 18, 29, 19, 14, 26, 32, 27 },
+ { 9, 20, 30, 22, 12, 23, 31, 25 },
+ { 10, 22, 30, 21, 15, 28, 32, 26 },
+ { 13, 24, 31, 25, 16, 27, 32, 28 },
+ */
+ { 17, 20, 23, 29, 30, 31 },
+ { 18, 26, 21, 29, 32, 30 },
+ { 19, 24, 27, 29, 31, 32 },
+ { 22, 28, 25, 30, 32, 31 },
+
+ { 29, 30, 31, 32 },
+};
+HPRef_Struct reftet_0e_4v =
+{
+ HP_TET,
+ reftet_0e_4v_splitedges,
+ reftet_0e_4v_splitfaces,
+ reftet_0e_4v_splitelements,
+ reftet_0e_4v_newelstypes,
+ reftet_0e_4v_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* *********** Tet - Refinement - 1 edge *************** */
+
+
+
+// HP_TET_1E_0V
+int reftet_1e_0v_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 2, 4, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1e_0v_newelstypes[] =
+{
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_1e_0v_newels[][8] =
+{
+ { 1, 5, 6, 2, 7, 8 },
+ { 7, 3, 5, 8, 4, 6 }
+};
+HPRef_Struct reftet_1e_0v =
+{
+ HP_TET,
+ reftet_1e_0v_splitedges,
+ 0, 0,
+ reftet_1e_0v_newelstypes,
+ reftet_1e_0v_newels
+};
+
+
+
+
+
+// HP_TET_1E_1VA
+int reftet_1e_1va_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 2, 4, 8 },
+ { 1, 2, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1e_1va_newelstypes[] =
+{
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_1e_1va_newels[][8] =
+{
+ { 1, 9, 5, 6 },
+ { 9, 5, 6, 2, 7, 8 },
+ { 7, 3, 5, 8, 4, 6 }
+};
+HPRef_Struct reftet_1e_1va =
+{
+ HP_TET,
+ reftet_1e_1va_splitedges,
+ 0, 0,
+ reftet_1e_1va_newelstypes,
+ reftet_1e_1va_newels
+};
+
+
+
+
+
+
+// HP_TET_1E_1VB
+int reftet_1e_1vb_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 2, 4, 8 },
+ { 4, 1, 9 },
+ { 4, 2, 10 },
+ { 4, 3, 11 },
+ { 0, 0, 0 }
+};
+int reftet_1e_1vb_splitelements[][5] =
+{
+ { 4, 1, 2, 3, 12 },
+ { 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_1e_1vb_newelstypes[] =
+{
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1e_1vb_newels[][8] =
+{
+ { 1, 5, 6, 2, 7, 8 },
+ { 4, 11, 10, 9 },
+ { 7, 8, 10, 11, 12 },
+ { 3, 7, 11, 12 },
+ { 5, 11, 9, 6, 12 },
+ { 5, 3, 11, 12 },
+ { 6, 9, 10, 8, 12 },
+ { 5, 7, 3, 12 },
+ { 5, 6, 8, 7, 12 },
+ { 9, 11, 10, 12 }
+};
+HPRef_Struct reftet_1e_1vb =
+{
+ HP_TET,
+ reftet_1e_1vb_splitedges,
+ 0,
+ reftet_1e_1vb_splitelements,
+ reftet_1e_1vb_newelstypes,
+ reftet_1e_1vb_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_1E_2VA
+int reftet_1e_2va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1e_2va_newelstypes[] =
+{
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_1e_2va_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 2, 8, 10, 9 },
+ { 5, 6, 7, 8, 9, 10 },
+ { 4, 10, 7, 3, 9, 6 },
+};
+HPRef_Struct reftet_1e_2va =
+{
+ HP_TET,
+ reftet_1e_2va_splitedges,
+ 0, 0,
+ reftet_1e_2va_newelstypes,
+ reftet_1e_2va_newels
+};
+
+
+
+
+
+
+
+// HP_TET_1E_2VB
+int reftet_1e_2vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 1, 10 },
+ { 3, 2, 11 },
+ { 3, 4, 12 },
+ { 0, 0, 0 }
+};
+int reftet_1e_2vb_splitelements[][5] =
+{
+ { 3, 4, 1, 2, 13 },
+ { 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_1e_2vb_newelstypes[] =
+{
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1e_2vb_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 5, 6, 7, 2, 8, 9 },
+ { 3, 10, 11, 12 },
+
+ { 8, 9, 12, 11, 13 },
+ { 4, 12, 9, 13 },
+ { 6, 10, 12, 7, 13 },
+ { 4, 7, 12, 13 },
+ { 6, 8, 11, 10, 13 },
+ { 4, 9, 7, 13 },
+ { 6, 7, 9, 8, 13 },
+ { 10, 11, 12, 13 },
+};
+HPRef_Struct reftet_1e_2vb =
+{
+ HP_TET,
+ reftet_1e_2vb_splitedges,
+ 0,
+ reftet_1e_2vb_splitelements,
+ reftet_1e_2vb_newelstypes,
+ reftet_1e_2vb_newels
+};
+
+
+
+
+
+
+// HP_TET_1E_2VC
+int reftet_1e_2vc_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 4, 1, 10 },
+ { 4, 2, 11 },
+ { 4, 3, 12 },
+ { 0, 0, 0 }
+};
+int reftet_1e_2vc_splitelements[][5] =
+{
+ { 4, 1, 2, 3, 13 },
+ { 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_1e_2vc_newelstypes[] =
+{
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1e_2vc_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 5, 6, 7, 2, 8, 9 },
+ { 4, 11, 10, 12 },
+ { 8, 9, 11, 12, 13 },
+ { 3, 8, 12, 13 },
+ { 7, 6, 12, 10, 13 },
+ { 3, 12, 6, 13 },
+ { 9, 7, 10, 11, 13 },
+ { 3, 6, 8, 13 },
+ { 6, 7, 9, 8, 13 },
+ { 10, 12, 11, 13 }
+};
+HPRef_Struct reftet_1e_2vc =
+{
+ HP_TET,
+ reftet_1e_2vc_splitedges,
+ 0,
+ reftet_1e_2vc_splitelements,
+ reftet_1e_2vc_newelstypes,
+ reftet_1e_2vc_newels
+};
+
+
+
+
+
+
+
+
+/*
+
+// HP_TET_1E_2VD
+int reftet_1e_2vd_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 2, 4, 8 },
+ { 3, 1, 9 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 1, 12 },
+ { 4, 2, 13 },
+ { 4, 3, 14 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1e_2vd_newelstypes[] =
+{
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_PRISM,
+ HP_HEX,
+ HP_NONE,
+};
+int reftet_1e_2vd_newels[][8] =
+{
+ { 1, 5, 6, 2, 7, 8 },
+ { 4, 13, 12, 14 },
+ { 3, 10, 11, 9 },
+ { 14, 13, 12, 11, 10, 9 },
+ { 6, 12, 13, 8, 5, 9, 10, 7 },
+};
+HPRef_Struct reftet_1e_2vd =
+{
+ HP_TET,
+ reftet_1e_2vd_splitedges,
+ 0, 0,
+ reftet_1e_2vd_newelstypes,
+ reftet_1e_2vd_newels
+};
+
+*/
+
+
+
+
+// HP_TET_1E_2VD, // 1 v on edge
+int reftet_1e_2vd_splitedges[][3] =
+{
+ // { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ // { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_1e_2vd_splitfaces[][4] =
+ {
+ { 1, 3, 4, 19 },
+ { 2, 3, 4, 22 },
+ { 3, 1, 4, 24 },
+ { 3, 2, 4, 25 },
+ { 4, 1, 3, 27 },
+ { 4, 2, 3, 28 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_1e_2vd_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_PRISM,
+ HP_HEX,
+ HP_PYRAMID,
+ HP_HEX,
+ HP_PYRAMID,
+ HP_PRISM,
+ HP_PRISM,
+ HP_NONE,
+ };
+int reftet_1e_2vd_newels[][8] =
+{
+ { 1, 6, 7, 2, 9, 10 },
+ { 3, 11, 12, 13 },
+ { 4, 16, 15, 14 },
+ { 7, 6, 19, 10, 9, 22 },
+ { 7, 19, 27, 14, 10, 22, 28, 15 },
+ { 14, 15, 28, 27, 16 },
+ { 9, 6, 19, 22, 12, 11, 24, 25 },
+ { 12, 11, 24, 25, 13 },
+ { 19, 24, 27, 22, 25, 28 },
+ { 16, 28, 27, 13, 25, 24 }
+};
+HPRef_Struct reftet_1e_2vd =
+{
+ HP_TET,
+ reftet_1e_2vd_splitedges,
+ reftet_1e_2vd_splitfaces,
+ 0,
+ reftet_1e_2vd_newelstypes,
+ reftet_1e_2vd_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_1E_3VA
+int reftet_1e_3va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_1e_3va_splitelements[][5] =
+{
+ { 1, 2, 3, 4, 14 },
+ { 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_1e_3va_newelstypes[] =
+{
+ HP_PRISM_SINGEDGE,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_PYRAMID,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1e_3va_newels[][8] =
+{
+ { 5, 6, 7, 8, 9, 10 },
+ { 1, 5, 6, 7 },
+ { 2, 8, 10, 9 },
+ { 3, 11, 12, 13 },
+
+ { 6, 7, 10, 9, 14 },
+ { 4, 10, 7, 14 },
+ { 9, 10, 13, 12, 14 },
+ { 4, 13, 10, 14 },
+ { 6, 11, 13, 7, 14 },
+ { 4, 7, 13, 14 },
+ { 6, 11, 12, 9, 14 },
+ { 11, 13, 12, 14 },
+};
+
+HPRef_Struct reftet_1e_3va =
+{
+ HP_TET,
+ reftet_1e_3va_splitedges,
+ 0,
+ reftet_1e_3va_splitelements,
+ reftet_1e_3va_newelstypes,
+ reftet_1e_3va_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_1E_3VB, // 1 v on edge
+int reftet_1e_3vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ // { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_1e_3vb_splitfaces[][4] =
+ {
+ { 1, 3, 4, 19 },
+ { 2, 3, 4, 22 },
+ { 3, 1, 4, 24 },
+ { 3, 2, 4, 25 },
+ { 4, 1, 3, 27 },
+ { 4, 2, 3, 28 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_1e_3vb_newelstypes[] =
+ {
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_PRISM,
+ HP_HEX,
+ HP_PYRAMID,
+ HP_HEX,
+ HP_PYRAMID,
+ HP_PRISM,
+ HP_PRISM,
+ HP_NONE,
+ };
+int reftet_1e_3vb_newels[][8] =
+{
+ { 1, 5, 6, 7 },
+ { 5, 6, 7, 2, 9, 10 },
+ { 3, 11, 12, 13 },
+ { 4, 16, 15, 14 },
+ { 7, 6, 19, 10, 9, 22 },
+ { 7, 19, 27, 14, 10, 22, 28, 15 },
+ { 14, 15, 28, 27, 16 },
+ { 9, 6, 19, 22, 12, 11, 24, 25 },
+ { 12, 11, 24, 25, 13 },
+ { 19, 24, 27, 22, 25, 28 },
+ { 16, 28, 27, 13, 25, 24 }
+};
+HPRef_Struct reftet_1e_3vb =
+{
+ HP_TET,
+ reftet_1e_3vb_splitedges,
+ reftet_1e_3vb_splitfaces,
+ 0,
+ reftet_1e_3vb_newelstypes,
+ reftet_1e_3vb_newels
+};
+
+
+
+
+
+
+
+
+
+// HP_TET_1E_4V
+int reftet_1e_4v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_1e_4v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 1, 2, 4, 18 },
+ { 1, 3, 4, 19 },
+
+ { 2, 1, 3, 20 },
+ { 2, 1, 4, 21 },
+ { 2, 3, 4, 22 },
+
+ { 3, 1, 2, 23 },
+ { 3, 1, 4, 24 },
+ { 3, 2, 4, 25 },
+
+ { 4, 1, 2, 26 },
+ { 4, 1, 3, 27 },
+ { 4, 2, 3, 28 },
+ { 0, 0, 0, 0 },
+ };
+int reftet_1e_4v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 29 },
+ { 2, 3, 4, 1, 30 },
+ { 3, 4, 1, 2, 31 },
+ { 4, 1, 2, 3, 32 },
+ { 0 },
+ };
+HPREF_ELEMENT_TYPE reftet_1e_4v_newelstypes[] =
+{
+ HP_HEX_1E_1V,
+ HP_HEX_1E_1V,
+ HP_HEX_0E_1V,
+ HP_HEX_0E_1V,
+ HP_PRISM_SINGEDGE, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM, HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1e_4v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7, 18, 29, 19 },
+ // { 2, 9, 20, 8, 10, 22, 30, 21 },
+ { 2, 8, 21, 10, 9, 20, 30, 22 },
+ { 3, 11, 23, 12, 13, 24, 31, 25 },
+ { 4, 15, 26, 14, 16, 28, 32, 27 },
+ { 5, 17, 18, 8, 20, 21 },
+ { 18, 17, 29, 21, 20, 30 },
+ { 6, 19, 17, 11, 24, 23 },
+ { 17, 19, 29, 23, 24, 31 },
+ { 7, 18, 19, 14, 26, 27 },
+ { 19, 18, 29, 27, 26, 32 },
+ { 9, 20, 22, 12, 23, 25 },
+ { 22, 20, 30, 25, 23, 31 },
+ { 10, 22, 21, 15, 28, 26 },
+ { 21, 22, 30, 26, 28, 32 },
+ { 13, 24, 25, 16, 27, 28 },
+ { 25, 24, 31, 28, 27, 32 },
+ /*
+ { 5, 17, 29, 18, 8, 20, 30, 21 },
+ { 6, 19, 29, 17, 11, 24, 31, 23 },
+ { 7, 18, 29, 19, 14, 26, 32, 27 },
+ { 9, 20, 30, 22, 12, 23, 31, 25 },
+ { 10, 22, 30, 21, 15, 28, 32, 26 },
+ { 13, 24, 31, 25, 16, 27, 32, 28 },
+ */
+ { 17, 20, 23, 29, 30, 31 },
+ { 18, 26, 21, 29, 32, 30 },
+ { 19, 24, 27, 29, 31, 32 },
+ { 22, 28, 25, 30, 32, 31 },
+
+ { 29, 30, 31, 32 },
+};
+HPRef_Struct reftet_1e_4v =
+{
+ HP_TET,
+ reftet_1e_4v_splitedges,
+ reftet_1e_4v_splitfaces,
+ reftet_1e_4v_splitelements,
+ reftet_1e_4v_newelstypes,
+ reftet_1e_4v_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_2EA_0V, // 2 edges connected
+int reftet_2ea_0v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_0v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_0v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_2ea_0v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 5, 17, 7, 2, 9, 10 },
+ { 6, 7, 17, 3, 13, 12 },
+ { 17, 9, 12, 7, 10, 13 },
+ { 7, 10, 13, 4 },
+};
+HPRef_Struct reftet_2ea_0v =
+{
+ HP_TET,
+ reftet_2ea_0v_splitedges,
+ reftet_2ea_0v_splitfaces,
+ 0,
+ reftet_2ea_0v_newelstypes,
+ reftet_2ea_0v_newels
+};
+
+
+
+
+
+
+// HP_TET_2EA_1VA, // 2 edges connected
+int reftet_2ea_1va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_1va_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_1va_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PRISM_SINGEDGE,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_2ea_1va_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 5, 17, 7, 8, 9, 10 },
+ { 2, 8, 10, 9 },
+ { 6, 7, 17, 3, 13, 12 },
+ { 17, 9, 12, 7, 10, 13 },
+ { 7, 10, 13, 4 },
+};
+HPRef_Struct reftet_2ea_1va =
+{
+ HP_TET,
+ reftet_2ea_1va_splitedges,
+ reftet_2ea_1va_splitfaces,
+ 0,
+ reftet_2ea_1va_newelstypes,
+ reftet_2ea_1va_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_2EA_1VB,
+int reftet_2ea_1vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_1vb_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_1vb_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_2ea_1vb_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 3, 11, 12, 13 },
+ { 5, 17, 7, 2, 9, 10 },
+ { 6, 7, 17, 11, 13, 12 },
+ { 17, 9, 12, 7, 10, 13 },
+ { 7, 10, 13, 4 },
+};
+HPRef_Struct reftet_2ea_1vb =
+{
+ HP_TET,
+ reftet_2ea_1vb_splitedges,
+ reftet_2ea_1vb_splitfaces,
+ 0,
+ reftet_2ea_1vb_newelstypes,
+ reftet_2ea_1vb_newels
+};
+
+
+
+
+
+
+// HP_TET_2EA_1VC, // 2 edges connected
+int reftet_2ea_1vc_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ // { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_1vc_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 3, 4, 18 },
+ { 3, 4, 2, 19 },
+ { 4, 2, 3, 20 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_2ea_1vc_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 21 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_1vc_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ // HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_TET, HP_TET, HP_TET, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_PYRAMID,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ // HP_PRISM,
+ // HP_PRISM,
+ HP_NONE,
+ };
+int reftet_2ea_1vc_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ // { 3, 11, 12, 13 },
+ { 4, 15, 14, 16 },
+ { 5, 17, 7, 2, 9, 10 },
+ { 6, 7, 17, 3, 13, 12 },
+
+ { 9, 10, 18, 21 },
+ { 13, 12, 19, 21 },
+ { 15, 16, 20, 21 },
+ { 18, 20, 19, 21 },
+ { 10, 15, 20, 18, 21 },
+ { 13, 19, 20, 16, 21 },
+ { 9, 18, 19, 12, 21 },
+
+ { 7, 13, 16, 14, 21 },
+ { 7, 14, 15, 10, 21 },
+ { 9, 12, 17, 21 },
+ { 7, 10, 9, 17, 21 },
+ { 7, 17, 12, 13, 21 },
+ { 14, 16, 15, 21 },
+ // { 17, 9, 12, 7, 10, 13 },
+ // { 7, 10, 13, 14, 15, 16 },
+};
+HPRef_Struct reftet_2ea_1vc =
+{
+ HP_TET,
+ reftet_2ea_1vc_splitedges,
+ reftet_2ea_1vc_splitfaces,
+ reftet_2ea_1vc_splitelements,
+ reftet_2ea_1vc_newelstypes,
+ reftet_2ea_1vc_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_2EA_2VA,
+int reftet_2ea_2va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_2va_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_2va_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_2ea_2va_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 3, 11, 12, 13 },
+ { 2, 8, 10, 9 },
+ { 5, 17, 7, 8, 9, 10 },
+ { 6, 7, 17, 11, 13, 12 },
+ { 17, 9, 12, 7, 10, 13 },
+ { 7, 10, 13, 4 },
+};
+HPRef_Struct reftet_2ea_2va =
+{
+ HP_TET,
+ reftet_2ea_2va_splitedges,
+ reftet_2ea_2va_splitfaces,
+ 0,
+ reftet_2ea_2va_newelstypes,
+ reftet_2ea_2va_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_2EA_2VB, // 2 edges connected
+int reftet_2ea_2vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ // { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_2vb_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 3, 4, 18 },
+ { 3, 4, 2, 19 },
+ { 4, 2, 3, 20 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_2ea_2vb_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 21 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_2vb_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_TET, HP_TET, HP_TET, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_PYRAMID,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ // HP_PRISM,
+ // HP_PRISM,
+ HP_NONE,
+ };
+int reftet_2ea_2vb_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 2, 8, 10, 9 },
+ // { 3, 11, 12, 13 },
+ { 4, 15, 14, 16 },
+ { 5, 17, 7, 8, 9, 10 },
+ { 6, 7, 17, 3, 13, 12 },
+
+ { 9, 10, 18, 21 },
+ { 13, 12, 19, 21 },
+ { 15, 16, 20, 21 },
+ { 18, 20, 19, 21 },
+ { 10, 15, 20, 18, 21 },
+ { 13, 19, 20, 16, 21 },
+ { 9, 18, 19, 12, 21 },
+
+ { 7, 13, 16, 14, 21 },
+ { 7, 14, 15, 10, 21 },
+ { 9, 12, 17, 21 },
+ { 7, 10, 9, 17, 21 },
+ { 7, 17, 12, 13, 21 },
+ { 14, 16, 15, 21 },
+ // { 17, 9, 12, 7, 10, 13 },
+ // { 7, 10, 13, 14, 15, 16 },
+};
+HPRef_Struct reftet_2ea_2vb =
+{
+ HP_TET,
+ reftet_2ea_2vb_splitedges,
+ reftet_2ea_2vb_splitfaces,
+ reftet_2ea_2vb_splitelements,
+ reftet_2ea_2vb_newelstypes,
+ reftet_2ea_2vb_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_TET_2EA_2VC, // 2 edges connected
+int reftet_2ea_2vc_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ // { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_2vc_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 3, 4, 18 },
+ { 3, 4, 2, 19 },
+ { 4, 2, 3, 20 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_2ea_2vc_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 21 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_2vc_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_TET, HP_TET, HP_TET, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_PYRAMID,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ // HP_PRISM,
+ // HP_PRISM,
+ HP_NONE,
+ };
+int reftet_2ea_2vc_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ // { 2, 8, 10, 9 },
+ { 3, 11, 12, 13 },
+ { 4, 15, 14, 16 },
+ { 5, 17, 7, 2, 9, 10 },
+ { 6, 7, 17, 11, 13, 12 },
+
+ { 9, 10, 18, 21 },
+ { 13, 12, 19, 21 },
+ { 15, 16, 20, 21 },
+ { 18, 20, 19, 21 },
+ { 10, 15, 20, 18, 21 },
+ { 13, 19, 20, 16, 21 },
+ { 9, 18, 19, 12, 21 },
+
+ { 7, 13, 16, 14, 21 },
+ { 7, 14, 15, 10, 21 },
+ { 9, 12, 17, 21 },
+ { 7, 10, 9, 17, 21 },
+ { 7, 17, 12, 13, 21 },
+ { 14, 16, 15, 21 },
+ // { 17, 9, 12, 7, 10, 13 },
+ // { 7, 10, 13, 14, 15, 16 },
+};
+HPRef_Struct reftet_2ea_2vc =
+{
+ HP_TET,
+ reftet_2ea_2vc_splitedges,
+ reftet_2ea_2vc_splitfaces,
+ reftet_2ea_2vc_splitelements,
+ reftet_2ea_2vc_newelstypes,
+ reftet_2ea_2vc_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_2EA_3V, // 2 edges connected
+int reftet_2ea_3v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_2ea_3v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 3, 4, 18 },
+ { 3, 4, 2, 19 },
+ { 4, 2, 3, 20 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_2ea_3v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 21 },
+ { 0, 0, 0, 0 }
+ };
+HPREF_ELEMENT_TYPE reftet_2ea_3v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_TET, HP_TET, HP_TET, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_PYRAMID,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ HP_PYRAMID, HP_PYRAMID, HP_TET,
+ // HP_PRISM,
+ // HP_PRISM,
+ HP_NONE,
+ };
+int reftet_2ea_3v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 2, 8, 10, 9 },
+ { 3, 11, 12, 13 },
+ { 4, 15, 14, 16 },
+ { 5, 17, 7, 8, 9, 10 },
+ { 6, 7, 17, 11, 13, 12 },
+
+ { 9, 10, 18, 21 },
+ { 13, 12, 19, 21 },
+ { 15, 16, 20, 21 },
+ { 18, 20, 19, 21 },
+ { 10, 15, 20, 18, 21 },
+ { 13, 19, 20, 16, 21 },
+ { 9, 18, 19, 12, 21 },
+
+ { 7, 13, 16, 14, 21 },
+ { 7, 14, 15, 10, 21 },
+ { 9, 12, 17, 21 },
+ { 7, 10, 9, 17, 21 },
+ { 7, 17, 12, 13, 21 },
+ { 14, 16, 15, 21 },
+ // { 17, 9, 12, 7, 10, 13 },
+ // { 7, 10, 13, 14, 15, 16 },
+};
+HPRef_Struct reftet_2ea_3v =
+{
+ HP_TET,
+ reftet_2ea_3v_splitedges,
+ reftet_2ea_3v_splitfaces,
+ reftet_2ea_3v_splitelements,
+ reftet_2ea_3v_newelstypes,
+ reftet_2ea_3v_newels
+};
+
+
+
+
+
+
+
+// HP_TET_2EB_0V, // 2 opposite edges
+int reftet_2eb_0v_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 2, 4, 8 },
+ { 3, 1, 9 },
+ { 3, 2, 10 },
+ { 4, 1, 11 },
+ { 4, 2, 12 },
+ { 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_2eb_0v_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_HEX,
+ HP_NONE,
+ };
+int reftet_2eb_0v_newels[][8] =
+{
+ { 1, 5, 6, 2, 7, 8 },
+ { 3, 9, 10, 4, 11, 12 },
+ { 6, 11, 12, 8, 5, 9, 10, 7 },
+};
+HPRef_Struct reftet_2eb_0v =
+{
+ HP_TET,
+ reftet_2eb_0v_splitedges,
+ 0, 0,
+ reftet_2eb_0v_newelstypes,
+ reftet_2eb_0v_newels
+};
+
+
+
+
+
+
+
+// HP_TET_2EB_2VA, // 2 opposite edges
+int reftet_2eb_2va_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_2eb_2va_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_HEX,
+ HP_NONE,
+ };
+int reftet_2eb_2va_newels[][8] =
+{
+ { 5, 6, 7, 2, 9, 10 },
+ { 4, 15, 14, 13, 12, 11 },
+ { 1, 5, 6, 7 },
+ // { 2, 8, 10, 9 },
+ { 3, 13, 11, 12 },
+ // { 4, 16, 15, 14 },
+ { 7, 14, 15, 10, 6, 11, 12, 9 }
+};
+HPRef_Struct reftet_2eb_2va =
+{
+ HP_TET,
+ reftet_2eb_2va_splitedges,
+ 0, 0,
+ reftet_2eb_2va_newelstypes,
+ reftet_2eb_2va_newels
+};
+
+
+
+
+
+
+// HP_TET_2EB_4V, // 2 opposite edges
+int reftet_2eb_4v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftet_2eb_4v_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_HEX,
+ HP_NONE,
+ };
+int reftet_2eb_4v_newels[][8] =
+{
+ { 5, 6, 7, 8, 9, 10 },
+ { 16, 15, 14, 13, 12, 11 },
+ { 1, 5, 6, 7 },
+ { 2, 8, 10, 9 },
+ { 3, 13, 11, 12 },
+ { 4, 16, 15, 14 },
+ { 7, 14, 15, 10, 6, 11, 12, 9 }
+};
+HPRef_Struct reftet_2eb_4v =
+{
+ HP_TET,
+ reftet_2eb_4v_splitedges,
+ 0, 0,
+ reftet_2eb_4v_newelstypes,
+ reftet_2eb_4v_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_3EA_0V,
+int reftet_3ea_0v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 2, 12 },
+ { 4, 3, 13 },
+ { 0, 0, 0 }
+};
+int reftet_3ea_0v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 14 },
+ { 1, 2, 4, 15 },
+ { 1, 3, 4, 16 },
+ { 2, 3, 4, 17 },
+ { 3, 4, 2, 18 },
+ { 4, 2, 3, 19 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ea_0v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ea_0v_newelstypes[] =
+ {
+ HP_HEX_3E_0V,
+ HP_HEX_1E_0V,
+ HP_HEX_1E_0V,
+ HP_HEX_1E_0V,
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_3ea_0v_newels[][8] =
+{
+ { 1, 5, 14, 6, 7, 15, 20, 16 },
+ { 5, 2, 8, 14, 15, 9, 17, 20 },
+ { 3, 6, 14, 10, 11, 16, 20, 18 },
+ { 7, 4, 12, 15, 16, 13, 19, 20 },
+ { 11, 13, 16, 18, 19, 20 },
+ { 15, 12, 9, 20, 19, 17 },
+ { 8, 10, 14, 17, 18, 20 },
+ { 20, 17, 18, 19 },
+};
+HPRef_Struct reftet_3ea_0v =
+{
+ HP_TET,
+ reftet_3ea_0v_splitedges,
+ reftet_3ea_0v_splitfaces,
+ reftet_3ea_0v_splitelements,
+ reftet_3ea_0v_newelstypes,
+ reftet_3ea_0v_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_TET_3EA_1V,
+int reftet_3ea_1v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 2, 12 },
+ { 4, 3, 13 },
+ { 2, 1, 21 },
+ { 3, 1, 22 },
+ { 4, 1, 23 },
+ { 0, 0, 0 }
+};
+int reftet_3ea_1v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 14 },
+ { 1, 2, 4, 15 },
+ { 1, 3, 4, 16 },
+ { 2, 3, 4, 17 },
+ { 3, 4, 2, 18 },
+ { 4, 2, 3, 19 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ea_1v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ea_1v_newelstypes[] =
+ {
+ HP_HEX_3E_0V,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_3ea_1v_newels[][8] =
+{
+ { 1, 5, 14, 6, 7, 15, 20, 16 },
+
+ { 2, 21, 9, 8 },
+ { 5, 14, 15, 21, 8, 9 },
+ { 15, 14, 20, 9, 8, 17 },
+ // { 3, 22, 10, 11 },
+ // { 6, 16, 14, 22, 11, 10 },
+ { 6, 16, 14, 3, 11, 10 },
+ { 14, 16, 20, 10, 11, 18 },
+ // { 4, 23, 13, 12 },
+ // { 7, 15, 16, 23, 12, 13 },
+ { 7, 15, 16, 4, 12, 13 },
+ { 16, 15, 20, 13, 12, 19 },
+
+ { 11, 13, 16, 18, 19, 20 },
+ { 15, 12, 9, 20, 19, 17 },
+ { 8, 10, 14, 17, 18, 20 },
+ { 20, 17, 18, 19 },
+};
+HPRef_Struct reftet_3ea_1v =
+{
+ HP_TET,
+ reftet_3ea_1v_splitedges,
+ reftet_3ea_1v_splitfaces,
+ reftet_3ea_1v_splitelements,
+ reftet_3ea_1v_newelstypes,
+ reftet_3ea_1v_newels
+};
+
+
+
+
+
+
+
+
+
+
+// HP_TET_3EA_2V,
+int reftet_3ea_2v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 2, 12 },
+ { 4, 3, 13 },
+ { 2, 1, 21 },
+ { 3, 1, 22 },
+ { 4, 1, 23 },
+ { 0, 0, 0 }
+};
+int reftet_3ea_2v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 14 },
+ { 1, 2, 4, 15 },
+ { 1, 3, 4, 16 },
+ { 2, 3, 4, 17 },
+ { 3, 4, 2, 18 },
+ { 4, 2, 3, 19 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ea_2v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ea_2v_newelstypes[] =
+ {
+ HP_HEX_3E_0V,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_3ea_2v_newels[][8] =
+{
+ { 1, 5, 14, 6, 7, 15, 20, 16 },
+
+ { 2, 21, 9, 8 },
+ { 5, 14, 15, 21, 8, 9 },
+ { 15, 14, 20, 9, 8, 17 },
+ { 3, 22, 10, 11 },
+ { 6, 16, 14, 22, 11, 10 },
+ { 14, 16, 20, 10, 11, 18 },
+ // { 4, 23, 13, 12 },
+ { 7, 15, 16, 4, 12, 13 },
+ { 16, 15, 20, 13, 12, 19 },
+
+ { 11, 13, 16, 18, 19, 20 },
+ { 15, 12, 9, 20, 19, 17 },
+ { 8, 10, 14, 17, 18, 20 },
+ { 20, 17, 18, 19 },
+};
+HPRef_Struct reftet_3ea_2v =
+{
+ HP_TET,
+ reftet_3ea_2v_splitedges,
+ reftet_3ea_2v_splitfaces,
+ reftet_3ea_2v_splitelements,
+ reftet_3ea_2v_newelstypes,
+ reftet_3ea_2v_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_3EA_3V,
+int reftet_3ea_3v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 2, 10 },
+ { 3, 4, 11 },
+ { 4, 2, 12 },
+ { 4, 3, 13 },
+ { 2, 1, 21 },
+ { 3, 1, 22 },
+ { 4, 1, 23 },
+ { 0, 0, 0 }
+};
+int reftet_3ea_3v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 14 },
+ { 1, 2, 4, 15 },
+ { 1, 3, 4, 16 },
+ { 2, 3, 4, 17 },
+ { 3, 4, 2, 18 },
+ { 4, 2, 3, 19 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ea_3v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ea_3v_newelstypes[] =
+ {
+ HP_HEX_3E_0V,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+
+ HP_PRISM,
+ HP_PRISM,
+ HP_PRISM,
+ HP_TET,
+ HP_NONE,
+ };
+int reftet_3ea_3v_newels[][8] =
+{
+ { 1, 5, 14, 6, 7, 15, 20, 16 },
+
+ { 2, 21, 9, 8 },
+ { 5, 14, 15, 21, 8, 9 },
+ { 15, 14, 20, 9, 8, 17 },
+ { 3, 22, 10, 11 },
+ { 6, 16, 14, 22, 11, 10 },
+ { 14, 16, 20, 10, 11, 18 },
+ { 4, 23, 13, 12 },
+ { 7, 15, 16, 23, 12, 13 },
+ { 16, 15, 20, 13, 12, 19 },
+
+ { 11, 13, 16, 18, 19, 20 },
+ { 15, 12, 9, 20, 19, 17 },
+ { 8, 10, 14, 17, 18, 20 },
+ { 20, 17, 18, 19 },
+};
+HPRef_Struct reftet_3ea_3v =
+{
+ HP_TET,
+ reftet_3ea_3v_splitedges,
+ reftet_3ea_3v_splitfaces,
+ reftet_3ea_3v_splitelements,
+ reftet_3ea_3v_newelstypes,
+ reftet_3ea_3v_newels
+};
+
+
+
+
+
+
+
+// HP_TET_3EV_0V,
+int reftet_3eb_0v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ // { 3, 2, 12 },
+ { 3, 4, 13 },
+ // { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3eb_0v_splitfaces[][4] =
+ {
+ { 1, 2, 4, 17 },
+ { 2, 1, 3, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3eb_0v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3eb_0v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ // HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3eb_0v_newels[][8] =
+{
+ { 1, 7, 17, 5, 6 },
+ { 2, 9, 18, 8, 10 },
+ // { 3, 12, 13, 11 },
+ // { 4, 14, 16, 15 },
+ { 5, 6, 17, 8, 18, 10 },
+ { 7, 17, 6, 4, 15, 16 },
+ { 9, 18, 10, 3, 11, 13 },
+
+ { 10, 15, 16, 13, 20 },
+ { 6, 11, 13, 16, 20 },
+ { 10, 17, 15, 20 },
+ { 6, 18, 11, 20 },
+ { 6, 17, 10, 18, 20 },
+ { 6, 16, 15, 17, 20 },
+ { 18, 10, 13, 11, 20 },
+};
+HPRef_Struct reftet_3eb_0v =
+{
+ HP_TET,
+ reftet_3eb_0v_splitedges,
+ reftet_3eb_0v_splitfaces,
+ reftet_3eb_0v_splitelements,
+ reftet_3eb_0v_newelstypes,
+ reftet_3eb_0v_newels
+};
+
+
+
+
+
+
+
+
+
+// HP_TET_3EV_1V,
+int reftet_3eb_1v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ // { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3eb_1v_splitfaces[][4] =
+ {
+ { 1, 2, 4, 17 },
+ { 2, 1, 3, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3eb_1v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3eb_1v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3eb_1v_newels[][8] =
+{
+ { 1, 7, 17, 5, 6 },
+ { 2, 9, 18, 8, 10 },
+ { 3, 12, 13, 11 },
+ // { 4, 14, 16, 15 },
+ { 5, 6, 17, 8, 18, 10 },
+ { 7, 17, 6, 4, 15, 16 },
+ { 9, 18, 10, 12, 11, 13 },
+
+ { 10, 15, 16, 13, 20 },
+ { 6, 11, 13, 16, 20 },
+ { 10, 17, 15, 20 },
+ { 6, 18, 11, 20 },
+ { 6, 17, 10, 18, 20 },
+ { 6, 16, 15, 17, 20 },
+ { 18, 10, 13, 11, 20 },
+};
+HPRef_Struct reftet_3eb_1v =
+{
+ HP_TET,
+ reftet_3eb_1v_splitedges,
+ reftet_3eb_1v_splitfaces,
+ reftet_3eb_1v_splitelements,
+ reftet_3eb_1v_newelstypes,
+ reftet_3eb_1v_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_3EV_2V,
+int reftet_3eb_2v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3eb_2v_splitfaces[][4] =
+ {
+ { 1, 2, 4, 17 },
+ { 2, 1, 3, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3eb_2v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3eb_2v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3eb_2v_newels[][8] =
+{
+ { 1, 7, 17, 5, 6 },
+ { 2, 9, 18, 8, 10 },
+ { 3, 12, 13, 11 },
+ { 4, 14, 16, 15 },
+ { 5, 6, 17, 8, 18, 10 },
+ { 7, 17, 6, 14, 15, 16 },
+ { 9, 18, 10, 12, 11, 13 },
+
+ { 10, 15, 16, 13, 20 },
+ { 6, 11, 13, 16, 20 },
+ { 10, 17, 15, 20 },
+ { 6, 18, 11, 20 },
+ { 6, 17, 10, 18, 20 },
+ { 6, 16, 15, 17, 20 },
+ { 18, 10, 13, 11, 20 },
+};
+HPRef_Struct reftet_3eb_2v =
+{
+ HP_TET,
+ reftet_3eb_2v_splitedges,
+ reftet_3eb_2v_splitfaces,
+ reftet_3eb_2v_splitelements,
+ reftet_3eb_2v_newelstypes,
+ reftet_3eb_2v_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TET_3EC_0V,
+int reftet_3ec_0v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ // { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ // { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3ec_0v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 1, 4, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ec_0v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ec_0v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ // HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3ec_0v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 2, 8, 18, 10, 9 },
+ // { 3, 11, 12, 13 },
+ // { 4, 15, 14, 16 },
+ { 5, 17, 7, 8, 9, 18 },
+ { 6, 7, 17, 3, 13, 12 },
+ { 10, 9, 18, 4, 16, 14 },
+
+ { 9, 16, 13, 12, 20 },
+ { 7, 13, 16, 14, 20 },
+ { 7, 14, 18, 20 },
+ { 9, 12, 17, 20 },
+ { 17, 7, 18, 9, 20 },
+ { 7, 17, 12, 13, 20 },
+ { 9, 18, 14, 16, 20 },
+};
+HPRef_Struct reftet_3ec_0v =
+{
+ HP_TET,
+ reftet_3ec_0v_splitedges,
+ reftet_3ec_0v_splitfaces,
+ reftet_3ec_0v_splitelements,
+ reftet_3ec_0v_newelstypes,
+ reftet_3ec_0v_newels
+};
+
+
+
+
+
+
+
+
+
+// HP_TET_3EC_1V,
+int reftet_3ec_1v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ // { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3ec_1v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 1, 4, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ec_1v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ec_1v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ // HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3ec_1v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 2, 8, 18, 10, 9 },
+ { 3, 11, 12, 13 },
+ // { 4, 15, 14, 16 },
+ { 5, 17, 7, 8, 9, 18 },
+ { 6, 7, 17, 11, 13, 12 },
+ { 10, 9, 18, 4, 16, 14 },
+
+ { 9, 16, 13, 12, 20 },
+ { 7, 13, 16, 14, 20 },
+ { 7, 14, 18, 20 },
+ { 9, 12, 17, 20 },
+ { 17, 7, 18, 9, 20 },
+ { 7, 17, 12, 13, 20 },
+ { 9, 18, 14, 16, 20 },
+};
+HPRef_Struct reftet_3ec_1v =
+{
+ HP_TET,
+ reftet_3ec_1v_splitedges,
+ reftet_3ec_1v_splitfaces,
+ reftet_3ec_1v_splitelements,
+ reftet_3ec_1v_newelstypes,
+ reftet_3ec_1v_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_3EC_2V,
+int reftet_3ec_2v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 2, 3, 9 },
+ { 2, 4, 10 },
+ { 3, 1, 11 },
+ { 3, 2, 12 },
+ { 3, 4, 13 },
+ { 4, 1, 14 },
+ { 4, 2, 15 },
+ { 4, 3, 16 },
+ { 0, 0, 0 }
+};
+int reftet_3ec_2v_splitfaces[][4] =
+ {
+ { 1, 2, 3, 17 },
+ { 2, 1, 4, 18 },
+ { 0, 0, 0, 0 }
+ };
+int reftet_3ec_2v_splitelements[][5] =
+ {
+ { 1, 2, 3, 4, 20 },
+ { 0 },
+ };
+
+HPREF_ELEMENT_TYPE reftet_3ec_2v_newelstypes[] =
+ {
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_EDGES,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE,
+
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_TET,
+ HP_TET,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_PYRAMID,
+ HP_NONE,
+ };
+int reftet_3ec_2v_newels[][8] =
+{
+ { 1, 5, 17, 6, 7 },
+ { 2, 8, 18, 10, 9 },
+ { 3, 11, 12, 13 },
+ { 4, 15, 14, 16 },
+ { 5, 17, 7, 8, 9, 18 },
+ { 6, 7, 17, 11, 13, 12 },
+ { 10, 9, 18, 15, 16, 14 },
+
+ { 9, 16, 13, 12, 20 },
+ { 7, 13, 16, 14, 20 },
+ { 7, 14, 18, 20 },
+ { 9, 12, 17, 20 },
+ { 17, 7, 18, 9, 20 },
+ { 7, 17, 12, 13, 20 },
+ { 9, 18, 14, 16, 20 },
+};
+HPRef_Struct reftet_3ec_2v =
+{
+ HP_TET,
+ reftet_3ec_2v_splitedges,
+ reftet_3ec_2v_splitfaces,
+ reftet_3ec_2v_splitelements,
+ reftet_3ec_2v_newelstypes,
+ reftet_3ec_2v_newels
+};
+
+
+
+
+
+
+
+
+
+
+/* ************************ 1 singular face ******************** */
+
+
+// HP_TET_1F_0E_0V
+int reftet_1f_0e_0v_splitedges[][3] =
+{
+ { 2, 1, 5 },
+ { 3, 1, 6 },
+ { 4, 1, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1f_0e_0v_newelstypes[] =
+{
+ HP_PRISM_1FA_0E_0V,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1f_0e_0v_newels[][8] =
+{
+ { 3, 2, 4, 6, 5, 7 },
+ { 5, 7, 6, 1 }
+};
+HPRef_Struct reftet_1f_0e_0v =
+{
+ HP_TET,
+ reftet_1f_0e_0v_splitedges,
+ 0, 0,
+ reftet_1f_0e_0v_newelstypes,
+ reftet_1f_0e_0v_newels
+};
+
+
+
+
+
+// HP_TET_1F_0E_1VA ... singular vertex in face
+int reftet_1f_0e_1va_splitedges[][3] =
+{
+ { 2, 1, 5 },
+ { 2, 3, 6 },
+ { 2, 4, 7 },
+ { 3, 1, 8 },
+ { 4, 1, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1f_0e_1va_newelstypes[] =
+{
+ HP_HEX_1F_0E_0V,
+ HP_TET_1F_0E_1VA,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1f_0e_1va_newels[][8] =
+{
+ { 3, 6, 7, 4, 8, 5, 5, 9 },
+ { 5, 2, 6, 7 },
+ { 5, 9, 8, 1 },
+};
+HPRef_Struct reftet_1f_0e_1va =
+{
+ HP_TET,
+ reftet_1f_0e_1va_splitedges,
+ 0, 0,
+ reftet_1f_0e_1va_newelstypes,
+ reftet_1f_0e_1va_newels
+};
+
+
+
+
+
+// HP_TET_1F_0E_1VB ... singular vertex not in face
+int reftet_1f_0e_1vb_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 1, 8 },
+ { 3, 1, 9 },
+ { 4, 1, 10 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftet_1f_0e_1vb_newelstypes[] =
+{
+ HP_PRISM_1FA_0E_0V,
+ HP_PRISM,
+ HP_TET_0E_1V,
+ HP_NONE,
+};
+int reftet_1f_0e_1vb_newels[][8] =
+{
+ { 2, 4, 3, 8, 10, 9 },
+ { 8, 10, 9, 5, 7, 6 },
+ { 1, 5, 6, 7 },
+};
+HPRef_Struct reftet_1f_0e_1vb =
+{
+ HP_TET,
+ reftet_1f_0e_1vb_splitedges,
+ 0, 0,
+ reftet_1f_0e_1vb_newelstypes,
+ reftet_1f_0e_1vb_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_1F_1EA_0V ... sing edge is 1..2
+int reftet_1f_1ea_0v_splitedges[][3] =
+{
+ { 1, 3, 5 },
+ { 1, 4, 6 },
+ { 2, 1, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 1, 10 },
+ { 4, 1, 11 },
+ { 0, 0, 0 }
+};
+
+int reftet_1f_1ea_0v_splitfaces[][4] =
+ {
+ { 2, 1, 3, 12 },
+ { 2, 1, 4, 13 },
+ { 0, 0, 0, 0 }
+ };
+
+
+HPREF_ELEMENT_TYPE reftet_1f_1ea_0v_newelstypes[] =
+{
+ HP_HEX_1F_0E_0V,
+ // HP_PRISM,
+ HP_PYRAMID_1FB_0E_1VA,
+ HP_TET_1E_1VA,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_NONE,
+};
+int reftet_1f_1ea_0v_newels[][8] =
+{
+ { 3, 8, 9, 4, 10, 12, 13, 11 },
+ // { 2, 9, 8, 7, 13, 12 },
+ { 8, 9, 13, 12, 2 },
+ { 2, 7, 13, 12 },
+ { 7, 13, 12, 1, 6, 5 },
+ { 6, 11, 13, 5, 10, 12 }
+};
+HPRef_Struct reftet_1f_1ea_0v =
+{
+ HP_TET,
+ reftet_1f_1ea_0v_splitedges,
+ reftet_1f_1ea_0v_splitfaces,
+ 0,
+ reftet_1f_1ea_0v_newelstypes,
+ reftet_1f_1ea_0v_newels
+};
+
+
+
+
+
+
+
+
+// HP_TET_1F_1EB_0V singular edge in face, edge is 2-3
+int reftet_1f_1eb_0v_splitedges[][3] =
+{
+ { 2, 1, 5 },
+ { 2, 4, 6 },
+ { 3, 1, 7 },
+ { 3, 4, 8 },
+ { 4, 1, 9 },
+ { 0, 0, 0 }
+};
+
+
+HPREF_ELEMENT_TYPE reftet_1f_1eb_0v_newelstypes[] =
+{
+ HP_PRISM_1FB_1EA_0V,
+ HP_PRISM_1FA_0E_0V,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_1f_1eb_0v_newels[][8] =
+{
+ // { 2, 5, 6, 3, 7, 8 },
+ { 3, 8, 7, 2, 6, 5 },
+ { 6, 4, 8, 5, 9, 7 },
+ { 5, 9, 7, 1}
+};
+HPRef_Struct reftet_1f_1eb_0v =
+{
+ HP_TET,
+ reftet_1f_1eb_0v_splitedges,
+ 0, 0,
+ reftet_1f_1eb_0v_newelstypes,
+ reftet_1f_1eb_0v_newels
+};
+
+
+
+
+
+
+
+
+
+
+/* ************************ 2 singular faces ******************** */
+
+
+// HP_TET_2F_0E_0V
+int reftet_2f_0e_0v_splitedges[][3] =
+{
+ { 1, 2, 5 },
+ { 2, 1, 6 },
+ { 3, 1, 7 },
+ { 3, 2, 8 },
+ { 4, 1, 9 },
+ { 4, 2, 10 },
+ { 0, 0, 0 }
+};
+
+int reftet_2f_0e_0v_splitfaces[][4] =
+ {
+ { 3, 1, 2, 11 },
+ { 4, 1, 2, 12 },
+ { 0, 0, 0, 0 }
+ };
+
+
+HPREF_ELEMENT_TYPE reftet_2f_0e_0v_newelstypes[] =
+{
+ HP_PRISM_1FA_0E_0V,
+ HP_PRISM_1FA_0E_0V,
+ HP_PRISM_1FB_1EA_0V,
+ HP_PRISM_1FB_1EA_0V,
+ HP_TET,
+ HP_NONE,
+};
+int reftet_2f_0e_0v_newels[][8] =
+{
+ { 2, 10, 8, 6, 12, 11 },
+ { 1, 7, 9, 5, 11, 12 },
+ // { 3, 11, 8, 4, 12, 10 },
+ { 4, 10, 12, 3, 8, 11 },
+ { 3, 7, 11, 4, 9, 12 },
+ { 5, 6, 11, 12 }
+};
+HPRef_Struct reftet_2f_0e_0v =
+{
+ HP_TET,
+ reftet_2f_0e_0v_splitedges,
+ reftet_2f_0e_0v_splitfaces,
+ 0,
+ reftet_2f_0e_0v_newelstypes,
+ reftet_2f_0e_0v_newels
+};
+
+
diff --git a/Netgen/libsrc/meshing/hpref_trig.hpp b/Netgen/libsrc/meshing/hpref_trig.hpp
new file mode 100644
index 0000000000..6e2ede0eb0
--- /dev/null
+++ b/Netgen/libsrc/meshing/hpref_trig.hpp
@@ -0,0 +1,750 @@
+
+
+
+
+
+// HP_TRIG
+int reftrig_splitedges[][3] =
+{
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_newelstypes[] =
+{
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_newels[][8] =
+{
+ { 1, 2, 3 },
+};
+HPRef_Struct reftrig =
+{
+ HP_TRIG,
+ reftrig_splitedges,
+ 0, 0,
+ reftrig_newelstypes,
+ reftrig_newels
+};
+
+
+
+
+
+
+// HP_TRIG_SINGCORNER
+int reftrig_singcorner_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singcorner_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_NONE,
+};
+int reftrig_singcorner_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 2, 3, 5, 4 },
+};
+HPRef_Struct reftrig_singcorner =
+{
+ HP_TRIG,
+ reftrig_singcorner_splitedges,
+ 0, 0,
+ reftrig_singcorner_newelstypes,
+ reftrig_singcorner_newels
+};
+
+
+/*
+// HP_TRIG_SINGCORNER, trigs only
+int reftrig_singcorner_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singcorner_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singcorner_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 4, 2, 5 },
+ { 5, 2, 3 },
+};
+HPRef_Struct reftrig_singcorner =
+{
+ HP_TRIG,
+ reftrig_singcorner_splitedges,
+ 0, 0,
+ reftrig_singcorner_newelstypes,
+ reftrig_singcorner_newels
+};
+*/
+
+
+
+
+
+// HP_TRIG_SINGCORNER12
+int reftrig_singcorner12_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singcorner12_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singcorner12_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 2, 7, 6 },
+ { 4, 6, 7, 5 },
+ { 5, 7, 3 },
+};
+HPRef_Struct reftrig_singcorner12 =
+{
+ HP_TRIG,
+ reftrig_singcorner12_splitedges,
+ 0, 0,
+ reftrig_singcorner12_newelstypes,
+ reftrig_singcorner12_newels
+};
+
+
+
+
+// HP_TRIG_SINGCORNER123_2D
+int reftrig_singcorner123_2D_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 3, 1, 8 },
+ { 3, 2, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singcorner123_2D_newelstypes[] =
+{
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER,
+ HP_QUAD,
+ HP_QUAD,
+ HP_NONE,
+};
+int reftrig_singcorner123_2D_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 2, 7, 6 },
+ { 3, 8, 9 },
+ { 4, 6, 8, 5 },
+ { 6, 7, 9, 8 },
+};
+HPRef_Struct reftrig_singcorner123_2D =
+{
+ HP_TRIG,
+ reftrig_singcorner123_2D_splitedges,
+ 0, 0,
+ reftrig_singcorner123_2D_newelstypes,
+ reftrig_singcorner123_2D_newels
+};
+
+
+
+
+
+
+// HP_TRIG_SINGCORNER123
+int reftrig_singcorner123_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 3, 1, 8 },
+ { 3, 2, 9 },
+ { 0, 0, 0 }
+};
+
+int reftrig_singcorner123_splitfaces[][4] =
+{
+ { 1, 2, 3, 10 },
+ { 2, 3, 1, 11 },
+ { 3, 1, 2, 12 },
+ { 0, 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singcorner123_newelstypes[] =
+{
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ // HP_TRIG_SINGCORNER,
+ // HP_TRIG,
+ // HP_TRIG_SINGCORNER,
+ // HP_TRIG,
+ // HP_TRIG_SINGCORNER,
+ // HP_TRIG,
+ HP_QUAD,
+ HP_QUAD,
+ HP_QUAD,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singcorner123_newels[][8] =
+{
+ { 1, 4, 10, 5 },
+ { 2, 7, 11, 6 },
+ { 3, 8, 12, 9 },
+ // { 1, 4, 5 },
+ // { 5, 4, 10 },
+ // { 2, 7, 6 },
+ // { 6, 7, 11 },
+ // { 3, 8, 9 },
+ // { 8, 12, 9 },
+ { 4, 6, 11, 10 },
+ { 7, 9, 12, 11 },
+ { 8, 5, 10, 12 },
+ { 10, 11, 12 },
+};
+HPRef_Struct reftrig_singcorner123 =
+{
+ HP_TRIG,
+ reftrig_singcorner123_splitedges,
+ reftrig_singcorner123_splitfaces,
+ 0,
+ reftrig_singcorner123_newelstypes,
+ reftrig_singcorner123_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TRIG_SINGEDGE
+int reftrig_singedge_splitedges[][3] =
+{
+ { 2, 3, 4 },
+ { 1, 3, 5 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedge_newelstypes[] =
+{
+ HP_TRIG,
+ HP_QUAD_SINGEDGE,
+ HP_NONE,
+};
+int reftrig_singedge_newels[][8] =
+{
+ { 4, 3, 5 },
+ { 1, 2, 4, 5 },
+};
+HPRef_Struct reftrig_singedge =
+{
+ HP_TRIG,
+ reftrig_singedge_splitedges,
+ 0, 0,
+ reftrig_singedge_newelstypes,
+ reftrig_singedge_newels
+};
+
+
+
+
+
+
+// HP_TRIG_SINGEDGECORNER1
+int reftrig_singedgecorner1_splitedges[][3] =
+{
+ { 1, 2, 6 },
+ { 1, 3, 5 },
+ { 2, 3, 4 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner1_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedgecorner1_newels[][8] =
+{
+ { 1, 6, 5 },
+ { 6, 2, 4, 5 },
+ { 5, 4, 3 },
+};
+HPRef_Struct reftrig_singedgecorner1 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner1_splitedges,
+ 0, 0,
+ reftrig_singedgecorner1_newelstypes,
+ reftrig_singedgecorner1_newels
+};
+
+
+
+
+
+
+
+
+// HP_TRIG_SINGEDGECORNER2
+int reftrig_singedgecorner2_splitedges[][3] =
+{
+ { 2, 1, 6 },
+ { 1, 3, 5 },
+ { 2, 3, 4 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner2_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedgecorner2_newels[][8] =
+{
+ { 6, 2, 4},
+ { 1, 6, 4, 5 },
+ { 5, 4, 3 },
+};
+HPRef_Struct reftrig_singedgecorner2 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner2_splitedges,
+ 0, 0,
+ reftrig_singedgecorner2_newelstypes,
+ reftrig_singedgecorner2_newels
+};
+
+
+
+
+// HP_TRIG_SINGEDGECORNER12
+int reftrig_singedgecorner12_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner12_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedgecorner12_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 6, 2, 7 },
+ { 4, 6, 7, 5 },
+ { 5, 7, 3 },
+};
+HPRef_Struct reftrig_singedgecorner12 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner12_splitedges,
+ 0, 0,
+ reftrig_singedgecorner12_newelstypes,
+ reftrig_singedgecorner12_newels
+};
+
+
+
+
+
+
+
+// HP_TRIG_SINGEDGECORNER3
+int reftrig_singedgecorner3_splitedges[][3] =
+{
+ { 1, 3, 4 },
+ { 3, 1, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner3_newelstypes[] =
+{
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int reftrig_singedgecorner3_newels[][8] =
+{
+ { 1, 2, 6, 4 },
+ { 4, 6, 7, 5 },
+ { 3, 5, 7 },
+};
+HPRef_Struct reftrig_singedgecorner3 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner3_splitedges,
+ 0, 0,
+ reftrig_singedgecorner3_newelstypes,
+ reftrig_singedgecorner3_newels
+};
+
+
+
+
+// HP_TRIG_SINGEDGECORNER13
+int reftrig_singedgecorner13_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 3, 6 },
+ { 3, 1, 7 },
+ { 3, 2, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner13_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int reftrig_singedgecorner13_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 4, 2, 6, 5 },
+ { 5, 6, 8, 7 },
+ { 3, 7, 8 },
+};
+HPRef_Struct reftrig_singedgecorner13 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner13_splitedges,
+ 0, 0,
+ reftrig_singedgecorner13_newelstypes,
+ reftrig_singedgecorner13_newels
+};
+
+
+
+
+
+// HP_TRIG_SINGEDGECORNER23
+int reftrig_singedgecorner23_splitedges[][3] =
+{
+ { 1, 3, 4 },
+ { 2, 1, 5 },
+ { 2, 3, 6 },
+ { 3, 1, 7 },
+ { 3, 2, 8 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner23_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int reftrig_singedgecorner23_newels[][8] =
+{
+ { 5, 2, 6 },
+ { 1, 5, 6, 4 },
+ { 4, 6, 8, 7 },
+ { 3, 7, 8 },
+};
+HPRef_Struct reftrig_singedgecorner23 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner23_splitedges,
+ 0, 0,
+ reftrig_singedgecorner23_newelstypes,
+ reftrig_singedgecorner23_newels
+};
+
+
+
+// HP_TRIG_SINGEDGECORNER123
+int reftrig_singedgecorner123_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 3, 1, 8 },
+ { 3, 2, 9 },
+ { 0, 0, 0 }
+};
+HPREF_ELEMENT_TYPE reftrig_singedgecorner123_newelstypes[] =
+{
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD,
+ HP_TRIG_SINGCORNER,
+ HP_NONE,
+};
+int reftrig_singedgecorner123_newels[][8] =
+{
+ { 1, 4, 5 },
+ { 6, 2, 7 },
+ { 4, 6, 7, 5 },
+ { 5, 7, 9, 8 },
+ { 3, 8, 9 },
+};
+HPRef_Struct reftrig_singedgecorner123 =
+{
+ HP_TRIG,
+ reftrig_singedgecorner123_splitedges,
+ 0, 0,
+ reftrig_singedgecorner123_newelstypes,
+ reftrig_singedgecorner123_newels
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+// HP_TRIG_SINGEDGES
+int reftrig_singedges_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 3, 6 },
+ { 3, 2, 7 },
+ { 0, 0, 0 }
+};
+int reftrig_singedges_splitfaces[][4] =
+{
+ { 1, 2, 3, 8 },
+ { 0, 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftrig_singedges_newelstypes[] =
+{
+ // HP_QUAD_2E,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedges_newels[][8] =
+{
+ // { 1, 4, 8, 5 },
+ { 1, 4, 8 },
+ { 5, 1, 8 },
+ { 4, 2, 6, 8 },
+ { 3, 5, 8, 7 },
+ { 6, 7, 8 },
+};
+HPRef_Struct reftrig_singedges =
+{
+ HP_TRIG,
+ reftrig_singedges_splitedges,
+ reftrig_singedges_splitfaces,
+ 0,
+ reftrig_singedges_newelstypes,
+ reftrig_singedges_newels
+};
+
+
+
+
+
+
+
+
+// HP_TRIG_SINGEDGES2
+int reftrig_singedges2_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 3, 2, 8 },
+ { 0, 0, 0 }
+};
+int reftrig_singedges2_splitfaces[][4] =
+{
+ { 1, 2, 3, 9 },
+ { 0, 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftrig_singedges2_newelstypes[] =
+{
+ // HP_QUAD_2E,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedges2_newels[][8] =
+{
+ // { 1, 4, 9, 5 },
+ { 1, 4, 9 },
+ { 5, 1, 9 },
+ { 4, 6, 7, 9 },
+ { 3, 5, 9, 8 },
+ { 6, 2, 7 },
+ { 7, 8, 9 },
+};
+HPRef_Struct reftrig_singedges2 =
+{
+ HP_TRIG,
+ reftrig_singedges2_splitedges,
+ reftrig_singedges2_splitfaces,
+ 0,
+ reftrig_singedges2_newelstypes,
+ reftrig_singedges2_newels
+};
+
+
+
+
+// HP_TRIG_SINGEDGES3
+int reftrig_singedges3_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 3, 6 },
+ { 3, 1, 7 },
+ { 3, 2, 8 },
+ { 0, 0, 0 }
+};
+int reftrig_singedges3_splitfaces[][4] =
+{
+ { 1, 2, 3, 9 },
+ { 0, 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftrig_singedges3_newelstypes[] =
+{
+ // HP_QUAD_2E,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedges3_newels[][8] =
+{
+ // { 1, 4, 9, 5 },
+ { 1, 4, 9 },
+ { 5, 1, 9 },
+ { 4, 2, 6, 9 },
+ { 7, 5, 9, 8 },
+ { 3, 7, 8 },
+ { 6, 8, 9 },
+};
+HPRef_Struct reftrig_singedges3 =
+{
+ HP_TRIG,
+ reftrig_singedges3_splitedges,
+ reftrig_singedges3_splitfaces,
+ 0,
+ reftrig_singedges3_newelstypes,
+ reftrig_singedges3_newels
+};
+
+
+
+
+
+
+// HP_TRIG_SINGEDGES23
+int reftrig_singedges23_splitedges[][3] =
+{
+ { 1, 2, 4 },
+ { 1, 3, 5 },
+ { 2, 1, 6 },
+ { 2, 3, 7 },
+ { 3, 1, 8 },
+ { 3, 2, 9 },
+ { 0, 0, 0 }
+};
+int reftrig_singedges23_splitfaces[][4] =
+{
+ { 1, 2, 3, 10 },
+ { 0, 0, 0, 0 }
+};
+
+HPREF_ELEMENT_TYPE reftrig_singedges23_newelstypes[] =
+{
+ // HP_QUAD_2E,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG,
+ HP_NONE,
+};
+int reftrig_singedges23_newels[][8] =
+{
+ // { 1, 4, 10, 5 },
+ { 1 , 4, 10 },
+ { 5, 1, 10 },
+ { 4, 6, 7, 10 },
+ { 8, 5, 10, 9 },
+ { 6, 2, 7 },
+ { 3, 8, 9 },
+ { 7, 9, 10 },
+};
+HPRef_Struct reftrig_singedges23 =
+{
+ HP_TRIG,
+ reftrig_singedges23_splitedges,
+ reftrig_singedges23_splitfaces,
+ 0,
+ reftrig_singedges23_newelstypes,
+ reftrig_singedges23_newels
+};
+
+
diff --git a/Netgen/libsrc/meshing/hprefinement.cpp b/Netgen/libsrc/meshing/hprefinement.cpp
index be3bbf20b2..6a63e87675 100644
--- a/Netgen/libsrc/meshing/hprefinement.cpp
+++ b/Netgen/libsrc/meshing/hprefinement.cpp
@@ -1,586 +1,457 @@
#include <mystdlib.h>
#include "meshing.hpp"
-namespace netgen
-{
-enum HPREF_ELEMENT_TYPE {
- HP_NONE=0,
- HP_TRIG = 10,
- HP_TRIG_SINGCORNER,
- HP_TRIG_SINGCORNER12,
- HP_TRIG_SINGCORNER123,
- HP_TRIG_SINGEDGE = 20,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_TRIG_SINGEDGECORNER12,
- HP_TRIG_SINGEDGECORNER3,
- HP_TRIG_SINGEDGECORNER13,
- HP_TRIG_SINGEDGECORNER23,
- HP_TRIG_SINGEDGECORNER123,
- HP_TRIG_SINGEDGES = 30,
- HP_TRIG_SINGEDGES2,
- HP_TRIG_SINGEDGES3,
- HP_TRIG_SINGEDGES23,
- HP_TRIG_3SINGEDGES = 40,
-
- HP_QUAD = 50,
- HP_QUAD_SINGCORNER,
- HP_DUMMY_QUAD_SINGCORNER,
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGES,
-
- HP_TET = 100,
- HP_TET_0E_1V,
- HP_TET_0E_2V,
- HP_TET_0E_3V,
- HP_TET_0E_4V,
- HP_TET_1E_0V = 200,
- HP_TET_1E_1VA, // V on edge
- HP_TET_1E_1VB, // V not on edge
- HP_TET_1E_2VA, // both on edge
- HP_TET_1E_2VB,
- HP_TET_1E_2VC,
- HP_TET_1E_2VD, // non on edge
- HP_TET_1E_3VA, // 2 on edge
- HP_TET_1E_3VB, // 1 on edge
- HP_TET_1E_4V,
-
- // 2 connected edges, additonally marked Vs
- HP_TET_2EA_0V = 220,
- HP_TET_2EA_1VA,
- HP_TET_2EA_1VB,
- HP_TET_2EA_1VC,
- HP_TET_2EA_2VA,
- HP_TET_2EA_2VB,
- HP_TET_2EA_2VC,
- HP_TET_2EA_3V,
-
- // 2 opposite edges
- HP_TET_2EB_0V = 230,
- HP_TET_2EB_1V,
- HP_TET_2EB_2VA,
- HP_TET_2EB_2VB,
- HP_TET_2EB_2VC,
- HP_TET_2EB_3V,
- HP_TET_2EB_4V,
-
- HP_TET_3EA_0V = 400, // 3 edges connected
- HP_TET_3EA_3V,
-
- HP_TET_3EB_2V = 420, // 3 edges chain
- HP_TET_3EC_2V = 430, // 3 edges chain, alter
- HP_PRISM = 1000,
- HP_PRISM_SINGEDGE,
-
- HP_PYRAMID = 2000,
- HP_PYRAMID_0E_1V,
- HP_PYRAMID_EDGES,
-
- HP_HEX = 3000,
- HP_HEX_0E_1V,
- HP_HEX_1E_0V,
- HP_HEX_3E_0V,
-};
-
-
-struct HPRef_Struct {
- HPREF_ELEMENT_TYPE geom;
- int (*splitedges)[3];
- int (*splitfaces)[4];
- int (*splitelements)[5];
- HPREF_ELEMENT_TYPE * neweltypes;
- int (*newels)[8];
-};
-
-
-
-// HP_TRIG
-int reftrig_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_newelstypes[] =
-{
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_newels[][8] =
-{
- { 1, 2, 3 },
-};
-HPRef_Struct reftrig =
-{
- HP_TRIG,
- reftrig_splitedges,
- 0, 0,
- reftrig_newelstypes,
- reftrig_newels
-};
-
-// HP_TRIG_SINGCORNER
-int reftrig_singcorner_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singcorner_newelstypes[] =
-{
- HP_TRIG_SINGCORNER,
- HP_QUAD,
- HP_NONE,
-};
-int reftrig_singcorner_newels[][8] =
-{
- { 1, 4, 5 },
- { 2, 3, 5, 4 },
-};
-HPRef_Struct reftrig_singcorner =
+namespace netgen
{
- HP_TRIG,
- reftrig_singcorner_splitedges,
- 0, 0,
- reftrig_singcorner_newelstypes,
- reftrig_singcorner_newels
-};
-/*
-// HP_TRIG_SINGCORNER, trigs only
-int reftrig_singcorner_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singcorner_newelstypes[] =
-{
- HP_TRIG_SINGCORNER,
- HP_TRIG,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singcorner_newels[][8] =
-{
- { 1, 4, 5 },
- { 4, 2, 5 },
- { 5, 2, 3 },
-};
-HPRef_Struct reftrig_singcorner =
-{
- HP_TRIG,
- reftrig_singcorner_splitedges,
- 0, 0,
- reftrig_singcorner_newelstypes,
- reftrig_singcorner_newels
-};
-*/
+ // HP_SEGM
+ int refsegm_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+
+ HPREF_ELEMENT_TYPE refsegm_newelstypes[] =
+ {
+ HP_SEGM,
+ HP_NONE,
+ };
+ int refsegm_newels[][8] =
+ {
+ { 1, 2 },
+ };
+ HPRef_Struct refsegm =
+ {
+ HP_SEGM,
+ refsegm_splitedges,
+ 0, 0,
+ refsegm_newelstypes,
+ refsegm_newels
+ };
+ // HP_SEGM_SINGCORNERL = 2,
+ int refsegm_scl_splitedges[][3] =
+ {
+ { 1, 2, 3 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refsegm_scl_newelstypes[] =
+ {
+ HP_SEGM_SINGCORNERL,
+ HP_SEGM,
+ HP_NONE,
+ };
+ int refsegm_scl_newels[][8] =
+ {
+ { 1, 3 },
+ { 3, 2 },
+ { 0, 0 },
+ };
+ HPRef_Struct refsegm_scl =
+ {
+ HP_SEGM,
+ refsegm_scl_splitedges,
+ 0, 0,
+ refsegm_scl_newelstypes,
+ refsegm_scl_newels
+ };
-// HP_TRIG_SINGCORNER12
-int reftrig_singcorner12_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singcorner12_newelstypes[] =
-{
- HP_TRIG_SINGCORNER,
- HP_TRIG_SINGCORNER,
- HP_QUAD,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singcorner12_newels[][8] =
-{
- { 1, 4, 5 },
- { 2, 7, 6 },
- { 4, 6, 7, 5 },
- { 5, 7, 3 },
-};
-HPRef_Struct reftrig_singcorner12 =
-{
- HP_TRIG,
- reftrig_singcorner12_splitedges,
- 0, 0,
- reftrig_singcorner12_newelstypes,
- reftrig_singcorner12_newels
-};
+ // HP_SEGM_SINGCORNERR
+ int refsegm_scr_splitedges[][3] =
+ {
+ { 2, 1, 3 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refsegm_scr_newelstypes[] =
+ {
+ HP_SEGM,
+ HP_SEGM_SINGCORNERR,
+ HP_NONE,
+ };
+ int refsegm_scr_newels[][8] =
+ {
+ { 1, 3 },
+ { 3, 2 },
+ { 0, 0 },
+ };
+ HPRef_Struct refsegm_scr =
+ {
+ HP_SEGM,
+ refsegm_scr_splitedges,
+ 0, 0,
+ refsegm_scr_newelstypes,
+ refsegm_scr_newels
+ };
-// HP_TRIG_SINGCORNER123
-int reftrig_singcorner123_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 3, 1, 8 },
- { 3, 2, 9 },
- { 0, 0, 0 }
-};
-int reftrig_singcorner123_splitfaces[][4] =
-{
- { 1, 2, 3, 10 },
- { 2, 3, 1, 11 },
- { 3, 1, 2, 12 },
- { 0, 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singcorner123_newelstypes[] =
-{
- HP_DUMMY_QUAD_SINGCORNER,
- HP_DUMMY_QUAD_SINGCORNER,
- HP_DUMMY_QUAD_SINGCORNER,
- // HP_TRIG_SINGCORNER,
- // HP_TRIG,
- // HP_TRIG_SINGCORNER,
- // HP_TRIG,
- // HP_TRIG_SINGCORNER,
- // HP_TRIG,
- HP_QUAD,
- HP_QUAD,
- HP_QUAD,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singcorner123_newels[][8] =
-{
- { 1, 4, 10, 5 },
- { 2, 7, 11, 6 },
- { 3, 8, 12, 9 },
- // { 1, 4, 5 },
- // { 5, 4, 10 },
- // { 2, 7, 6 },
- // { 6, 7, 11 },
- // { 3, 8, 9 },
- // { 8, 12, 9 },
- { 4, 6, 11, 10 },
- { 7, 9, 12, 11 },
- { 8, 5, 10, 12 },
- { 10, 11, 12 },
-};
-HPRef_Struct reftrig_singcorner123 =
-{
- HP_TRIG,
- reftrig_singcorner123_splitedges,
- reftrig_singcorner123_splitfaces,
- 0,
- reftrig_singcorner123_newelstypes,
- reftrig_singcorner123_newels
-};
+ // HP_SEGM_SINGCORNERS = 3,
+ int refsegm_sc2_splitedges[][3] =
+ {
+ { 1, 2, 3 },
+ { 2, 1, 4 },
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refsegm_sc2_newelstypes[] =
+ {
+ HP_SEGM_SINGCORNERL,
+ HP_SEGM_SINGCORNERR,
+ HP_SEGM,
+ HP_NONE,
+ };
+ int refsegm_sc2_newels[][8] =
+ {
+ { 1, 3 },
+ { 4, 2 },
+ { 3, 4 },
+ { 0, 0 },
+ };
+ HPRef_Struct refsegm_sc2 =
+ {
+ HP_SEGM,
+ refsegm_sc2_splitedges,
+ 0, 0,
+ refsegm_sc2_newelstypes,
+ refsegm_sc2_newels
+ };
+#include "hpref_trig.hpp"
+#include "hpref_quad.hpp"
+#include "hpref_tet.hpp"
+#include "hpref_prism.hpp"
-// HP_TRIG_SINGEDGE
-int reftrig_singedge_splitedges[][3] =
-{
- { 2, 3, 4 },
- { 1, 3, 5 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedge_newelstypes[] =
-{
- HP_TRIG,
- HP_QUAD_SINGEDGE,
- HP_NONE,
-};
-int reftrig_singedge_newels[][8] =
-{
- { 4, 3, 5 },
- { 1, 2, 4, 5 },
-};
-HPRef_Struct reftrig_singedge =
-{
- HP_TRIG,
- reftrig_singedge_splitedges,
- 0, 0,
- reftrig_singedge_newelstypes,
- reftrig_singedge_newels
-};
+ // HP_PYRAMID
+ int refpyramid_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refpyramid_newelstypes[] =
+ {
+ HP_PYRAMID,
+ HP_NONE,
+ };
+ int refpyramid_newels[][8] =
+ {
+ { 1, 2, 3, 4, 5, 6 }
+ };
+ HPRef_Struct refpyramid =
+ {
+ HP_PYRAMID,
+ refpyramid_splitedges,
+ 0, 0,
+ refpyramid_newelstypes,
+ refpyramid_newels
+ };
-// HP_TRIG_SINGEDGECORNER1
-int reftrig_singedgecorner1_splitedges[][3] =
-{
- { 1, 2, 6 },
- { 1, 3, 5 },
- { 2, 3, 4 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner1_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER1,
- HP_QUAD_SINGEDGE,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedgecorner1_newels[][8] =
-{
- { 1, 6, 5 },
- { 6, 2, 4, 5 },
- { 5, 4, 3 },
-};
-HPRef_Struct reftrig_singedgecorner1 =
-{
- HP_TRIG,
- reftrig_singedgecorner1_splitedges,
- 0, 0,
- reftrig_singedgecorner1_newelstypes,
- reftrig_singedgecorner1_newels
-};
+ // HP_PYRAMID_0E_1V
+ int refpyramid_0e_1v_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refpyramid_0e_1v_newelstypes[] =
+ {
+ HP_TET_0E_1V,
+ HP_TET,
+ HP_NONE,
+ };
+ int refpyramid_0e_1v_newels[][8] =
+ {
+ { 1, 2, 4, 5 },
+ { 2, 3, 4, 5 },
+ };
+ HPRef_Struct refpyramid_0e_1v =
+ {
+ HP_PYRAMID,
+ refpyramid_0e_1v_splitedges,
+ 0, 0,
+ refpyramid_0e_1v_newelstypes,
+ refpyramid_0e_1v_newels
+ };
+ // HP_PYRAMID_EDGES
+ int refpyramid_edges_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refpyramid_edges_newelstypes[] =
+ {
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_NONE,
+ };
+ int refpyramid_edges_newels[][8] =
+ {
+ { 1, 2, 3, 5 },
+ { 1, 4, 5, 3 },
+ };
+ HPRef_Struct refpyramid_edges =
+ {
+ HP_PYRAMID,
+ refpyramid_edges_splitedges,
+ 0, 0,
+ refpyramid_edges_newelstypes,
+ refpyramid_edges_newels
+ };
+ // HP_PYRAMID_1FB_0E_1VA
+ int refpyramid_1fb_0e_1va_splitedges[][3] =
+ {
+ { 1, 4, 6 },
+ { 2, 3, 7 },
+ { 5, 1, 8 },
+ { 5, 2, 9 },
+ { 5, 3, 10 },
+ { 5, 4, 11 },
+ { 0, 0, 0 },
+ };
+
+ HPREF_ELEMENT_TYPE refpyramid_1fb_0e_1va_newelstypes[] =
+ {
+ HP_HEX_1F_0E_0V,
+ HP_PYRAMID_1FB_0E_1VA,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refpyramid_1fb_0e_1va_newels[][8] =
+ {
+ { 1, 8, 9, 2, 6, 11, 10, 7 },
+ { 8, 9, 10, 11, 5 },
+ { 3, 7, 10, 4, 6, 11 }
+ };
+ HPRef_Struct refpyramid_1fb_0e_1va =
+ {
+ HP_PYRAMID,
+ refpyramid_1fb_0e_1va_splitedges,
+ 0, 0,
+ refpyramid_1fb_0e_1va_newelstypes,
+ refpyramid_1fb_0e_1va_newels
+ };
-// HP_TRIG_SINGEDGECORNER2
-int reftrig_singedgecorner2_splitedges[][3] =
-{
- { 2, 1, 6 },
- { 1, 3, 5 },
- { 2, 3, 4 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner2_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedgecorner2_newels[][8] =
-{
- { 6, 2, 4},
- { 1, 6, 4, 5 },
- { 5, 4, 3 },
-};
-HPRef_Struct reftrig_singedgecorner2 =
-{
- HP_TRIG,
- reftrig_singedgecorner2_splitedges,
- 0, 0,
- reftrig_singedgecorner2_newelstypes,
- reftrig_singedgecorner2_newels
-};
-// HP_TRIG_SINGEDGECORNER12
-int reftrig_singedgecorner12_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner12_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedgecorner12_newels[][8] =
-{
- { 1, 4, 5 },
- { 6, 2, 7 },
- { 4, 6, 7, 5 },
- { 5, 7, 3 },
-};
-HPRef_Struct reftrig_singedgecorner12 =
-{
- HP_TRIG,
- reftrig_singedgecorner12_splitedges,
- 0, 0,
- reftrig_singedgecorner12_newelstypes,
- reftrig_singedgecorner12_newels
-};
+ // HP_HEX
+ int refhex_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refhex_newelstypes[] =
+ {
+ HP_HEX,
+ HP_NONE,
+ };
+ int refhex_newels[][8] =
+ {
+ { 1, 2, 3, 4, 5, 6, 7, 8 }
+ };
+ HPRef_Struct refhex =
+ {
+ HP_HEX,
+ refhex_splitedges,
+ 0, 0,
+ refhex_newelstypes,
+ refhex_newels
+ };
+ // HP_HEX_0E_1V
+ int refhex_0e_1v_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refhex_0e_1v_newelstypes[] =
+ {
+ HP_TET_0E_1V,
+ HP_TET,
+ HP_TET,
+ HP_TET,
+ HP_TET,
+ HP_TET,
+ HP_NONE,
+ };
+ int refhex_0e_1v_newels[][8] =
+ {
+ { 1, 5, 2, 4 },
+ { 7, 3, 6, 8 },
+ { 2, 8, 5, 6 },
+ { 2, 8, 6, 3 },
+ { 2, 8, 3, 4 },
+ { 2, 8, 4, 5 },
+ };
+ HPRef_Struct refhex_0e_1v =
+ {
+ HP_HEX,
+ refhex_0e_1v_splitedges,
+ 0, 0,
+ refhex_0e_1v_newelstypes,
+ refhex_0e_1v_newels
+ };
-// HP_TRIG_SINGEDGECORNER3
-int reftrig_singedgecorner3_splitedges[][3] =
-{
- { 1, 3, 4 },
- { 3, 1, 5 },
- { 2, 3, 6 },
- { 3, 2, 7 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner3_newelstypes[] =
-{
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_TRIG_SINGCORNER,
- HP_NONE,
-};
-int reftrig_singedgecorner3_newels[][8] =
-{
- { 1, 2, 6, 4 },
- { 4, 6, 7, 5 },
- { 3, 5, 7 },
-};
-HPRef_Struct reftrig_singedgecorner3 =
-{
- HP_TRIG,
- reftrig_singedgecorner3_splitedges,
- 0, 0,
- reftrig_singedgecorner3_newelstypes,
- reftrig_singedgecorner3_newels
-};
+ // HP_HEX_1E_1V
+ int refhex_1e_1v_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refhex_1e_1v_newelstypes[] =
+ {
+ HP_TET_1E_1VA,
+ HP_TET,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_TET_0E_1V,
+ HP_NONE,
+ };
+ int refhex_1e_1v_newels[][8] =
+ {
+ // { 1, 5, 2, 4 },
+ { 1, 2, 4, 5 },
+ { 7, 3, 6, 8 },
+ { 2, 8, 5, 6 },
+ { 2, 8, 6, 3 },
+ { 2, 8, 3, 4 },
+ { 2, 8, 4, 5 },
+ };
+ HPRef_Struct refhex_1e_1v =
+ {
+ HP_HEX,
+ refhex_1e_1v_splitedges,
+ 0, 0,
+ refhex_1e_1v_newelstypes,
+ refhex_1e_1v_newels
+ };
-// HP_TRIG_SINGEDGECORNER13
-int reftrig_singedgecorner13_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 3, 6 },
- { 3, 1, 7 },
- { 3, 2, 8 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner13_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER1,
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_TRIG_SINGCORNER,
- HP_NONE,
-};
-int reftrig_singedgecorner13_newels[][8] =
-{
- { 1, 4, 5 },
- { 4, 2, 6, 5 },
- { 5, 6, 8, 7 },
- { 3, 7, 8 },
-};
-HPRef_Struct reftrig_singedgecorner13 =
-{
- HP_TRIG,
- reftrig_singedgecorner13_splitedges,
- 0, 0,
- reftrig_singedgecorner13_newelstypes,
- reftrig_singedgecorner13_newels
-};
+ // HP_HEX_3E_0V
+ int refhex_3e_0v_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refhex_3e_0v_newelstypes[] =
+ {
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_1E_1VA,
+ HP_TET_0E_1V,
+ HP_TET,
+ HP_NONE,
+ };
+ int refhex_3e_0v_newels[][8] =
+ {
+ { 1, 2, 3, 6 },
+ { 1, 4, 8, 3 },
+ { 1, 5, 6, 8 },
+ { 1, 6, 3, 8 },
+ { 3, 8, 6, 7 },
+ };
+ HPRef_Struct refhex_3e_0v =
+ {
+ HP_HEX,
+ refhex_3e_0v_splitedges,
+ 0, 0,
+ refhex_3e_0v_newelstypes,
+ refhex_3e_0v_newels
+ };
-// HP_TRIG_SINGEDGECORNER23
-int reftrig_singedgecorner23_splitedges[][3] =
-{
- { 1, 3, 4 },
- { 2, 1, 5 },
- { 2, 3, 6 },
- { 3, 1, 7 },
- { 3, 2, 8 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner23_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_TRIG_SINGCORNER,
- HP_NONE,
-};
-int reftrig_singedgecorner23_newels[][8] =
-{
- { 5, 2, 6 },
- { 1, 5, 6, 4 },
- { 4, 6, 8, 7 },
- { 3, 7, 8 },
-};
-HPRef_Struct reftrig_singedgecorner23 =
-{
- HP_TRIG,
- reftrig_singedgecorner23_splitedges,
- 0, 0,
- reftrig_singedgecorner23_newelstypes,
- reftrig_singedgecorner23_newels
-};
+ // HP_HEX_1E_0V
+ int refhex_1e_0v_splitedges[][3] =
+ {
+ { 0, 0, 0 }
+ };
+ HPREF_ELEMENT_TYPE refhex_1e_0v_newelstypes[] =
+ {
+ HP_PRISM_SINGEDGE,
+ HP_PRISM,
+ HP_NONE,
+ };
+ int refhex_1e_0v_newels[][8] =
+ {
+ { 1, 4, 5, 2, 3, 6 },
+ { 5, 4, 8, 6, 3, 7 },
+ };
+ HPRef_Struct refhex_1e_0v =
+ {
+ HP_HEX,
+ refhex_1e_0v_splitedges,
+ 0, 0,
+ refhex_1e_0v_newelstypes,
+ refhex_1e_0v_newels
+ };
-// HP_TRIG_SINGEDGECORNER123
-int reftrig_singedgecorner123_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 3, 1, 8 },
- { 3, 2, 9 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftrig_singedgecorner123_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_TRIG_SINGCORNER,
- HP_NONE,
-};
-int reftrig_singedgecorner123_newels[][8] =
-{
- { 1, 4, 5 },
- { 6, 2, 7 },
- { 4, 6, 7, 5 },
- { 5, 7, 9, 8 },
- { 3, 8, 9 },
-};
-HPRef_Struct reftrig_singedgecorner123 =
-{
- HP_TRIG,
- reftrig_singedgecorner123_splitedges,
- 0, 0,
- reftrig_singedgecorner123_newelstypes,
- reftrig_singedgecorner123_newels
-};
+ // HP_HEX_1F_0E_0V
+ int refhex_1f_0e_0v_splitedges[][3] =
+ {
+ { 1, 5, 9 },
+ { 2, 6, 10 },
+ { 3, 7, 11 },
+ { 4, 8, 12 },
+ { 0, 0, 0 }
+ };
+
+ HPREF_ELEMENT_TYPE refhex_1f_0e_0v_newelstypes[] =
+ {
+ HP_HEX_1F_0E_0V,
+ HP_HEX,
+ HP_NONE,
+ };
+ int refhex_1f_0e_0v_newels[][8] =
+ {
+ { 1, 2, 3, 4, 9, 10, 11, 12 },
+ { 9, 10, 11, 12, 5, 6, 7, 8 }
+ };
+ HPRef_Struct refhex_1f_0e_0v =
+ {
+ HP_HEX,
+ refhex_1f_0e_0v_splitedges,
+ 0, 0,
+ refhex_1f_0e_0v_newelstypes,
+ refhex_1f_0e_0v_newels
+ };
@@ -588,1037 +459,1991 @@ HPRef_Struct reftrig_singedgecorner123 =
+ HPRef_Struct * Get_HPRef_Struct (HPREF_ELEMENT_TYPE type)
+ {
+ HPRef_Struct * hps = NULL;
+
+ switch (type)
+ {
+ case HP_SEGM:
+ hps = &refsegm; break;
+ case HP_SEGM_SINGCORNERL:
+ hps = &refsegm_scl; break;
+ case HP_SEGM_SINGCORNERR:
+ hps = &refsegm_scr; break;
+ case HP_SEGM_SINGCORNERS:
+ hps = &refsegm_sc2; break;
+
+ case HP_TRIG:
+ hps = &reftrig; break;
+ case HP_TRIG_SINGCORNER:
+ hps = &reftrig_singcorner; break;
+ case HP_TRIG_SINGCORNER12:
+ hps = &reftrig_singcorner12; break;
+ case HP_TRIG_SINGCORNER123:
+ hps = &reftrig_singcorner123; break;
+ case HP_TRIG_SINGCORNER123_2D:
+ hps = &reftrig_singcorner123_2D; break;
+ case HP_TRIG_SINGEDGE:
+ hps = &reftrig_singedge; break;
+ case HP_TRIG_SINGEDGECORNER1:
+ hps = &reftrig_singedgecorner1; break;
+ case HP_TRIG_SINGEDGECORNER2:
+ hps = &reftrig_singedgecorner2; break;
+ case HP_TRIG_SINGEDGECORNER12:
+ hps = &reftrig_singedgecorner12; break;
+ case HP_TRIG_SINGEDGECORNER3:
+ hps = &reftrig_singedgecorner3; break;
+ case HP_TRIG_SINGEDGECORNER13:
+ hps = &reftrig_singedgecorner13; break;
+ case HP_TRIG_SINGEDGECORNER23:
+ hps = &reftrig_singedgecorner23; break;
+ case HP_TRIG_SINGEDGECORNER123:
+ hps = &reftrig_singedgecorner123; break;
+ case HP_TRIG_SINGEDGES:
+ hps = &reftrig_singedges; break;
+ case HP_TRIG_SINGEDGES2:
+ hps = &reftrig_singedges2; break;
+ case HP_TRIG_SINGEDGES3:
+ hps = &reftrig_singedges3; break;
+ case HP_TRIG_SINGEDGES23:
+ hps = &reftrig_singedges23; break;
+ case HP_QUAD:
+ hps = &refquad; break;
+ case HP_DUMMY_QUAD_SINGCORNER:
+ hps = &refdummyquad_singcorner; break;
+ case HP_QUAD_SINGCORNER:
+ hps = &refquad_singcorner; break;
+ case HP_QUAD_SINGEDGE:
+ hps = &refquad_singedge; break;
+
+ case HP_QUAD_0E_2VA:
+ hps = &refquad_0e_2va; break;
+ case HP_QUAD_0E_2VB:
+ hps = &refquad_0e_2vb; break;
+
+ case HP_QUAD_0E_3V:
+ hps = &refquad_0e_3v; break;
+ case HP_QUAD_0E_4V:
+ hps = &refquad_0e_4v; break;
+
+ case HP_QUAD_1E_1VA:
+ hps = &refquad_1e_1va; break;
+ case HP_QUAD_1E_1VB:
+ hps = &refquad_1e_1vb; break;
+ case HP_QUAD_1E_1VC:
+ hps = &refquad_1e_1vc; break;
+ case HP_QUAD_1E_1VD:
+ hps = &refquad_1e_1vd; break;
+
+ case HP_QUAD_1E_2VA:
+ hps = &refquad_1e_2va; break;
+ case HP_QUAD_1E_2VB:
+ hps = &refquad_1e_2vb; break;
+ case HP_QUAD_1E_2VC:
+ hps = &refquad_1e_2vc; break;
+ case HP_QUAD_1E_2VD:
+ hps = &refquad_1e_2vd; break;
+ case HP_QUAD_1E_2VE:
+ hps = &refquad_1e_2ve; break;
+ case HP_QUAD_1E_2VF:
+ hps = &refquad_1e_2vf; break;
+
+ case HP_QUAD_1E_3VA:
+ hps = &refquad_1e_3va; break;
+ case HP_QUAD_1E_3VB:
+ hps = &refquad_1e_3vb; break;
+ case HP_QUAD_1E_3VC:
+ hps = &refquad_1e_3vc; break;
+ case HP_QUAD_1E_3VD:
+ hps = &refquad_1e_3vd; break;
+ case HP_QUAD_1E_4V:
+ hps = &refquad_1e_4v; break;
+
+
+ case HP_QUAD_2E:
+ hps = &refquad_2e; break;
+ case HP_QUAD_2E_1VA:
+ hps = &refquad_2e_1va; break;
+ case HP_QUAD_2E_1VB:
+ hps = &refquad_2e_1vb; break;
+ case HP_QUAD_2E_1VC:
+ hps = &refquad_2e_1vc; break;
+ case HP_QUAD_2E_2VA:
+ hps = &refquad_2e_2va; break;
+ case HP_QUAD_2E_2VB:
+ hps = &refquad_2e_2vb; break;
+ case HP_QUAD_2E_2VC:
+ hps = &refquad_2e_2vc; break;
+ case HP_QUAD_2E_3V:
+ hps = &refquad_2e_3v; break;
+
+ case HP_QUAD_2EB_0V:
+ hps = &refquad_2eb_0v; break;
+
+ case HP_QUAD_2EB_1VA:
+ hps = &refquad_2eb_1va; break;
+ case HP_QUAD_2EB_1VB:
+ hps = &refquad_2eb_1vb; break;
+
+
+ case HP_QUAD_2EB_2VA:
+ hps = &refquad_2eb_2va; break;
+ case HP_QUAD_2EB_2VB:
+ hps = &refquad_2eb_2vb; break;
+ case HP_QUAD_2EB_2VC:
+ hps = &refquad_2eb_2vc; break;
+ case HP_QUAD_2EB_2VD:
+ hps = &refquad_2eb_2vd; break;
+
+ case HP_QUAD_2EB_3VA:
+ hps = &refquad_2eb_3va; break;
+ case HP_QUAD_2EB_3VB:
+ hps = &refquad_2eb_3vb; break;
+
+ case HP_QUAD_2EB_4V:
+ hps = &refquad_2eb_4v; break;
+
+ case HP_QUAD_3E:
+ hps = &refquad_3e; break;
+ case HP_QUAD_3E_3VA:
+ hps = &refquad_3e_3va; break;
+ case HP_QUAD_3E_3VB:
+ hps = &refquad_3e_3vb; break;
+ case HP_QUAD_3E_4V:
+ hps = &refquad_3e_4v; break;
+
+
+ case HP_QUAD_4E:
+ hps = &refquad_4e; break;
+
+
+ case HP_TET:
+ hps = &reftet; break;
+ case HP_TET_0E_1V:
+ hps = &reftet_0e_1v; break;
+ case HP_TET_0E_2V:
+ hps = &reftet_0e_2v; break;
+ case HP_TET_0E_3V:
+ hps = &reftet_0e_3v; break;
+ case HP_TET_0E_4V:
+ hps = &reftet_0e_4v; break;
+
+ case HP_TET_1E_0V:
+ hps = &reftet_1e_0v; break;
+ case HP_TET_1E_1VA:
+ hps = &reftet_1e_1va; break;
+ case HP_TET_1E_1VB:
+ hps = &reftet_1e_1vb; break;
+
+ case HP_TET_1E_2VA:
+ hps = &reftet_1e_2va; break;
+ case HP_TET_1E_2VB:
+ hps = &reftet_1e_2vb; break;
+ case HP_TET_1E_2VC:
+ hps = &reftet_1e_2vc; break;
+ case HP_TET_1E_2VD:
+ hps = &reftet_1e_2vd; break;
+
+ case HP_TET_1E_3VA:
+ hps = &reftet_1e_3va; break;
+ case HP_TET_1E_3VB:
+ hps = &reftet_1e_3vb; break;
+ case HP_TET_1E_4V:
+ hps = &reftet_1e_4v; break;
+
+ case HP_TET_2EA_0V:
+ hps = &reftet_2ea_0v; break;
+ case HP_TET_2EA_1VB:
+ hps = &reftet_2ea_1vb; break;
+ case HP_TET_2EA_1VC:
+ hps = &reftet_2ea_1vc; break;
+ case HP_TET_2EA_1VA:
+ hps = &reftet_2ea_1va; break;
+ case HP_TET_2EA_2VA:
+ hps = &reftet_2ea_2va; break;
+ case HP_TET_2EA_2VB:
+ hps = &reftet_2ea_2vb; break;
+ case HP_TET_2EA_2VC:
+ hps = &reftet_2ea_2vc; break;
+ case HP_TET_2EA_3V:
+ hps = &reftet_2ea_3v; break;
+
+ case HP_TET_2EB_0V:
+ hps = &reftet_2eb_0v; break;
+ case HP_TET_2EB_2VA:
+ hps = &reftet_2eb_2va; break;
+ case HP_TET_2EB_4V:
+ hps = &reftet_2eb_4v; break;
+
+
+ case HP_TET_3EA_0V:
+ hps = &reftet_3ea_0v; break;
+ case HP_TET_3EA_1V:
+ hps = &reftet_3ea_1v; break;
+ case HP_TET_3EA_2V:
+ hps = &reftet_3ea_2v; break;
+ case HP_TET_3EA_3V:
+ hps = &reftet_3ea_3v; break;
+
+ case HP_TET_3EB_0V:
+ hps = &reftet_3eb_0v; break;
+ case HP_TET_3EB_1V:
+ hps = &reftet_3eb_1v; break;
+ case HP_TET_3EB_2V:
+ hps = &reftet_3eb_2v; break;
+ case HP_TET_3EC_0V:
+ hps = &reftet_3ec_0v; break;
+ case HP_TET_3EC_1V:
+ hps = &reftet_3ec_1v; break;
+ case HP_TET_3EC_2V:
+ hps = &reftet_3ec_2v; break;
+
+
+ case HP_TET_1F_0E_0V:
+ hps = &reftet_1f_0e_0v; break;
+ case HP_TET_1F_0E_1VA:
+ hps = &reftet_1f_0e_1va; break;
+ case HP_TET_1F_0E_1VB:
+ hps = &reftet_1f_0e_1vb; break;
+ case HP_TET_1F_1EA_0V:
+ hps = &reftet_1f_1ea_0v; break;
+ case HP_TET_1F_1EB_0V:
+ hps = &reftet_1f_1eb_0v; break;
+ case HP_TET_2F_0E_0V:
+ hps = &reftet_2f_0e_0v; break;
+
+
+ case HP_PRISM:
+ hps = &refprism; break;
+ case HP_PRISM_SINGEDGE:
+ hps = &refprism_singedge; break;
+ case HP_PRISM_SINGEDGE_H1:
+ hps = &refprism_singedge_h1; break;
+ case HP_PRISM_SINGEDGE_H12:
+ hps = &refprism_singedge_h12; break;
+ case HP_PRISM_SINGEDGE_V12:
+ hps = &refprism_singedge_v12; break;
+
+ case HP_PRISM_1FA_0E_0V:
+ hps = &refprism_1fa_0e_0v; break;
+ case HP_PRISM_1FB_0E_0V:
+ hps = &refprism_1fb_0e_0v; break;
+ case HP_PRISM_1FB_1EA_0V:
+ hps = &refprism_1fb_1ea_0v; break;
+
+ case HP_PYRAMID:
+ hps = &refpyramid; break;
+ case HP_PYRAMID_0E_1V:
+ hps = &refpyramid_0e_1v; break;
+ case HP_PYRAMID_EDGES:
+ hps = &refpyramid_edges; break;
+ case HP_PYRAMID_1FB_0E_1VA:
+ hps = &refpyramid_1fb_0e_1va; break;
+ case HP_HEX:
+ hps = &refhex; break;
+ case HP_HEX_0E_1V:
+ hps = &refhex_0e_1v; break;
+ case HP_HEX_1E_1V:
+ hps = &refhex_1e_1v; break;
+ case HP_HEX_1E_0V:
+ hps = &refhex_1e_0v; break;
+ case HP_HEX_3E_0V:
+ hps = &refhex_3e_0v; break;
+
+ case HP_HEX_1F_0E_0V:
+ hps = &refhex_1f_0e_0v; break;
+ }
+
+ if (!hps)
+ {
+ PrintSysError ("hp-refinement not implemented for case ", type);
+ }
+
+ return hps;
+ }
+
+
+ /* *********************** PrepareElements ****************************** */
+
+ // Elements (volume, surface, edges) are classified by singular vertices, edges, faces
-// HP_TRIG_SINGEDGES
-int reftrig_singedges_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 3, 6 },
- { 3, 2, 7 },
- { 0, 0, 0 }
-};
-int reftrig_singedges_splitfaces[][4] =
-{
- { 1, 2, 3, 8 },
- { 0, 0, 0, 0 }
-};
+ void PrepareElements (Mesh & mesh, ARRAY<HPRefElement> & elements)
+ {
+ INDEX_2_HASHTABLE<int> edges(mesh.GetNSeg()+1);
+ BitArray edgepoint(mesh.GetNP());
+ INDEX_2_HASHTABLE<int> edgepoint_dom(mesh.GetNSeg()+1);
-HPREF_ELEMENT_TYPE reftrig_singedges_newelstypes[] =
-{
- // HP_QUAD_SINGEDGES,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGE,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedges_newels[][8] =
-{
- // { 1, 4, 8, 5 },
- { 1, 4, 8 },
- { 5, 1, 8 },
- { 4, 2, 6, 8 },
- { 3, 5, 8, 7 },
- { 6, 7, 8 },
-};
-HPRef_Struct reftrig_singedges =
-{
- HP_TRIG,
- reftrig_singedges_splitedges,
- reftrig_singedges_splitfaces,
- 0,
- reftrig_singedges_newelstypes,
- reftrig_singedges_newels
-};
+ edgepoint.Clear();
+ BitArray cornerpoint(mesh.GetNP());
+ cornerpoint.Clear();
+ // value = nr > 0 ... refine elements in domain nr
+ // value = -1 ..... refine elements in any domain
+ INDEX_3_HASHTABLE<int> faces(mesh.GetNSE()+1);
+ INDEX_2_HASHTABLE<int> face_edges(mesh.GetNSE()+1);
+ ARRAY<int, PointIndex::BASE> facepoint(mesh.GetNP());
+ if (mesh.GetDimension() == 3)
+ {
+ /*
+ // check, if point has as least 3 different surfs:
+ ARRAY<INDEX_3, PointIndex::BASE> surfonpoint(mesh.GetNP());
+ surfonpoint = INDEX_3(0,0,0);
+ for (SurfaceElementIndex sei = 0; sei < mesh.GetNSE(); sei++)
+ {
+ const Element2d & el = mesh[sei];
+ int ind = el.GetIndex();
+ for (int j = 0; j < el.GetNP(); j++)
+ {
+ INDEX_3 & i3 = surfonpoint[el[j]];
+ if (ind != i3.I1() && ind != i3.I2() && ind != i3.I3())
+ {
+ i3.I1() = i3.I2();
+ i3.I2() = i3.I3();
+ i3.I3() = ind;
+ }
+ }
+ }
+ for (int i = 1; i <= mesh.GetNP(); i++)
+ if (surfonpoint.Get(i).I1())
+ cornerpoint.Set(i);
+ */
+ cornerpoint.Clear();
+ for (int i = 1; i <= mesh.GetNP(); i++)
+ {
+ if (mesh.Point(i).IsSingular())
+ cornerpoint.Set(i);
+ }
-// HP_TRIG_SINGEDGES2
-int reftrig_singedges2_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 3, 2, 8 },
- { 0, 0, 0 }
-};
-int reftrig_singedges2_splitfaces[][4] =
-{
- { 1, 2, 3, 9 },
- { 0, 0, 0, 0 }
-};
+ for (int i = 1; i <= mesh.GetNSeg(); i++)
+ if (mesh.LineSegment(i).singedge_left)
+ {
+ INDEX_2 i2 (mesh.LineSegment(i).p1,
+ mesh.LineSegment(i).p2);
+ i2.Sort();
+
+ edges.Set (i2, 1);
+ INDEX_2 i2s(i2.I2(), i2.I1());
+ edges.Set (i2s, 1);
+
+ edgepoint.Set (i2.I1());
+ edgepoint.Set (i2.I2());
+ }
-HPREF_ELEMENT_TYPE reftrig_singedges2_newelstypes[] =
-{
- // HP_QUAD_SINGEDGES,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGE,
- HP_TRIG_SINGEDGECORNER2,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedges2_newels[][8] =
-{
- // { 1, 4, 9, 5 },
- { 1, 4, 9 },
- { 5, 1, 9 },
- { 4, 6, 7, 9 },
- { 3, 5, 9, 8 },
- { 6, 2, 7 },
- { 7, 8, 9 },
-};
-HPRef_Struct reftrig_singedges2 =
-{
- HP_TRIG,
- reftrig_singedges2_splitedges,
- reftrig_singedges2_splitfaces,
- 0,
- reftrig_singedges2_newelstypes,
- reftrig_singedges2_newels
-};
+ // if 2 adjacent edges of an element are singular, the
+ // commen point must be a singular point
+ for (int i = 1; i <= mesh.GetNE(); i++)
+ {
+ const Element & el = mesh.VolumeElement(i);
+ const ELEMENT_EDGE * eledges = MeshTopology::GetEdges (el.GetType());
+ int nedges = MeshTopology::GetNEdges (el.GetType());
+ for (int j = 0; j < nedges; j++)
+ for (int k = 0; k < nedges; k++)
+ if (j != k)
+ {
+ INDEX_2 ej(el.PNum(eledges[j][0]), el.PNum(eledges[j][1]));
+ ej.Sort();
+ INDEX_2 ek(el.PNum(eledges[k][0]), el.PNum(eledges[k][1]));
+ ek.Sort();
+ if (edges.Used(ej) && edges.Used(ek))
+ {
+ if (ej.I1() == ek.I1()) cornerpoint.Set (ek.I1());
+ if (ej.I1() == ek.I2()) cornerpoint.Set (ek.I2());
+ if (ej.I2() == ek.I1()) cornerpoint.Set (ek.I1());
+ if (ej.I2() == ek.I2()) cornerpoint.Set (ek.I2());
+ }
+ }
+ }
+
+ edgepoint.Or (cornerpoint);
+
+ (*testout) << "cornerpoint = " << endl << cornerpoint << endl;
+ (*testout) << "edgepoint = " << endl << edgepoint << endl;
+ facepoint = 0;
+ for (SurfaceElementIndex sei = 0; sei < mesh.GetNSE(); sei++)
+ {
+ const Element2d & el = mesh[sei];
+ const FaceDescriptor & fd = mesh.GetFaceDescriptor (el.GetIndex());
+
+ if (!fd.domin_singular && !fd.domout_singular) continue;
+ int domnr;
+ if (fd.domin_singular) domnr = fd.DomainIn();
+ if (fd.domout_singular) domnr = fd.DomainOut();
+ if (fd.domin_singular && fd.domout_singular) domnr = -1;
+
-// HP_TRIG_SINGEDGES3
-int reftrig_singedges3_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 3, 6 },
- { 3, 1, 7 },
- { 3, 2, 8 },
- { 0, 0, 0 }
-};
-int reftrig_singedges3_splitfaces[][4] =
-{
- { 1, 2, 3, 9 },
- { 0, 0, 0, 0 }
-};
+ faces.Set (INDEX_3::Sort (el[0], el[1], el[2]), domnr);
+ face_edges.Set (INDEX_2::Sort (el[0], el[1]), domnr);
+ face_edges.Set (INDEX_2::Sort (el[0], el[2]), domnr);
+ face_edges.Set (INDEX_2::Sort (el[2], el[1]), domnr);
+ facepoint[el[0]] = domnr;
+ facepoint[el[1]] = domnr;
+ facepoint[el[2]] = domnr;
+ }
+
+ }
+ else
+ {
+ // 2D case
-HPREF_ELEMENT_TYPE reftrig_singedges3_newelstypes[] =
-{
- // HP_QUAD_SINGEDGES,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGE,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedges3_newels[][8] =
-{
- // { 1, 4, 9, 5 },
- { 1, 4, 9 },
- { 5, 1, 9 },
- { 4, 2, 6, 9 },
- { 7, 5, 9, 8 },
- { 3, 7, 8 },
- { 6, 8, 9 },
-};
-HPRef_Struct reftrig_singedges3 =
-{
- HP_TRIG,
- reftrig_singedges3_splitedges,
- reftrig_singedges3_splitfaces,
- 0,
- reftrig_singedges3_newelstypes,
- reftrig_singedges3_newels
-};
+ // check, if point has as least 3 different surfs:
+ ARRAY<INDEX_3, PointIndex::BASE> surfonpoint(mesh.GetNP());
+ for (int i = 1; i <= mesh.GetNP(); i++)
+ surfonpoint.Elem(i) = INDEX_3(0,0,0);
+
+ for (int i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ const Segment & seg = mesh.LineSegment(i);
+ int ind = seg.edgenr;
+ if (seg.singedge_left)
+ {
+ INDEX_2 i2 (mesh.LineSegment(i).p1,
+ mesh.LineSegment(i).p2);
+ edges.Set (i2, 1);
+ edgepoint.Set(i2.I1());
+ edgepoint.Set(i2.I2());
+
+ edgepoint_dom.Set (INDEX_2(mesh.LineSegment(i).domin, i2.I1()), 1);
+ edgepoint_dom.Set (INDEX_2(mesh.LineSegment(i).domin, i2.I2()), 1);
+ }
+ if (seg.singedge_right)
+ {
+ INDEX_2 i2 (mesh.LineSegment(i).p2,
+ mesh.LineSegment(i).p1);
+ edges.Set (i2, 1);
+ edgepoint.Set(i2.I1());
+ edgepoint.Set(i2.I2());
+
+ edgepoint_dom.Set (INDEX_2(mesh.LineSegment(i).domout, i2.I1()), 1);
+ edgepoint_dom.Set (INDEX_2(mesh.LineSegment(i).domout, i2.I2()), 1);
+ }
+ // (*testout) << "seg = " << ind << ", " << seg.p1 << "-" << seg.p2 << endl;
+ if (seg.singedge_left || seg.singedge_right)
+ {
+ for (int j = 0; j < 2; j++)
+ {
+ int pi = (j == 0) ? seg.p1 : seg.p2;
+ INDEX_3 & i3 = surfonpoint.Elem(pi);
+ if (ind != i3.I1() &&
+ ind != i3.I2())
+ {
+ i3.I1() = i3.I2();
+ i3.I2() = ind;
+ }
+ }
+ }
+ }
-// HP_TRIG_SINGEDGES23
-int reftrig_singedges23_splitedges[][3] =
-{
- { 1, 2, 4 },
- { 1, 3, 5 },
- { 2, 1, 6 },
- { 2, 3, 7 },
- { 3, 1, 8 },
- { 3, 2, 9 },
- { 0, 0, 0 }
-};
-int reftrig_singedges23_splitfaces[][4] =
-{
- { 1, 2, 3, 10 },
- { 0, 0, 0, 0 }
-};
+ for (int i = 1; i <= mesh.GetNP(); i++)
+ {
+ // mark points for refinement that are in corners between two anisotropic edges
+ if (surfonpoint.Get(i).I1())
+ {
+ cornerpoint.Set(i);
+ edgepoint.Set(i);
+ }
+
+ // mark points for refinement that are explicity specified in input file
+ if (mesh.Point(i).IsSingular())
+ {
+ cornerpoint.Set(i);
+ edgepoint.Set(i);
+ }
+ }
-HPREF_ELEMENT_TYPE reftrig_singedges23_newelstypes[] =
-{
- // HP_QUAD_SINGEDGES,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
-
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGE,
- HP_TRIG_SINGEDGECORNER2,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG,
- HP_NONE,
-};
-int reftrig_singedges23_newels[][8] =
-{
- // { 1, 4, 10, 5 },
- { 1 , 4, 10 },
- { 5, 1, 10 },
- { 4, 6, 7, 10 },
- { 8, 5, 10, 9 },
- { 6, 2, 7 },
- { 3, 8, 9 },
- { 7, 9, 10 },
-};
-HPRef_Struct reftrig_singedges23 =
-{
- HP_TRIG,
- reftrig_singedges23_splitedges,
- reftrig_singedges23_splitfaces,
- 0,
- reftrig_singedges23_newelstypes,
- reftrig_singedges23_newels
-};
+ edgepoint.Or (cornerpoint);
+ (*testout) << "cornerpoints: " << endl << cornerpoint << endl
+ << "edgepoints: " << endl << edgepoint << endl;
+ }
+ int cnt_undef = 0, cnt_nonimplement = 0;
+ ARRAY<int> misses(10000);
+ misses = 0;
+ for (ElementIndex i = 0; i < mesh.GetNE(); i++)
+ {
+ Element & el = mesh[i];
+
+ HPREF_ELEMENT_TYPE type = HP_NONE;
+ int pnums[8] = { 0 };
+
+
+ switch (el.GetType())
+ {
+ case TET:
+ {
+ int ep1, ep2, ep3, ep4, cp1, cp2, cp3, cp4, fp1, fp2, fp3, fp4;
+ int isedge1, isedge2, isedge3, isedge4, isedge5, isedge6;
+ int isfedge1, isfedge2, isfedge3, isfedge4, isfedge5, isfedge6;
+ int isface1, isface2, isface3, isface4;
+ for (int j = 0; j < 4; j++)
+ for (int k = 0; k < 4; k++)
+ {
+ if (j == k) continue;
+ if (type) break;
+
+ int pi3 = 0;
+ while (pi3 == j || pi3 == k) pi3++;
+ int pi4 = 6 - j - k - pi3;
+
+ // preserve orientation
+ int sort[4];
+ sort[0] = j; sort[1] = k; sort[2] = pi3; sort[3] = pi4;
+ int cnt = 0;
+ for (int jj = 0; jj < 4; jj++)
+ for (int kk = 0; kk < 3; kk++)
+ if (sort[kk] > sort[kk+1])
+ {
+ cnt++;
+ Swap (sort[kk], sort[kk+1]);
+ }
+ if (cnt % 2 == 1) Swap (pi3, pi4);
+
+ ep1 = edgepoint.Test (el[j]);
+ ep2 = edgepoint.Test (el[k]);
+ ep3 = edgepoint.Test (el[pi3]);
+ ep4 = edgepoint.Test (el[pi4]);
+
+ cp1 = cornerpoint.Test (el[j]);
+ cp2 = cornerpoint.Test (el[k]);
+ cp3 = cornerpoint.Test (el[pi3]);
+ cp4 = cornerpoint.Test (el[pi4]);
+
+ isedge1 = edges.Used (INDEX_2::Sort (el[j], el[k]));
+ isedge2 = edges.Used (INDEX_2::Sort (el[j], el[pi3]));
+ isedge3 = edges.Used (INDEX_2::Sort (el[j], el[pi4]));
+ isedge4 = edges.Used (INDEX_2::Sort (el[k], el[pi3]));
+ isedge5 = edges.Used (INDEX_2::Sort (el[k], el[pi4]));
+ isedge6 = edges.Used (INDEX_2::Sort (el[pi3], el[pi4]));
+
+ isface1 = isface2 = isface3 = isface4 = 0;
+ for (int l = 0; l < 4; l++)
+ {
+ INDEX_3 i3;
+ switch (l)
+ {
+ case 0: i3 = INDEX_3 (el[k], el[pi3], el[pi4]); break;
+ case 1: i3 = INDEX_3 (el[j], el[pi3], el[pi4]); break;
+ case 2: i3 = INDEX_3 (el[j], el[k], el[pi4]); break;
+ case 3: i3 = INDEX_3 (el[j], el[k], el[pi3]); break;
+ }
+ i3.Sort();
+ if (faces.Used (i3))
+ {
+ int domnr = faces.Get(i3);
+ if (domnr == -1 || domnr == el.GetIndex())
+ {
+ switch (l)
+ {
+ case 0: isface1 = 1; break;
+ case 1: isface2 = 1; break;
+ case 2: isface3 = 1; break;
+ case 3: isface4 = 1; break;
+ }
+ }
+ }
+ }
+ /*
+ isface1 = faces.Used (INDEX_3::Sort (el[k], el[pi3], el[pi4]));
+ isface2 = faces.Used (INDEX_3::Sort (el[j], el[pi3], el[pi4]));
+ isface3 = faces.Used (INDEX_3::Sort (el[j], el[k], el[pi4]));
+ isface4 = faces.Used (INDEX_3::Sort (el[j], el[k], el[pi3]));
+ */
+
+ isfedge1 = isfedge2 = isfedge3 = isfedge4 = isfedge5 = isfedge6 = 0;
+ for (int l = 0; l < 6; l++)
+ {
+ INDEX_2 i2;
+ switch (l)
+ {
+ case 0: i2 = INDEX_2 (el[j], el[k]); break;
+ case 1: i2 = INDEX_2 (el[j], el[pi3]); break;
+ case 2: i2 = INDEX_2 (el[j], el[pi4]); break;
+ case 3: i2 = INDEX_2 (el[k], el[pi3]); break;
+ case 4: i2 = INDEX_2 (el[k], el[pi4]); break;
+ case 5: i2 = INDEX_2 (el[pi3], el[pi4]); break;
+ }
+ i2.Sort();
+ if (face_edges.Used (i2))
+ {
+ int domnr = face_edges.Get(i2);
+ if (domnr == -1 || domnr == el.GetIndex())
+ {
+ switch (l)
+ {
+ case 0: isfedge1 = 1; break;
+ case 1: isfedge2 = 1; break;
+ case 2: isfedge3 = 1; break;
+ case 3: isfedge4 = 1; break;
+ case 4: isfedge5 = 1; break;
+ case 5: isfedge6 = 1; break;
+ }
+ }
+ }
+ }
+ /*
+ isfedge1 = face_edges.Used (INDEX_2::Sort (el[j], el[k]));
+ isfedge2 = face_edges.Used (INDEX_2::Sort (el[j], el[pi3]));
+ isfedge3 = face_edges.Used (INDEX_2::Sort (el[j], el[pi4]));
+ isfedge4 = face_edges.Used (INDEX_2::Sort (el[k], el[pi3]));
+ isfedge5 = face_edges.Used (INDEX_2::Sort (el[k], el[pi4]));
+ isfedge6 = face_edges.Used (INDEX_2::Sort (el[pi3], el[pi4]));
+ */
+
+ fp1 = fp2 = fp3 = fp4 = 0;
+ for (int l = 0; l < 4; l++)
+ {
+ int pi;
+ switch (l)
+ {
+ case 0: pi = el[j]; break;
+ case 1: pi = el[k]; break;
+ case 2: pi = el[pi3]; break;
+ case 3: pi = el[pi4]; break;
+ }
+ int domnr = facepoint[pi];
+ if (domnr == -1 || domnr == el.GetIndex())
+ {
+ switch (l)
+ {
+ case 0: fp1 = 1; break;
+ case 1: fp2 = 1; break;
+ case 2: fp3 = 1; break;
+ case 3: fp4 = 1; break;
+ }
+ }
+ }
+ /*
+ fp1 = facepoint[el[j]] != 0;
+ fp2 = facepoint[el[k]] != 0;
+ fp3 = facepoint[el[pi3]] != 0;
+ fp4 = facepoint[el[pi4]] != 0;
+ */
+ switch (isface1+isface2+isface3+isface4)
+ {
+ case 0:
+ {
+ isedge1 |= isfedge1;
+ isedge2 |= isfedge2;
+ isedge3 |= isfedge3;
+ isedge4 |= isfedge4;
+ isedge5 |= isfedge5;
+ isedge6 |= isfedge6;
+
+ ep1 |= fp1;
+ ep2 |= fp2;
+ ep3 |= fp3;
+ ep4 |= fp4;
+
+ switch (isedge1+isedge2+isedge3+isedge4+isedge5+isedge6)
+ {
+ case 0:
+ {
+ if (!ep1 && !ep2 && !ep3 && !ep4)
+ type = HP_TET;
+
+ if (ep1 && !ep2 && !ep3 && !ep4)
+ type = HP_TET_0E_1V;
+
+ if (ep1 && ep2 && !ep3 && !ep4)
+ type = HP_TET_0E_2V;
+
+ if (ep1 && ep2 && ep3 && !ep4)
+ type = HP_TET_0E_3V;
+
+ if (ep1 && ep2 && ep3 && ep4)
+ type = HP_TET_0E_4V;
+
+ break;
+ }
+
+ case 1:
+ {
+ if (!isedge1) break;
+
+ if (!cp1 && !cp2 && !ep3 && !ep4)
+ type = HP_TET_1E_0V;
+
+ if (cp1 && !cp2 && !ep3 && !ep4)
+ type = HP_TET_1E_1VA;
+ if (!cp1 && !cp2 && !ep3 && ep4)
+ type = HP_TET_1E_1VB;
+ if (cp1 && cp2 && !ep3 && !ep4)
+ type = HP_TET_1E_2VA;
-// HP_QUAD
-int refquad_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refquad_newelstypes[] =
-{
- HP_QUAD,
- HP_NONE,
-};
-int refquad_newels[][8] =
-{
- { 1, 2, 3, 4 },
-};
-HPRef_Struct refquad =
-{
- HP_QUAD,
- refquad_splitedges,
- 0, 0,
- refquad_newelstypes,
- refquad_newels
-};
+ if (cp1 && !cp2 && ep3 && !ep4)
+ type = HP_TET_1E_2VB;
+ if (cp1 && !cp2 && !ep3 && ep4)
+ type = HP_TET_1E_2VC;
+ if (!cp1 && !cp2 && ep3 && ep4)
+ type = HP_TET_1E_2VD;
+ if (cp1 && cp2 && ep3 && !ep4)
+ type = HP_TET_1E_3VA;
+ if (cp1 && !cp2 && ep3 && ep4)
+ type = HP_TET_1E_3VB;
+ if (cp1 && cp2 && ep3 && ep4)
+ type = HP_TET_1E_4V;
+
+ break;
+ }
+ case 2:
+ {
+ if (isedge1 && isedge2)
+ {
+ if (!cp2 && !cp3 && !ep4)
+ type = HP_TET_2EA_0V;
+
+ if (cp2 && !cp3 && !ep4)
+ type = HP_TET_2EA_1VA;
+ if (!cp2 && cp3 && !ep4)
+ type = HP_TET_2EA_1VB;
+
+ if (!cp2 && !cp3 && ep4)
+ type = HP_TET_2EA_1VC;
+
+ if (cp2 && cp3 && !ep4)
+ type = HP_TET_2EA_2VA;
+ if (cp2 && !cp3 && ep4)
+ type = HP_TET_2EA_2VB;
+ if (!cp2 && cp3 && ep4)
+ type = HP_TET_2EA_2VC;
+
+ if (cp2 && cp3 && ep4)
+ type = HP_TET_2EA_3V;
+ }
+ if (isedge1 && isedge6)
+ {
+ if (!cp1 && !cp2 && !cp3 && !cp4)
+ type = HP_TET_2EB_0V;
+ if (cp1 && !cp2 && !cp3 && !cp4)
+ type = HP_TET_2EB_1V;
+ if (cp1 && cp2 && !cp3 && !cp4)
+ type = HP_TET_2EB_2VA;
+ if (cp1 && !cp2 && cp3 && !cp4)
+ type = HP_TET_2EB_2VB;
+ if (cp1 && !cp2 && !cp3 && cp4)
+ type = HP_TET_2EB_2VC;
+ if (cp1 && cp2 && cp3 && !cp4)
+ type = HP_TET_2EB_3V;
+ if (cp1 && cp2 && cp3 && cp4)
+ type = HP_TET_2EB_4V;
+ }
+ }
+ case 3:
+ {
+ if (isedge1 && isedge2 && isedge3)
+ {
+ if (!cp2 && !cp3 && !cp4)
+ type = HP_TET_3EA_0V;
+ if (cp2 && !cp3 && !cp4)
+ type = HP_TET_3EA_1V;
+ if (cp2 && cp3 && !cp4)
+ type = HP_TET_3EA_2V;
+ if (cp2 && cp3 && cp4)
+ type = HP_TET_3EA_3V;
+ }
+ if (isedge1 && isedge3 && isedge4)
+ {
+ if (!cp3 && !cp4)
+ type = HP_TET_3EB_0V;
+ if (cp3 && !cp4)
+ type = HP_TET_3EB_1V;
+ if (cp3 && cp4)
+ type = HP_TET_3EB_2V;
+ }
+ if (isedge1 && isedge2 && isedge5)
+ {
+ if (!cp3 && !cp4)
+ type = HP_TET_3EC_0V;
+ if (cp3 && !cp4)
+ type = HP_TET_3EC_1V;
+ if (cp3 && cp4)
+ type = HP_TET_3EC_2V;
+ }
+ break;
+ }
+ }
+ break;
+ }
+
+
+
+ case 1: // one singular face
+ {
+ if (!isface1) break;
+
+ switch (isfedge1+isfedge2+isfedge3+isedge4+isedge5+isedge6)
+ {
+ case 0:
+ {
+ if (!fp1 && !ep2 && !ep3 && !ep4)
+ type = HP_TET_1F_0E_0V;
+ if (fp1 && !ep2 && !ep3 && !ep4)
+ type = HP_TET_1F_0E_1VB;
+ if (!fp1 && ep2 && !ep3 & !ep4)
+ type = HP_TET_1F_0E_1VA;
+ break;
+ }
+ case 1:
+ {
+ if (isfedge1)
+ {
+ if (!ep1 && !ep3 && !ep4)
+ type = HP_TET_1F_1EA_0V;
+ }
+ if (isedge4) // V1-V3
+ {
+ if (!ep1 && !cp2 && !cp3 && !ep4)
+ type = HP_TET_1F_1EB_0V;
+ }
+ break;
+ }
+ }
+ break;
+ }
+
+
+ case 2: // one singular face
+ {
+ if (!isface1 || !isface2) break;
+
+ switch (isfedge1+isedge2+isedge3+isedge4+isedge5)
+ {
+ case 0:
+ {
+ if (!ep1 && !ep2 && !cp3 && !cp4)
+ type = HP_TET_2F_0E_0V;
+ break;
+ }
+ }
+ break;
+ }
-// HP_QUAD_SINGCORNER
-int refquad_singcorner_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 4, 6 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refquad_singcorner_newelstypes[] =
-{
- HP_TRIG_SINGCORNER,
- HP_QUAD,
- HP_TRIG,
- HP_NONE,
-};
-int refquad_singcorner_newels[][8] =
-{
- { 1, 5, 6 },
- { 2, 4, 6, 5 },
- { 2, 3, 4 },
-};
-HPRef_Struct refquad_singcorner =
-{
- HP_QUAD,
- refquad_singcorner_splitedges,
- 0, 0,
- refquad_singcorner_newelstypes,
- refquad_singcorner_newels
-};
+ }
+ if (type != HP_NONE)
+ {
+ pnums[0] = el[j];
+ pnums[1] = el[k];
+ pnums[2] = el[pi3];
+ pnums[3] = el[pi4];
+ break;
+ }
+ }
+ /*
+ if (type != HP_TET_2EB_2VA)
+ type = HP_NONE;
+ */
+ if (type == HP_NONE)
+ {
+ cnt_undef++;
+ (*testout) << "undefined element" << endl
+ << "cp = " << cp1 << cp2 << cp3 << cp4 << endl
+ << "ep = " << ep1 << ep2 << ep3 << ep4 << endl
+ << "isedge = " << isedge1 << isedge2 << isedge3
+ << isedge4 << isedge5 << isedge6 << endl;
+ cout << "undefined element !!! " << endl;
+ }
+ break;
+ }
-// HP_DUMMY_QUAD_SINGCORNER
-int refdummyquad_singcorner_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refdummyquad_singcorner_newelstypes[] =
-{
- HP_TRIG_SINGCORNER,
- HP_TRIG,
- HP_NONE,
-};
-int refdummyquad_singcorner_newels[][8] =
-{
- { 1, 2, 4 },
- { 4, 2, 3 },
-};
-HPRef_Struct refdummyquad_singcorner =
-{
- HP_QUAD,
- refdummyquad_singcorner_splitedges,
- 0, 0,
- refdummyquad_singcorner_newelstypes,
- refdummyquad_singcorner_newels
-};
+ case PRISM:
+ {
+ int pi1, pi2, pi3, pi4, pi5, pi6;
+ int ep1, ep2, ep3, ep4, ep5, ep6, cp1, cp2, cp3, cp4, cp5, cp6;
+ int ishedge1, ishedge2, ishedge3, ishedge4, ishedge5, ishedge6;
+ int isvedge1, isvedge2, isvedge3;
+
+ for (int j = 1; j <= 3; j++)
+ {
+ if (type) break;
+
+ pi1 = j;
+ pi2 = pi1%3 + 1;
+ pi3 = pi2%3 + 1;
+ pi4 = pi1+3;
+ pi5 = pi2+3;
+ pi6 = pi3+3;
+
+ ep1 = edgepoint.Test (el.PNum (pi1));
+ ep2 = edgepoint.Test (el.PNum (pi2));
+ ep3 = edgepoint.Test (el.PNum (pi3));
+ ep4 = edgepoint.Test (el.PNum (pi4));
+ ep5 = edgepoint.Test (el.PNum (pi5));
+ ep6 = edgepoint.Test (el.PNum (pi6));
+
+ cp1 = cornerpoint.Test (el.PNum (pi1));
+ cp2 = cornerpoint.Test (el.PNum (pi2));
+ cp3 = cornerpoint.Test (el.PNum (pi3));
+ cp4 = cornerpoint.Test (el.PNum (pi4));
+ cp5 = cornerpoint.Test (el.PNum (pi5));
+ cp6 = cornerpoint.Test (el.PNum (pi6));
+
+ INDEX_2 i2 = INDEX_2::Sort(el.PNum (pi1), el.PNum (pi4));
+ isvedge1 = edges.Used (i2) || ep1 || ep4;
+ i2 = INDEX_2::Sort(el.PNum (pi2), el.PNum (pi5));
+ isvedge2 = edges.Used (i2) || ep2 || ep5;
+ i2 = INDEX_2::Sort(el.PNum (pi3), el.PNum (pi6));
+ isvedge3 = edges.Used (i2) || ep3 || ep6;
+ ishedge1 = edges.Used (INDEX_2::Sort(el.PNum (pi1), el.PNum (pi2)));
+ ishedge2 = edges.Used (INDEX_2::Sort(el.PNum (pi2), el.PNum (pi3)));
+ ishedge3 = edges.Used (INDEX_2::Sort(el.PNum (pi3), el.PNum (pi1)));
-// HP_QUAD_SINGEDGE
-int refquad_singedge_splitedges[][3] =
-{
- { 1, 4, 5 },
- { 2, 3, 6 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refquad_singedge_newelstypes[] =
-{
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_NONE,
-};
-int refquad_singedge_newels[][8] =
-{
- { 1, 2, 6, 5 },
- { 5, 6, 3, 4 },
-};
-HPRef_Struct refquad_singedge =
-{
- HP_QUAD,
- refquad_singedge_splitedges,
- 0, 0,
- refquad_singedge_newelstypes,
- refquad_singedge_newels
-};
+ switch (ishedge1 + ishedge2 + ishedge3)
+ {
+ case 0:
+ {
+ if (!isvedge1 && !isvedge2 && !isvedge3)
+ type = HP_PRISM;
+ else if (isvedge1 && !isvedge2 && !isvedge3)
+ type = HP_PRISM_SINGEDGE;
+ else if (isvedge1 && isvedge2 && !isvedge3)
+ type = HP_PRISM_SINGEDGE_V12;
+ break;
+ }
+ case 1:
+ {
+ if (ishedge1)
+ type = HP_PRISM_SINGEDGE_H1;
+ break;
+ }
+ case 2:
+ {
+ if (ishedge1 && ishedge2)
+ type = HP_PRISM_SINGEDGE_H12;
+ break;
+ }
+ }
+ if (type != HP_NONE)
+ {
+ cout << "classified element, type = " << type << ", el = " << el << endl;
+ pnums[0] = el.PNum (pi1);
+ pnums[1] = el.PNum (pi2);
+ pnums[2] = el.PNum (pi3);
+ pnums[3] = el.PNum (pi4);
+ pnums[4] = el.PNum (pi5);
+ pnums[5] = el.PNum (pi6);
+ break;
+ }
+ }
+ break;
+ }
+ default:
+ {
+ cerr << "hp-refinement not defined for element" << endl;
+ }
+ }
+ if (type == HP_NONE)
+ {
+ cout << "element is HP_NONE: " << el << endl;
+ }
-// HP_QUAD_SINGEDGES
-int refquad_singedges_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 4, 6 },
- { 2, 3, 7 },
- { 4, 3, 8 },
- { 0, 0, 0 }
-};
-int refquad_singedges_splitfaces[][4] =
-{
- { 1, 2, 4, 9 },
- { 0, 0, 0, 0 },
-};
-HPREF_ELEMENT_TYPE refquad_singedges_newelstypes[] =
-{
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_QUAD_SINGEDGE,
- HP_QUAD_SINGEDGE,
- HP_QUAD,
- HP_NONE,
-};
-int refquad_singedges_newels[][8] =
-{
- { 1, 5, 9 },
- { 6, 1, 9 },
- { 5, 2, 7, 9 },
- { 4, 6, 9, 8 },
- { 9, 7, 3, 8 },
-};
-HPRef_Struct refquad_singedges =
-{
- HP_QUAD,
- refquad_singedges_splitedges,
- refquad_singedges_splitfaces,
- 0,
- refquad_singedges_newelstypes,
- refquad_singedges_newels
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-// HP_TET
-int reftet_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_newelstypes[] =
-{
- HP_TET,
- HP_NONE,
-};
-int reftet_newels[][8] =
-{
- { 1, 2, 3, 4 },
-};
-HPRef_Struct reftet =
-{
- HP_TET,
- reftet_splitedges,
- 0, 0,
- reftet_newelstypes,
- reftet_newels
-};
-
-
-
-/* *********** Tet - Refinement - 0 edges *************** */
-
-// HP_TET_0E_1V
-int reftet_0e_1v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_0e_1v_newelstypes[] =
-{
- HP_TET_0E_1V,
- HP_PRISM,
- HP_NONE,
-};
-int reftet_0e_1v_newels[][8] =
-{
- { 1, 5, 6, 7 },
- { 5, 6, 7, 2, 3, 4 }
-};
-HPRef_Struct reftet_0e_1v =
-{
- HP_TET,
- reftet_0e_1v_splitedges,
- 0, 0,
- reftet_0e_1v_newelstypes,
- reftet_0e_1v_newels
-};
-
+ if (!Get_HPRef_Struct (type))
+ {
+ (*testout) << "case " << type << " not implemented " << endl;
+ cnt_nonimplement++;
+ misses[type]++;
+ }
+
+ HPRefElement hpel;
+ hpel.type = type;
+ for (int j = 0; j < 8; j++)
+ hpel.pnums[j] = pnums[j];
+ hpel.index = el.GetIndex();
+ hpel.level = 1;
+ hpel.coarse_elnr = i;
+
+ static const double points[4][3] =
+ { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 } };
+ for (int j = 0; j < 4; j++)
+ for (int k = 0; k < 4; k++)
+ if (pnums[j] == el[k])
+ {
+ hpel.param[j][0] = points[k][0];
+ hpel.param[j][1] = points[k][1];
+ hpel.param[j][2] = points[k][2];
+ }
+ elements.Append (hpel);
+ }
-// HP_TET_0E_2V
-int reftet_0e_2v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_0e_2v_newelstypes[] =
-{
- HP_TET_0E_1V,
- HP_TET_0E_1V,
- HP_PRISM,
- HP_PRISM,
- HP_NONE,
-};
-int reftet_0e_2v_newels[][8] =
-{
- { 1, 5, 6, 7 },
- { 2, 10, 9, 8 },
- { 5, 6, 7, 8, 9, 10 },
- { 4, 10, 7, 3, 9, 6 },
-};
-HPRef_Struct reftet_0e_2v =
-{
- HP_TET,
- reftet_0e_2v_splitedges,
- 0, 0,
- reftet_0e_2v_newelstypes,
- reftet_0e_2v_newels
-};
+ cout << "undefined elements: " << cnt_undef << endl;
+ cout << "non-implemented: " << cnt_nonimplement << endl;
+ for (int i = 0; i < misses.Size(); i++)
+ if (misses[i])
+ cout << "missing case " << i << " occured " << misses[i] << " times" << endl;
+ for (int i = 1; i <= mesh.GetNSE(); i++)
+ {
+ int j, k, pi3, pi4;
+ Element2d & el = mesh.SurfaceElement(i);
+
+ HPREF_ELEMENT_TYPE type = HP_NONE;
+ int pnums[8] = { 0 };
+ switch (el.GetType())
+ {
+ case TRIG:
+ {
+ for (j = 1; j <= 3; j++)
+ {
+ int ep1 = edgepoint.Test (el.PNumMod (j));
+ int ep2 = edgepoint.Test (el.PNumMod (j+1));
+ int ep3 = edgepoint.Test (el.PNumMod (j+2));
+
+ if (mesh.GetDimension() == 2)
+ {
+ ep1 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j)));
+ ep2 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j+1)));
+ ep3 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j+2)));
+ }
+ int cp1 = cornerpoint.Test (el.PNumMod (j));
+ int cp2 = cornerpoint.Test (el.PNumMod (j+1));
+ int cp3 = cornerpoint.Test (el.PNumMod (j+2));
-// HP_TET_0E_3V
-int reftet_0e_3v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 0, 0, 0 }
-};
-int reftet_0e_3v_splitfaces[][4] =
- {
- { 1, 2, 3, 14 },
- { 2, 3, 1, 15 },
- { 3, 1, 2, 16 },
- { 0, 0, 0, 0 },
- };
-HPREF_ELEMENT_TYPE reftet_0e_3v_newelstypes[] =
-{
- HP_PYRAMID_0E_1V,
- HP_PYRAMID_0E_1V,
- HP_PYRAMID_0E_1V,
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_TET,
- HP_NONE,
-};
-int reftet_0e_3v_newels[][8] =
-{
- { 1, 5, 14, 6, 7 },
- { 2, 9, 15, 8, 10 },
- { 3, 11, 16, 12, 13 },
- { 5, 14, 7, 8, 15, 10 },
- { 9, 15, 10, 12, 16, 13 },
- { 6, 7, 14, 11, 13, 16 },
- { 14, 15, 16, 7, 10, 13 },
- { 7, 10, 13, 4 }
-};
-HPRef_Struct reftet_0e_3v =
-{
- HP_TET,
- reftet_0e_3v_splitedges,
- reftet_0e_3v_splitfaces,
- 0,
- reftet_0e_3v_newelstypes,
- reftet_0e_3v_newels
-};
+ ep1 |= cp1;
+ ep2 |= cp2;
+ ep3 |= cp3;
+
+ INDEX_2 i2;
+ i2 = INDEX_2(el.PNumMod (j), el.PNumMod (j+1));
+ // i2.Sort();
+ int isedge1 = edges.Used (i2);
+ i2 = INDEX_2(el.PNumMod (j+1), el.PNumMod (j+2));
+ // i2.Sort();
+ int isedge2 = edges.Used (i2);
+ i2 = INDEX_2(el.PNumMod (j+2), el.PNumMod (j+3));
+ // i2.Sort();
+ int isedge3 = edges.Used (i2);
+
+ if (isedge1 + isedge2 + isedge3 == 0)
+ {
+ if (!ep1 && !ep2 && !ep3)
+ type = HP_TRIG;
+
+ if (ep1 && !ep2 && !ep3)
+ type = HP_TRIG_SINGCORNER;
+
+ if (ep1 && ep2 && !ep3)
+ type = HP_TRIG_SINGCORNER12;
+
+ if (ep1 && ep2 && ep3)
+ {
+ if (mesh.GetDimension() == 2)
+ type = HP_TRIG_SINGCORNER123_2D;
+ else
+ type = HP_TRIG_SINGCORNER123;
+ }
+
+ if (type != HP_NONE)
+ {
+ pnums[0] = el.PNumMod (j);
+ pnums[1] = el.PNumMod (j+1);
+ pnums[2] = el.PNumMod (j+2);
+ break;
+ }
+ }
+
+ if (isedge1 && !isedge2 && !isedge3)
+ {
+ int code = 0;
+ if (cp1) code += 1;
+ if (cp2) code += 2;
+ if (ep3) code += 4;
+
+ HPREF_ELEMENT_TYPE types[] =
+ {
+ HP_TRIG_SINGEDGE,
+ HP_TRIG_SINGEDGECORNER1,
+ HP_TRIG_SINGEDGECORNER2,
+ HP_TRIG_SINGEDGECORNER12,
+ HP_TRIG_SINGEDGECORNER3,
+ HP_TRIG_SINGEDGECORNER13,
+ HP_TRIG_SINGEDGECORNER23,
+ HP_TRIG_SINGEDGECORNER123,
+ };
+ type = types[code];
+ pnums[0] = el.PNumMod (j);
+ pnums[1] = el.PNumMod (j+1);
+ pnums[2] = el.PNumMod (j+2);
+ break;
+ }
+
+
+ if (isedge1 && !isedge2 && isedge3)
+ {
+ if (!cp3)
+ {
+ if (!cp2) type = HP_TRIG_SINGEDGES;
+ else type = HP_TRIG_SINGEDGES2;
+ }
+ else
+ {
+ if (!cp2) type = HP_TRIG_SINGEDGES3;
+ else type = HP_TRIG_SINGEDGES23;
+ }
+
+ pnums[0] = el.PNumMod (j);
+ pnums[1] = el.PNumMod (j+1);
+ pnums[2] = el.PNumMod (j+2);
+ break;
+ }
+
+ if (isedge1 && isedge2 && isedge3)
+ {
+ type = HP_TRIG_3SINGEDGES;
+ pnums[0] = el.PNumMod (j);
+ pnums[1] = el.PNumMod (j+1);
+ pnums[2] = el.PNumMod (j+2);
+ break;
+ }
+ }
+ break;
+ }
+ case QUAD:
+ {
+ int ep1, ep2, ep3, ep4, cp1, cp2, cp3, cp4;
+ int isedge1, isedge2, isedge3, isedge4;
+ for (j = 1; j <= 4; j++)
+ {
+ ep1 = edgepoint.Test (el.PNumMod (j));
+ ep2 = edgepoint.Test (el.PNumMod (j+1));
+ ep3 = edgepoint.Test (el.PNumMod (j+2));
+ ep4 = edgepoint.Test (el.PNumMod (j+3));
+ if (mesh.GetDimension() == 2)
+ {
+ ep1 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j)));
+ ep2 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j+1)));
+ ep3 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j+2)));
+ ep4 = edgepoint_dom.Used (INDEX_2 (mesh.SurfaceElement(i).GetIndex(), el.PNumMod(j+3)));
+ }
+ cp1 = cornerpoint.Test (el.PNumMod (j));
+ cp2 = cornerpoint.Test (el.PNumMod (j+1));
+ cp3 = cornerpoint.Test (el.PNumMod (j+2));
+ cp4 = cornerpoint.Test (el.PNumMod (j+3));
+ ep1 |= cp1;
+ ep2 |= cp2;
+ ep3 |= cp3;
+ ep4 |= cp4;
+
-// HP_TET_0E_4V
-int reftet_0e_4v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 4, 1, 14 },
- { 4, 2, 15 },
- { 4, 3, 16 },
- { 0, 0, 0 }
-};
-int reftet_0e_4v_splitfaces[][4] =
- {
- { 1, 2, 3, 17 },
- { 1, 2, 4, 18 },
- { 1, 3, 4, 19 },
-
- { 2, 1, 3, 20 },
- { 2, 1, 4, 21 },
- { 2, 3, 4, 22 },
-
- { 3, 1, 2, 23 },
- { 3, 1, 4, 24 },
- { 3, 2, 4, 25 },
-
- { 4, 1, 2, 26 },
- { 4, 1, 3, 27 },
- { 4, 2, 3, 28 },
- { 0, 0, 0, 0 },
- };
-int reftet_0e_4v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 29 },
- { 2, 3, 4, 1, 30 },
- { 3, 4, 1, 2, 31 },
- { 4, 1, 2, 3, 32 },
- { 0 },
- };
-HPREF_ELEMENT_TYPE reftet_0e_4v_newelstypes[] =
-{
- HP_HEX_0E_1V,
- HP_HEX_0E_1V,
- HP_HEX_0E_1V,
- HP_HEX_0E_1V,
- HP_PRISM, HP_PRISM,
- HP_PRISM, HP_PRISM,
- HP_PRISM, HP_PRISM,
- HP_PRISM, HP_PRISM,
- HP_PRISM, HP_PRISM,
- HP_PRISM, HP_PRISM,
- /*
- HP_HEX,
- HP_HEX,
- HP_HEX,
- HP_HEX,
- HP_HEX,
- HP_HEX,
- */
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_TET,
- HP_NONE,
-};
-int reftet_0e_4v_newels[][8] =
-{
- { 1, 5, 17, 6, 7, 18, 29, 19 },
- { 2, 9, 20, 8, 10, 22, 30, 21 },
- { 3, 11, 23, 12, 13, 24, 31, 25 },
- { 4, 15, 26, 14, 16, 28, 32, 27 },
- { 5, 17, 18, 8, 20, 21 },
- { 18, 17, 29, 21, 20, 30 },
- { 6, 19, 17, 11, 24, 23 },
- { 17, 19, 29, 23, 24, 31 },
- { 7, 18, 19, 14, 26, 27 },
- { 19, 18, 29, 27, 26, 32 },
- { 9, 20, 22, 12, 23, 25 },
- { 22, 20, 30, 25, 23, 31 },
- { 10, 22, 21, 15, 28, 26 },
- { 21, 22, 30, 26, 28, 32 },
- { 13, 24, 25, 16, 27, 28 },
- { 25, 24, 31, 28, 27, 32 },
- /*
- { 5, 17, 29, 18, 8, 20, 30, 21 },
- { 6, 19, 29, 17, 11, 24, 31, 23 },
- { 7, 18, 29, 19, 14, 26, 32, 27 },
- { 9, 20, 30, 22, 12, 23, 31, 25 },
- { 10, 22, 30, 21, 15, 28, 32, 26 },
- { 13, 24, 31, 25, 16, 27, 32, 28 },
- */
- { 17, 20, 23, 29, 30, 31 },
- { 18, 26, 21, 29, 32, 30 },
- { 19, 24, 27, 29, 31, 32 },
- { 22, 28, 25, 30, 32, 31 },
-
- { 29, 30, 31, 32 },
-};
-HPRef_Struct reftet_0e_4v =
-{
- HP_TET,
- reftet_0e_4v_splitedges,
- reftet_0e_4v_splitfaces,
- reftet_0e_4v_splitelements,
- reftet_0e_4v_newelstypes,
- reftet_0e_4v_newels
-};
+ INDEX_2 i2;
+ i2 = INDEX_2(el.PNumMod (j), el.PNumMod (j+1));
+ // i2.Sort();
+ isedge1 = edges.Used (i2);
+ i2 = INDEX_2(el.PNumMod (j+1), el.PNumMod (j+2));
+ // i2.Sort();
+ isedge2 = edges.Used (i2);
+ i2 = INDEX_2(el.PNumMod (j+2), el.PNumMod (j+3));
+ // i2.Sort();
+ isedge3 = edges.Used (i2);
+ i2 = INDEX_2(el.PNumMod (j+3), el.PNumMod (j+4));
+ // i2.Sort();
+ isedge4 = edges.Used (i2);
+
+ int sumcp = cp1 + cp2 + cp3 + cp4;
+ int sumep = ep1 + ep2 + ep3 + ep4;
+ int sumedge = isedge1 + isedge2 + isedge3 + isedge4;
+ switch (sumedge)
+ {
+ case 0:
+ {
+ switch (sumep)
+ {
+ case 0:
+ type = HP_QUAD;
+ break;
+ case 1:
+ if (ep1) type = HP_QUAD_SINGCORNER;
+ break;
+ case 2:
+ {
+ if (ep1 && ep2) type = HP_QUAD_0E_2VA;
+ if (ep1 && ep3) type = HP_QUAD_0E_2VB;
+ break;
+ }
+ case 3:
+ if (!ep4) type = HP_QUAD_0E_3V;
+ break;
+ case 4:
+ type = HP_QUAD_0E_4V;
+ break;
+ }
+ break;
+ }
+ case 1:
+ {
+ if (isedge1)
+ {
+ switch (cp1+cp2+ep3+ep4)
+ {
+ case 0:
+ type = HP_QUAD_SINGEDGE;
+ break;
+ case 1:
+ {
+ if (cp1) type = HP_QUAD_1E_1VA;
+ if (cp2) type = HP_QUAD_1E_1VB;
+ if (ep3) type = HP_QUAD_1E_1VC;
+ if (ep4) type = HP_QUAD_1E_1VD;
+ break;
+ }
+ case 2:
+ {
+ if (cp1 && cp2) type = HP_QUAD_1E_2VA;
+ if (cp1 && ep3) type = HP_QUAD_1E_2VB;
+ if (cp1 && ep4) type = HP_QUAD_1E_2VC;
+ if (cp2 && ep3) type = HP_QUAD_1E_2VD;
+ if (cp2 && ep4) type = HP_QUAD_1E_2VE;
+ if (ep3 && ep4) type = HP_QUAD_1E_2VF;
+ break;
+ }
+ case 3:
+ {
+ if (cp1 && cp2 && ep3) type = HP_QUAD_1E_3VA;
+ if (cp1 && cp2 && ep4) type = HP_QUAD_1E_3VB;
+ if (cp1 && ep3 && ep4) type = HP_QUAD_1E_3VC;
+ if (cp2 && ep3 && ep4) type = HP_QUAD_1E_3VD;
+ break;
+ }
+ case 4:
+ {
+ type = HP_QUAD_1E_4V;
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case 2:
+ {
+ if (isedge1 && isedge4)
+ {
+ if (!cp2 && !ep3 && !cp4)
+ type = HP_QUAD_2E;
+
+ if (cp2 && !ep3 && !cp4)
+ type = HP_QUAD_2E_1VA;
+ if (!cp2 && ep3 && !cp4)
+ type = HP_QUAD_2E_1VB;
+ if (!cp2 && !ep3 && cp4)
+ type = HP_QUAD_2E_1VC;
+
+ if (cp2 && ep3 && !cp4)
+ type = HP_QUAD_2E_2VA;
+ if (cp2 && !ep3 && cp4)
+ type = HP_QUAD_2E_2VB;
+ if (!cp2 && ep3 && cp4)
+ type = HP_QUAD_2E_2VC;
+
+ if (cp2 && ep3 && cp4)
+ type = HP_QUAD_2E_3V;
+ }
+ if (isedge1 && isedge3)
+ {
+ switch (sumcp)
+ {
+ case 0:
+ type = HP_QUAD_2EB_0V; break;
+ case 1:
+ {
+ if (cp1) type = HP_QUAD_2EB_1VA;
+ if (cp2) type = HP_QUAD_2EB_1VB;
+ break;
+ }
+ case 2:
+ {
+ if (cp1 && cp2) { type = HP_QUAD_2EB_2VA; }
+ if (cp1 && cp3) { type = HP_QUAD_2EB_2VB; }
+ if (cp1 && cp4) { type = HP_QUAD_2EB_2VC; }
+ if (cp2 && cp4) { type = HP_QUAD_2EB_2VD; }
+ break;
+ }
+ case 3:
+ {
+ if (cp1 && cp2 && cp3) { type = HP_QUAD_2EB_3VA; }
+ if (cp1 && cp2 && cp4) { type = HP_QUAD_2EB_3VB; }
+ break;
+ }
+ case 4:
+ {
+ type = HP_QUAD_2EB_4V; break;
+ }
+ }
+ }
+ break;
+ }
+ case 3:
+ {
+ if (isedge1 && isedge2 && isedge4)
+ {
+ if (!cp3 && !cp4) type = HP_QUAD_3E;
+ if (cp3 && !cp4) type = HP_QUAD_3E_3VA;
+ if (!cp3 && cp4) type = HP_QUAD_3E_3VB;
+ if (cp3 && cp4) type = HP_QUAD_3E_4V;
+ }
+ break;
+ }
+ case 4:
+ {
+ type = HP_QUAD_4E;
+ break;
+ }
+ }
+ if (type != HP_NONE)
+ {
+ pnums[0] = el.PNumMod (j);
+ pnums[1] = el.PNumMod (j+1);
+ pnums[2] = el.PNumMod (j+2);
+ pnums[3] = el.PNumMod (j+3);
+ break;
+ }
+ }
+ if (type == HP_NONE)
+ {
+ (*testout) << "undefined element" << endl
+ << "cp = " << cp1 << cp2 << cp3 << cp4 << endl
+ << "ep = " << ep1 << ep2 << ep3 << ep4 << endl
+ << "isedge = " << isedge1 << isedge2 << isedge3
+ << isedge4 << endl;
+ }
+ break;
+ }
+ }
+ if (type == HP_NONE)
+ {
+ cerr << "undefined QUAD type" << endl;
+ for (j = 0; j < 4; j++)
+ pnums[j] = el[j];
+ }
+ HPRefElement hpel;
+ hpel.type = type;
+ for (j = 0; j < 8; j++)
+ hpel.pnums[j] = pnums[j];
+ hpel.index = el.GetIndex();
+ hpel.level = 1;
+ hpel.coarse_elnr = i-1;
+ static const double points[3][2] =
+ { { 1, 0 }, { 0, 1 }, { 0, 0 } };
+ for (j = 0; j < 3; j++)
+ for (k = 0; k < 3; k++)
+ if (pnums[j] == el[k])
+ {
+ hpel.param[j][0] = points[k][0];
+ hpel.param[j][1] = points[k][1];
+ }
+ elements.Append (hpel);
+ }
+
+
+
+
+ for (int i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ Segment & seg = mesh.LineSegment(i);
+
+ HPREF_ELEMENT_TYPE type = HP_NONE;
+ int cp1 = cornerpoint.Test (seg.p1);
+ int cp2 = cornerpoint.Test (seg.p2);
+ INDEX_2 i2;
+ i2 = INDEX_2(seg.p1, seg.p2);
+ i2.Sort();
+ if (!edges.Used (i2))
+ {
+ cp1 = edgepoint.Test (seg.p1);
+ cp2 = edgepoint.Test (seg.p2);
+ }
+ HPRefElement hpel;
+ hpel.index = seg.edgenr + 10000 * seg.si;
+ hpel.level = 1;
+
+ hpel.pnums[0] = seg.p1;
+ hpel.pnums[1] = seg.p2;
+ hpel.param[0][0] = seg.epgeominfo[0].dist;
+ hpel.param[1][0] = seg.epgeominfo[1].dist;
+
+ if (!cp1 && !cp2)
+ hpel.type = HP_SEGM;
+ else if (cp1 && !cp2)
+ hpel.type = HP_SEGM_SINGCORNERL;
+ else if (!cp1 && cp2)
+ hpel.type = HP_SEGM_SINGCORNERR;
+ else
+ hpel.type = HP_SEGM_SINGCORNERS;
+ (*testout) << "refine segment " << seg << ", hptype= " << hpel.type << endl;
+ elements.Append (hpel);
+ (*testout) << "add seg: " << endl << seg << endl;
+ (*testout) << "param = " << elements.Last().param[0][0] << ", " << elements.Last().param[1][0] << endl;
+ }
+ }
-/* *********** Tet - Refinement - 1 edge *************** */
+
+ /* ******************************* DoRefinement *************************************** */
+ // parameter "fine": false ... divide elements by a factor of 3/4 to 1/4
+ // true ... divide by 7/8 to 1/8
-// HP_TET_1E_0V
-int reftet_1e_0v_splitedges[][3] =
-{
- { 1, 3, 5 },
- { 1, 4, 6 },
- { 2, 3, 7 },
- { 2, 4, 8 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_0v_newelstypes[] =
-{
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_NONE,
-};
-int reftet_1e_0v_newels[][8] =
-{
- { 1, 5, 6, 2, 7, 8 },
- { 7, 3, 5, 8, 4, 6 }
-};
-HPRef_Struct reftet_1e_0v =
-{
- HP_TET,
- reftet_1e_0v_splitedges,
- 0, 0,
- reftet_1e_0v_newelstypes,
- reftet_1e_0v_newels
-};
+ void DoRefinement (Mesh & mesh, ARRAY<HPRefElement> & elements,
+ Refinement * ref, bool fine)
+ {
+ INDEX_2_HASHTABLE<int> newpts(elements.Size()+1);
+ INDEX_3_HASHTABLE<int> newfacepts(elements.Size()+1);
+
+ // prepare new points
+
+ int oldelsize = elements.Size();
+ for (int i = 0; i < oldelsize; i++)
+ {
+ HPRefElement & el = elements[i];
+ HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
+ if (!hprs)
+ {
+ cout << "Refinementstruct not defined for element " << el.type << endl;
+ continue;
+ }
+ int j = 0;
+ while (hprs->splitedges[j][0])
+ {
+ INDEX_2 i2(el.pnums[hprs->splitedges[j][0]-1],
+ el.pnums[hprs->splitedges[j][1]-1]);
+ if (!newpts.Used (i2))
+ {
+ Point3d np = Center (mesh.Point (i2.I1()),
+ mesh.Point (i2.I2()));
+ np = Center (mesh.Point (i2.I1()),np);
+ if ( fine ) np = Center (mesh.Point (i2.I1()),np);
+ int npi = mesh.AddPoint (np);
+ newpts.Set (i2, npi);
+ }
+ j++;
+ }
-// HP_TET_1E_1VA
-int reftet_1e_1va_splitedges[][3] =
-{
- { 1, 3, 5 },
- { 1, 4, 6 },
- { 2, 3, 7 },
- { 2, 4, 8 },
- { 1, 2, 9 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_1va_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_NONE,
-};
-int reftet_1e_1va_newels[][8] =
-{
- { 1, 9, 5, 6 },
- { 9, 5, 6, 2, 7, 8 },
- { 7, 3, 5, 8, 4, 6 }
-};
-HPRef_Struct reftet_1e_1va =
-{
- HP_TET,
- reftet_1e_1va_splitedges,
- 0, 0,
- reftet_1e_1va_newelstypes,
- reftet_1e_1va_newels
-};
+ j = 0;
+ if (hprs->splitfaces)
+ while (hprs->splitfaces[j][0])
+ {
+ INDEX_3 i3(el.pnums[hprs->splitfaces[j][0]-1],
+ el.pnums[hprs->splitfaces[j][1]-1],
+ el.pnums[hprs->splitfaces[j][2]-1]);
+ if (i3.I2() > i3.I3()) Swap (i3.I2(), i3.I3());
+ if (!newfacepts.Used (i3))
+ {
+ Point3d np = Center (mesh.Point (i3.I2()),
+ mesh.Point (i3.I3()));
+ np = Center (mesh.Point (i3.I1()),np);
+ if ( fine ) np = Center (mesh.Point (i3.I1()),np);
+ int npi = mesh.AddPoint (np);
+ newfacepts.Set (i3, npi);
+ }
+ j++;
+ }
+ }
+
+ for (int i = 0; i < oldelsize; i++)
+ {
+ HPRefElement & el = elements[i];
+ HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
+ int newlevel = el.level + 1;
+
+ if (el.type == HP_SEGM ||
+ el.type == HP_TRIG ||
+ el.type == HP_QUAD ||
+ el.type == HP_TET ||
+ el.type == HP_PRISM ||
+ el.type == HP_HEX)
+ newlevel = el.level;
+
+ if (!hprs) continue;
+
+ int newpnums[64];
+ double newparam[64][3];
+
+ int j;
+ for (j = 0; j < 8; j++)
+ {
+ newpnums[j] = el.pnums[j];
+ for (int l = 0; l < 3; l++)
+ newparam[j][l] = el.param[j][l];
+ }
+ // split edges, incl. transferring curvature
+ j = 0;
+ while (hprs->splitedges[j][0])
+ {
+ INDEX_2 i2(el.pnums[hprs->splitedges[j][0]-1],
+ el.pnums[hprs->splitedges[j][1]-1]);
+ int npi = newpts.Get(i2);
+ newpnums[hprs->splitedges[j][2]-1] = npi;
-// HP_TET_1E_1VB
-int reftet_1e_1vb_splitedges[][3] =
-{
- { 1, 3, 5 },
- { 1, 4, 6 },
- { 2, 3, 7 },
- { 2, 4, 8 },
- { 4, 1, 9 },
- { 4, 2, 10 },
- { 4, 3, 11 },
- { 0, 0, 0 }
-};
-int reftet_1e_1vb_splitelements[][5] =
-{
- { 4, 1, 2, 3, 12 },
- { 0 }
-};
+ double fac1, fac2;
+ if ( fine ) { fac1 = 0.875; fac2 = 0.125; }
+ else { fac1 = 0.75; fac2 = 0.25; }
-HPREF_ELEMENT_TYPE reftet_1e_1vb_newelstypes[] =
-{
- HP_PRISM_SINGEDGE,
- HP_TET_0E_1V,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_NONE,
-};
-int reftet_1e_1vb_newels[][8] =
-{
- { 1, 5, 6, 2, 7, 8 },
- { 4, 11, 10, 9 },
- { 7, 8, 10, 11, 12 },
- { 3, 7, 11, 12 },
- { 5, 11, 9, 6, 12 },
- { 5, 3, 11, 12 },
- { 6, 9, 10, 8, 12 },
- { 5, 7, 3, 12 },
- { 5, 6, 8, 7, 12 },
- { 9, 11, 10, 12 }
-};
-HPRef_Struct reftet_1e_1vb =
-{
- HP_TET,
- reftet_1e_1vb_splitedges,
- 0,
- reftet_1e_1vb_splitelements,
- reftet_1e_1vb_newelstypes,
- reftet_1e_1vb_newels
-};
+ for (int l = 0; l < 3; l++)
+ newparam[hprs->splitedges[j][2]-1][l] =
+ fac1 * el.param[hprs->splitedges[j][0]-1][l] +
+ fac2 * el.param[hprs->splitedges[j][1]-1][l];
+
+ j++;
+ }
+ // split faces
+ j = 0;
+ if (hprs->splitfaces)
+ while (hprs->splitfaces[j][0])
+ {
+ INDEX_3 i3(el.pnums[hprs->splitfaces[j][0]-1],
+ el.pnums[hprs->splitfaces[j][1]-1],
+ el.pnums[hprs->splitfaces[j][2]-1]);
+ if (i3.I2() > i3.I3())
+ Swap (i3.I2(), i3.I3());
+ int npi = newfacepts.Get(i3);
+ newpnums[hprs->splitfaces[j][3]-1] = npi;
+
+ double fac1, fac2;
+ if ( fine ) { fac1 = 0.75; fac2 = 0.125; }
+ else { fac1 = 0.5; fac2 = 0.25; }
+
+ for (int l = 0; l < 3; l++)
+ newparam[hprs->splitfaces[j][3]-1][l] =
+ fac1 * el.param[hprs->splitfaces[j][0]-1][l] +
+ fac2 * el.param[hprs->splitfaces[j][1]-1][l] +
+ fac2 * el.param[hprs->splitfaces[j][2]-1][l];
+ j++;
+ }
+ // split elements
+ j = 0;
+ if (hprs->splitelements)
+ while (hprs->splitelements[j][0])
+ {
+ int pi1 = el.pnums[hprs->splitelements[j][0]-1];
+ Point3d np =
+ Center (Center (mesh.Point (pi1),
+ mesh.Point (el.pnums[hprs->splitelements[j][1]-1])),
+ Center (mesh.Point (el.pnums[hprs->splitelements[j][2]-1]),
+ mesh.Point (el.pnums[hprs->splitelements[j][3]-1])));
+ // divide once more, if fine subdivision is wanted
+ if ( fine ) np = Center (mesh.Point (pi1),np);
+ int npi = mesh.AddPoint (np);
+ newpnums[hprs->splitelements[j][4]-1] = npi;
+ double fac1, fac2;
+ if ( fine ) { fac1 = 0.625; fac2 = 0.125; }
+ else { fac1 = 0.25; fac2 = 0.25; }
+ for (int l = 0; l < 3; l++)
+ newparam[hprs->splitelements[j][4]-1][l] =
+ fac1 * el.param[hprs->splitelements[j][0]-1][l] +
+ fac2 * el.param[hprs->splitelements[j][1]-1][l] +
+ fac2 * el.param[hprs->splitelements[j][2]-1][l] +
+ fac2 * el.param[hprs->splitelements[j][3]-1][l];
+ j++;
+ }
+ j = 0;
+ while (hprs->neweltypes[j])
+ {
+ HPRefElement newel;
+ newel.type = hprs->neweltypes[j];
+ for (int k = 0; k < 8; k++)
+ newel.pnums[k] = newpnums[hprs->newels[j][k]-1];
+ newel.index = elements[i].index;
+ newel.coarse_elnr = elements[i].coarse_elnr;
+ newel.level = newlevel;
-// HP_TET_1E_2VA
-int reftet_1e_2va_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_2va_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_NONE,
-};
-int reftet_1e_2va_newels[][8] =
-{
- { 1, 5, 6, 7 },
- { 2, 8, 10, 9 },
- { 5, 6, 7, 8, 9, 10 },
- { 4, 10, 7, 3, 9, 6 },
-};
-HPRef_Struct reftet_1e_2va =
-{
- HP_TET,
- reftet_1e_2va_splitedges,
- 0, 0,
- reftet_1e_2va_newelstypes,
- reftet_1e_2va_newels
-};
+ for (int k = 0; k < 8; k++)
+ for (int l = 0; l < 3; l++)
+ newel.param[k][l] = newparam[hprs->newels[j][k]-1][l];
+ if (j == 0)
+ elements[i] = newel;
+ else
+ elements.Append (newel);
+ j++;
+ }
+ }
+ }
-// HP_TET_1E_2VB
-int reftet_1e_2vb_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 8 },
- { 2, 4, 9 },
- { 3, 1, 10 },
- { 3, 2, 11 },
- { 3, 4, 12 },
- { 0, 0, 0 }
-};
-int reftet_1e_2vb_splitelements[][5] =
-{
- { 3, 4, 1, 2, 13 },
- { 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_2vb_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_TET_0E_1V,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_NONE,
-};
-int reftet_1e_2vb_newels[][8] =
-{
- { 1, 5, 6, 7 },
- { 5, 6, 7, 2, 8, 9 },
- { 3, 10, 11, 12 },
-
- { 8, 9, 12, 11, 13 },
- { 4, 12, 9, 13 },
- { 6, 10, 12, 7, 13 },
- { 4, 7, 12, 13 },
- { 6, 8, 11, 10, 13 },
- { 4, 9, 7, 13 },
- { 6, 7, 9, 8, 13 },
- { 10, 11, 12, 13 },
-};
-HPRef_Struct reftet_1e_2vb =
-{
- HP_TET,
- reftet_1e_2vb_splitedges,
- 0,
- reftet_1e_2vb_splitelements,
- reftet_1e_2vb_newelstypes,
- reftet_1e_2vb_newels
-};
+ /* ************************** DoRefineDummies ******************************** */
+ void DoRefineDummies (Mesh & mesh, ARRAY<HPRefElement> & elements,
+ Refinement * ref)
+ {
+ int oldelsize = elements.Size();
+
+ for (int i = 0; i < oldelsize; i++)
+ {
+ HPRefElement & el = elements[i];
+ HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
+ if (!hprs) continue;
+
+ if (el.type != HP_DUMMY_QUAD_SINGCORNER &&
+ el.type != HP_PYRAMID_EDGES &&
+ el.type != HP_PYRAMID_0E_1V &&
+ el.type != HP_HEX_0E_1V &&
+ el.type != HP_HEX_1E_1V &&
+ el.type != HP_HEX_1E_0V &&
+ el.type != HP_HEX_3E_0V
+ ) continue;
+
+ int newlevel = el.level;
+
+ int newpnums[8];
+ int j;
+ for (j = 0; j < 8; j++)
+ newpnums[j] = el.pnums[j];
+
+ double newparam[8][3];
+ for (j = 0; j < 8; j++)
+ for (int k = 0; k < 3; k++)
+ newparam[j][k] = el.param[j][k];
+
+ j = 0;
+ while (hprs->neweltypes[j])
+ {
+ HPRefElement newel;
+ newel.type = hprs->neweltypes[j];
+ for (int k = 0; k < 8; k++)
+ newel.pnums[k] = newpnums[hprs->newels[j][k]-1];
+ newel.index = el.index;
+ newel.coarse_elnr = el.coarse_elnr;
+ newel.level = newlevel;
+
+ for (int k = 0; k < 8; k++)
+ for (int l = 0; l < 3; l++)
+ newel.param[k][l] = newparam[hprs->newels[j][k]-1][l];
+
+ if (j == 0)
+ elements[i] = newel;
+ else
+ elements.Append (newel);
+ j++;
+ }
+ }
+ }
-// HP_TET_1E_2VC
-int reftet_1e_2vc_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 8 },
- { 2, 4, 9 },
- { 4, 1, 10 },
- { 4, 2, 11 },
- { 4, 3, 12 },
- { 0, 0, 0 }
-};
-int reftet_1e_2vc_splitelements[][5] =
-{
- { 4, 1, 2, 3, 13 },
- { 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_2vc_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_TET_0E_1V,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_PYRAMID,
- HP_TET,
- HP_NONE,
-};
-int reftet_1e_2vc_newels[][8] =
-{
- { 1, 5, 6, 7 },
- { 5, 6, 7, 2, 8, 9 },
- { 4, 11, 10, 12 },
- { 8, 9, 11, 12, 13 },
- { 3, 8, 12, 13 },
- { 7, 6, 12, 10, 13 },
- { 3, 12, 6, 13 },
- { 9, 7, 10, 11, 13 },
- { 3, 6, 8, 13 },
- { 6, 7, 9, 8, 13 },
- { 10, 12, 11, 13 }
-};
-HPRef_Struct reftet_1e_2vc =
-{
- HP_TET,
- reftet_1e_2vc_splitedges,
- 0,
- reftet_1e_2vc_splitelements,
- reftet_1e_2vc_newelstypes,
- reftet_1e_2vc_newels
-};
+ void SubdivideDegeneratedHexes (Mesh & mesh, ARRAY<HPRefElement> & elements)
+ {
+ int oldne = elements.Size();
+ for (int i = 0; i < oldne; i++)
+ if (Get_HPRef_Struct (elements[i].type)->geom == HP_HEX)
+ {
+ bool common = 0;
+ for (int j = 0; j < 8; j++)
+ for (int k = 0; k < j; k++)
+ if (elements[i].pnums[j] == elements[i].pnums[k])
+ common = 1;
+ if (common)
+ {
+ HPRefElement el = elements[i];
+ Point<3> center(0,0,0);
+ double newparam[3] = { 0, 0, 0 };
+ for (int j = 0; j < 8; j++)
+ {
+ center += 0.125 * Vec<3> (mesh[el.pnums[j]]);
+ for (int l = 0; l < 3; l++)
+ newparam[l] += 0.125 * el.param[j][l];
+ }
+ int npi = mesh.AddPoint (center);
+ const ELEMENT_FACE * faces = MeshTopology::GetFaces (HEX);
+ for (int j = 0; j < 6; j++)
+ {
+ ARRAY<int> pts;
+ for (int k = 0; k < 4; k++)
+ {
+ bool same = 0;
+ for (int l = 0; l < pts.Size(); l++)
+ if (el.pnums[pts[l]] == el.pnums[faces[j][k]-1])
+ same = 1;
+ if (!same)
+ pts.Append (faces[j][k]-1);
+ }
+
+ HPRefElement newel = el;
+ if (pts.Size() == 3)
+ {
+ for (int k = 0; k < 3; k++)
+ {
+ newel.pnums[k] = el.pnums[pts[2-k]];
+ for (int l = 0; l < 3; l++)
+ newel.param[k][l] = el.param[pts[2-k]][l];
+ }
+ newel.pnums[3] = npi;
+ for (int l = 0; l < 3; l++)
+ newel.param[3][l] = newparam[l];
+
+ newel.type = HP_TET;
+ }
+ else
+ {
+ for (int k = 0; k < 4; k++)
+ {
+ newel.pnums[k] = el.pnums[pts[3-k]];
+ for (int l = 0; l < 3; l++)
+ newel.param[k][l] = el.param[pts[3-k]][l];
+ }
+
+ newel.pnums[4] = npi;
+ for (int l = 0; l < 3; l++)
+ newel.param[4][l] = newparam[l];
+
+ newel.type = HP_PYRAMID;
+ }
+
+ if (j == 0)
+ elements[i] = newel;
+ else
+ elements.Append (newel);
+ }
+ }
+ }
+ }
+ void CalcStatistics (ARRAY<HPRefElement> & elements)
+ {
+ return;
+
+ int i, p;
+ int nsegm = 0, ntrig = 0, nquad = 0;
+ int nhex = 0, nprism = 0, npyramid = 0, ntet = 0;
+ int maxlevel = 0;
+
+ for (i = 1; i <= elements.Size(); i++)
+ {
+ const HPRefElement & el = elements.Get(i);
+ maxlevel = max2 (el.level, maxlevel);
+ switch (Get_HPRef_Struct (el.type)->geom)
+ {
+ case HP_SEGM:
-// HP_TET_1E_2VD
-int reftet_1e_2vd_splitedges[][3] =
-{
- { 1, 3, 5 },
- { 1, 4, 6 },
- { 2, 3, 7 },
- { 2, 4, 8 },
- { 3, 1, 9 },
- { 3, 2, 10 },
- { 3, 4, 11 },
- { 4, 1, 12 },
- { 4, 2, 13 },
- { 4, 3, 14 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE reftet_1e_2vd_newelstypes[] =
-{
- HP_PRISM_SINGEDGE,
- HP_TET_0E_1V,
- HP_TET_0E_1V,
- HP_PRISM,
- HP_HEX,
- HP_NONE,
-};
-int reftet_1e_2vd_newels[][8] =
-{
- { 1, 5, 6, 2, 7, 8 },
- { 4, 13, 12, 14 },
- { 3, 10, 11, 9 },
- { 14, 13, 12, 11, 10, 9 },
- { 6, 12, 13, 8, 5, 9, 10, 7 },
-};
-HPRef_Struct reftet_1e_2vd =
-{
- HP_TET,
- reftet_1e_2vd_splitedges,
- 0, 0,
- reftet_1e_2vd_newelstypes,
- reftet_1e_2vd_newels
-};
+ {
+ nsegm++;
+ break;
+ }
+ case HP_TRIG:
+ {
+ ntrig ++;
+ break;
+ }
+ case HP_QUAD:
+ {
+ nquad++;
+ break;
+ }
+ case HP_TET:
+ {
+ ntet++;
+ break;
+ }
+ case HP_PRISM:
+ {
+ nprism++;
+ break;
+ }
+ case HP_PYRAMID:
+ {
+ npyramid++;
+ break;
+ }
+ case HP_HEX:
+ {
+ nhex++;
+ break;
+ }
+ default:
+ {
+ cerr << "statistics error, unknown element type" << endl;
+ }
+ }
+ }
+
+ cout << "level = " << maxlevel << endl;
+ cout << "nsegm = " << nsegm << endl;
+ cout << "ntrig = " << ntrig << ", nquad = " << nquad << endl;
+ cout << "ntet = " << ntet << ", npyr = " << npyramid
+ << ", nprism = " << nprism << ", nhex = " << nhex << endl;
+
+ return;
+
+ double memcost = 0, cpucost = 0;
+ for (p = 1; p <= 20; p++)
+ {
+ memcost = (ntet + nprism + nhex) * pow (static_cast<double>(p), 6.0);
+ cpucost = (ntet + nprism + nhex) * pow (static_cast<double>(p), 9.0);
+ cout << "costs for p = " << p << ": mem = " << memcost << ", cpu = " << cpucost << endl;
+ }
+
+ double memcosttet = 0;
+ double memcostprism = 0;
+ double memcosthex = 0;
+ double memcostsctet = 0;
+ double memcostscprism = 0;
+ double memcostschex = 0;
+ double cpucosttet = 0;
+ double cpucostprism = 0;
+ double cpucosthex = 0;
+
+ for (i = 1; i <= elements.Size(); i++)
+ {
+ const HPRefElement & el = elements.Get(i);
+ switch (el.type)
+ {
+ case HP_TET:
+ case HP_TET_0E_1V:
+ case HP_TET_1E_0V:
+ case HP_TET_1E_1VA:
+ {
+ int p1 = maxlevel - el.level + 1;
+ (*testout) << "p1 = " << p1 << ", P1^6 = " << pow (static_cast<double>(p1), 6.0)
+ << " (p1-3)^6 = " << pow ( static_cast<double>(max2(p1-3, 0)), 6.0)
+ << " p1^3 = " << pow ( static_cast<double>(p1), 3.0)
+ << " (p1-3)^3 = " << pow ( static_cast<double>(p1-3), 3.0)
+ << " [p1^3-(p1-3)^3]^2 = " << sqr (pow (static_cast<double>(p1),3.0) - pow ( static_cast<double>(p1-3), 3.0))
+ << endl;
+
+ p1 /= 2 +1;
+ memcosttet += pow (static_cast<double>(p1), 6.0);
+ memcostsctet += pow (static_cast<double>(p1), 6.0) - pow ( static_cast<double>(max2(p1-3, 1)), 6.0);
+ cpucosttet += pow (static_cast<double>(p1), 9.0);
+ break;
+ }
+ case HP_PRISM:
+ case HP_PRISM_SINGEDGE:
+ {
+ int p1 = maxlevel - el.level + 1;
+ p1 /= 2 +1;
+ memcostprism += pow (static_cast<double>(p1), 6.0);
+ memcostscprism += pow (static_cast<double>(p1), 6.0) - pow ( static_cast<double>(max2(p1-3, 1)), 6.0);
+ cpucostprism += pow (static_cast<double>(p1), 9.0);
+ break;
+ }
+ case HP_HEX:
+ {
+ int p1 = maxlevel - el.level + 1;
+ int p2 = maxlevel;
+ p1 /= 2 +1;
+ p2 /= 2 +1;
+ memcosthex += pow (static_cast<double>(p1), 4.0) * pow (static_cast<double>(p2), 2.0);
+ memcostschex += pow (static_cast<double>(p1), 6.0) - pow ( static_cast<double>(max2(p1-2, 0)), 6.0);
+ cpucosthex += pow (static_cast<double>(p1), 6.0) * pow (static_cast<double>(p2), 3.0);
+ break;
+ }
+ default:
+ ;
+ }
+ }
+ cout << "TET: hp-memcost = " << memcosttet
+ << ", scmemcost = " << memcostsctet
+ << ", cpucost = " << cpucosttet
+ << endl;
+ cout << "PRI: hp-memcost = " << memcostprism
+ << ", scmemcost = " << memcostscprism
+ << ", cpucost = " << cpucostprism << endl;
+ cout << "HEX: hp-memcost = " << memcosthex
+ << ", scmemcost = " << memcostschex
+ << ", cpucost = " << cpucosthex << endl;
+ }
@@ -1626,2078 +2451,155 @@ HPRef_Struct reftet_1e_2vd =
+ /* ***************************** HPRefinement ********************************** */
-// HP_TET_2EA_0V, // 2 edges connected
-int reftet_2ea_0v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 0, 0, 0 }
-};
-int reftet_2ea_0v_splitfaces[][4] =
- {
- { 1, 2, 3, 17 },
- { 0, 0, 0, 0 }
- };
-HPREF_ELEMENT_TYPE reftet_2ea_0v_newelstypes[] =
+ void HPRefinement (Mesh & mesh, Refinement * ref, int levels)
{
- HP_PYRAMID_EDGES,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_TET,
- HP_NONE,
- };
-int reftet_2ea_0v_newels[][8] =
-{
- { 1, 5, 17, 6, 7 },
- { 5, 17, 7, 2, 9, 10 },
- { 6, 7, 17, 3, 13, 12 },
- { 17, 9, 12, 7, 10, 13 },
- { 7, 10, 13, 4 },
-};
-HPRef_Struct reftet_2ea_0v =
-{
- HP_TET,
- reftet_2ea_0v_splitedges,
- reftet_2ea_0v_splitfaces,
- 0,
- reftet_2ea_0v_newelstypes,
- reftet_2ea_0v_newels
-};
+ PrintMessage (1, "HP Refinement called, levels = ", levels);
+ // ARRAY<HPRefElement> hpelements;
+ delete mesh.hpelements;
+ mesh.hpelements = new ARRAY<HPRefElement>;
+ mesh.coarsemesh = new Mesh;
+ *mesh.coarsemesh = mesh;
-
-
-// HP_TET_2EA_1VB,
-int reftet_2ea_1vb_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 0, 0, 0 }
-};
-int reftet_2ea_1vb_splitfaces[][4] =
- {
- { 1, 2, 3, 17 },
- { 0, 0, 0, 0 }
- };
-HPREF_ELEMENT_TYPE reftet_2ea_1vb_newelstypes[] =
- {
- HP_PYRAMID_EDGES,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_TET,
- HP_NONE,
- };
-int reftet_2ea_1vb_newels[][8] =
-{
- { 1, 5, 17, 6, 7 },
- { 3, 11, 12, 13 },
- { 5, 17, 7, 2, 9, 10 },
- { 6, 7, 17, 11, 13, 12 },
- { 17, 9, 12, 7, 10, 13 },
- { 7, 10, 13, 4 },
-};
-HPRef_Struct reftet_2ea_1vb =
-{
- HP_TET,
- reftet_2ea_1vb_splitedges,
- reftet_2ea_1vb_splitfaces,
- 0,
- reftet_2ea_1vb_newelstypes,
- reftet_2ea_1vb_newels
-};
-
+ ARRAY<HPRefElement> & hpelements = *mesh.hpelements;
+ PrepareElements (mesh, hpelements);
+ for (int j = 1; j <= levels; j++)
+ {
+ cout << "hp-refine level " << j << flush;
+ // last parameter: true for fine subdivision (7/8 : 1/8), false for 3/4 : 1/4
+ // Please check into CVS only with this parameter set to "true"!
+ DoRefinement (mesh, hpelements, ref, true); // FB
+ DoRefineDummies (mesh, hpelements, ref);
+ CalcStatistics (hpelements);
+ cout << " done" << endl;
+ }
+ SubdivideDegeneratedHexes (mesh, hpelements);
+ mesh.ClearSegments();
+ mesh.ClearSurfaceElements();
+ mesh.ClearVolumeElements();
-
-// HP_TET_2EA_3V, // 2 edges connected
-int reftet_2ea_3v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 4, 1, 14 },
- { 4, 2, 15 },
- { 4, 3, 16 },
- { 0, 0, 0 }
-};
-int reftet_2ea_3v_splitfaces[][4] =
- {
- { 1, 2, 3, 17 },
- { 2, 3, 4, 18 },
- { 3, 4, 2, 19 },
- { 4, 2, 3, 20 },
- { 0, 0, 0, 0 }
- };
-int reftet_2ea_3v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 21 },
- { 0, 0, 0, 0 }
- };
-HPREF_ELEMENT_TYPE reftet_2ea_3v_newelstypes[] =
- {
- HP_PYRAMID_EDGES,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_TET_0E_1V,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
-
- HP_TET, HP_TET, HP_TET, HP_TET,
- HP_PYRAMID, HP_PYRAMID, HP_PYRAMID,
- HP_PYRAMID, HP_PYRAMID, HP_TET,
- HP_PYRAMID, HP_PYRAMID, HP_TET,
- // HP_PRISM,
- // HP_PRISM,
- HP_NONE,
- };
-int reftet_2ea_3v_newels[][8] =
-{
- { 1, 5, 17, 6, 7 },
- { 2, 8, 10, 9 },
- { 3, 11, 12, 13 },
- { 4, 15, 14, 16 },
- { 5, 17, 7, 8, 9, 10 },
- { 6, 7, 17, 11, 13, 12 },
-
- { 9, 10, 18, 21 },
- { 13, 12, 19, 21 },
- { 15, 16, 20, 21 },
- { 18, 20, 19, 21 },
- { 10, 15, 20, 18, 21 },
- { 13, 19, 20, 16, 21 },
- { 9, 18, 19, 12, 21 },
-
- { 7, 13, 16, 14, 21 },
- { 7, 14, 15, 10, 21 },
- { 9, 12, 17, 21 },
- { 7, 10, 9, 17, 21 },
- { 7, 17, 12, 13, 21 },
- { 14, 16, 15, 21 },
- // { 17, 9, 12, 7, 10, 13 },
- // { 7, 10, 13, 14, 15, 16 },
-};
-HPRef_Struct reftet_2ea_3v =
-{
- HP_TET,
- reftet_2ea_3v_splitedges,
- reftet_2ea_3v_splitfaces,
- reftet_2ea_3v_splitelements,
- reftet_2ea_3v_newelstypes,
- reftet_2ea_3v_newels
-};
-
-
-
-
-
-
-// HP_TET_2EB_4V, // 2 opposite edges
-int reftet_2eb_4v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 4, 1, 14 },
- { 4, 2, 15 },
- { 4, 3, 16 },
- { 0, 0, 0 }
-};
-
-HPREF_ELEMENT_TYPE reftet_2eb_4v_newelstypes[] =
- {
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_HEX,
- HP_NONE,
- };
-int reftet_2eb_4v_newels[][8] =
-{
- { 5, 6, 7, 8, 9, 10 },
- { 16, 15, 14, 13, 12, 11 },
- { 1, 5, 6, 7 },
- { 2, 8, 10, 9 },
- { 3, 13, 11, 12 },
- { 4, 16, 15, 14 },
- { 7, 14, 15, 10, 6, 11, 12, 9 }
-};
-HPRef_Struct reftet_2eb_4v =
-{
- HP_TET,
- reftet_2eb_4v_splitedges,
- 0, 0,
- reftet_2eb_4v_newelstypes,
- reftet_2eb_4v_newels
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// HP_TET_3EA_0V,
-int reftet_3ea_0v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 8 },
- { 2, 4, 9 },
- { 3, 2, 10 },
- { 3, 4, 11 },
- { 4, 2, 12 },
- { 4, 3, 13 },
- { 0, 0, 0 }
-};
-int reftet_3ea_0v_splitfaces[][4] =
- {
- { 1, 2, 3, 14 },
- { 1, 2, 4, 15 },
- { 1, 3, 4, 16 },
- { 2, 3, 4, 17 },
- { 3, 4, 2, 18 },
- { 4, 2, 3, 19 },
- { 0, 0, 0, 0 }
- };
-int reftet_3ea_0v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 20 },
- { 0 },
- };
-
-HPREF_ELEMENT_TYPE reftet_3ea_0v_newelstypes[] =
- {
- HP_HEX_3E_0V,
- HP_HEX_1E_0V,
- HP_HEX_1E_0V,
- HP_HEX_1E_0V,
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_TET,
- HP_NONE,
- };
-int reftet_3ea_0v_newels[][8] =
-{
- { 1, 5, 14, 6, 7, 15, 20, 16 },
- { 5, 2, 8, 14, 15, 9, 17, 20 },
- { 3, 6, 14, 10, 11, 16, 20, 18 },
- { 7, 4, 12, 15, 16, 13, 19, 20 },
- { 11, 13, 16, 18, 19, 20 },
- { 15, 12, 9, 20, 19, 17 },
- { 8, 10, 14, 17, 18, 20 },
- { 20, 17, 18, 19 },
-};
-HPRef_Struct reftet_3ea_0v =
-{
- HP_TET,
- reftet_3ea_0v_splitedges,
- reftet_3ea_0v_splitfaces,
- reftet_3ea_0v_splitelements,
- reftet_3ea_0v_newelstypes,
- reftet_3ea_0v_newels
-};
-
-
-
-
-
-
-
-// HP_TET_3EA_3V,
-int reftet_3ea_3v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 8 },
- { 2, 4, 9 },
- { 3, 2, 10 },
- { 3, 4, 11 },
- { 4, 2, 12 },
- { 4, 3, 13 },
- { 2, 1, 21 },
- { 3, 1, 22 },
- { 4, 1, 23 },
- { 0, 0, 0 }
-};
-int reftet_3ea_3v_splitfaces[][4] =
- {
- { 1, 2, 3, 14 },
- { 1, 2, 4, 15 },
- { 1, 3, 4, 16 },
- { 2, 3, 4, 17 },
- { 3, 4, 2, 18 },
- { 4, 2, 3, 19 },
- { 0, 0, 0, 0 }
- };
-int reftet_3ea_3v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 20 },
- { 0 },
- };
-
-HPREF_ELEMENT_TYPE reftet_3ea_3v_newelstypes[] =
- {
- HP_HEX_3E_0V,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM,
-
- HP_PRISM,
- HP_PRISM,
- HP_PRISM,
- HP_TET,
- HP_NONE,
- };
-int reftet_3ea_3v_newels[][8] =
-{
- { 1, 5, 14, 6, 7, 15, 20, 16 },
-
- { 2, 21, 9, 8 },
- { 5, 14, 15, 21, 8, 9 },
- { 15, 14, 20, 9, 8, 17 },
- { 3, 22, 10, 11 },
- { 6, 16, 14, 22, 11, 10 },
- { 14, 16, 20, 10, 11, 18 },
- { 4, 23, 13, 12 },
- { 7, 15, 16, 23, 12, 13 },
- { 16, 15, 20, 13, 12, 19 },
-
- { 11, 13, 16, 18, 19, 20 },
- { 15, 12, 9, 20, 19, 17 },
- { 8, 10, 14, 17, 18, 20 },
- { 20, 17, 18, 19 },
-};
-HPRef_Struct reftet_3ea_3v =
-{
- HP_TET,
- reftet_3ea_3v_splitedges,
- reftet_3ea_3v_splitfaces,
- reftet_3ea_3v_splitelements,
- reftet_3ea_3v_newelstypes,
- reftet_3ea_3v_newels
-};
-
-
-
-
-
-
-
-// HP_TET_3EV_2V,
-int reftet_3eb_2v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 4, 1, 14 },
- { 4, 2, 15 },
- { 4, 3, 16 },
- { 0, 0, 0 }
-};
-int reftet_3eb_2v_splitfaces[][4] =
- {
- { 1, 2, 4, 17 },
- { 2, 1, 3, 18 },
- { 0, 0, 0, 0 }
- };
-int reftet_3eb_2v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 20 },
- { 0 },
- };
-
-HPREF_ELEMENT_TYPE reftet_3eb_2v_newelstypes[] =
- {
- HP_PYRAMID_EDGES,
- HP_PYRAMID_EDGES,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
-
- HP_PYRAMID,
- HP_PYRAMID,
- HP_TET,
- HP_TET,
- HP_PYRAMID,
- HP_PYRAMID,
- HP_PYRAMID,
- HP_NONE,
- };
-int reftet_3eb_2v_newels[][8] =
-{
- { 1, 7, 17, 5, 6 },
- { 2, 9, 18, 8, 10 },
- { 3, 12, 13, 11 },
- { 4, 14, 16, 15 },
- { 5, 6, 17, 8, 18, 10 },
- { 7, 17, 6, 14, 15, 16 },
- { 9, 18, 10, 12, 11, 13 },
-
- { 10, 15, 16, 13, 20 },
- { 6, 11, 13, 16, 20 },
- { 10, 17, 15, 20 },
- { 6, 18, 11, 20 },
- { 6, 17, 10, 18, 20 },
- { 6, 16, 15, 17, 20 },
- { 18, 10, 13, 11, 20 },
-};
-HPRef_Struct reftet_3eb_2v =
-{
- HP_TET,
- reftet_3eb_2v_splitedges,
- reftet_3eb_2v_splitfaces,
- reftet_3eb_2v_splitelements,
- reftet_3eb_2v_newelstypes,
- reftet_3eb_2v_newels
-};
-
-
-
-
-
-
-
-
-
-// HP_TET_3EC_2V,
-int reftet_3ec_2v_splitedges[][3] =
-{
- { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 1, 8 },
- { 2, 3, 9 },
- { 2, 4, 10 },
- { 3, 1, 11 },
- { 3, 2, 12 },
- { 3, 4, 13 },
- { 4, 1, 14 },
- { 4, 2, 15 },
- { 4, 3, 16 },
- { 0, 0, 0 }
-};
-int reftet_3ec_2v_splitfaces[][4] =
- {
- { 1, 2, 3, 17 },
- { 2, 1, 4, 18 },
- { 0, 0, 0, 0 }
- };
-int reftet_3ec_2v_splitelements[][5] =
- {
- { 1, 2, 3, 4, 20 },
- { 0 },
- };
-
-HPREF_ELEMENT_TYPE reftet_3ec_2v_newelstypes[] =
- {
- HP_PYRAMID_EDGES,
- HP_PYRAMID_EDGES,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
- HP_PRISM_SINGEDGE,
-
- HP_PYRAMID,
- HP_PYRAMID,
- HP_TET,
- HP_TET,
- HP_PYRAMID,
- HP_PYRAMID,
- HP_PYRAMID,
- HP_NONE,
- };
-int reftet_3ec_2v_newels[][8] =
-{
- { 1, 5, 17, 6, 7 },
- { 2, 8, 18, 10, 9 },
- { 3, 11, 12, 13 },
- { 4, 15, 14, 16 },
- { 5, 17, 7, 8, 9, 18 },
- { 6, 7, 17, 11, 13, 12 },
- { 10, 9, 18, 15, 16, 14 },
-
- { 9, 16, 13, 12, 20 },
- { 7, 13, 16, 14, 20 },
- { 7, 14, 18, 20 },
- { 9, 12, 17, 20 },
- { 17, 7, 18, 9, 20 },
- { 7, 17, 12, 13, 20 },
- { 9, 18, 14, 16, 20 },
-};
-HPRef_Struct reftet_3ec_2v =
-{
- HP_TET,
- reftet_3ec_2v_splitedges,
- reftet_3ec_2v_splitfaces,
- reftet_3ec_2v_splitelements,
- reftet_3ec_2v_newelstypes,
- reftet_3ec_2v_newels
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// HP_PRISM
-int refprism_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refprism_newelstypes[] =
-{
- HP_PRISM,
- HP_NONE,
-};
-int refprism_newels[][8] =
-{
- { 1, 2, 3, 4, 5, 6 }
-};
-HPRef_Struct refprism =
-{
- HP_PRISM,
- refprism_splitedges,
- 0, 0,
- refprism_newelstypes,
- refprism_newels
-};
-
-
-
-// HP_PRISM_SINGEDGE
-int refprism_singedge_splitedges[][3] =
-{
- { 1, 2, 7 },
- { 1, 3, 8 },
- { 4, 5, 9 },
- { 4, 6, 10 },
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refprism_singedge_newelstypes[] =
-{
- HP_PRISM_SINGEDGE,
- HP_HEX,
- HP_NONE,
-};
-int refprism_singedge_newels[][8] =
-{
- { 1, 7, 8, 4, 9, 10 },
- { 3, 8, 7, 2, 6, 10, 9, 5 }
-};
-HPRef_Struct refprism_singedge =
-{
- HP_PRISM,
- refprism_singedge_splitedges,
- 0, 0,
- refprism_singedge_newelstypes,
- refprism_singedge_newels
-};
-
-
-
-
-
-
-
-// HP_PYRAMID
-int refpyramid_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refpyramid_newelstypes[] =
-{
- HP_PYRAMID,
- HP_NONE,
-};
-int refpyramid_newels[][8] =
-{
- { 1, 2, 3, 4, 5, 6 }
-};
-HPRef_Struct refpyramid =
-{
- HP_PYRAMID,
- refpyramid_splitedges,
- 0, 0,
- refpyramid_newelstypes,
- refpyramid_newels
-};
-
-
-
-// HP_PYRAMID_0E_1V
-int refpyramid_0e_1v_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refpyramid_0e_1v_newelstypes[] =
-{
- HP_TET_0E_1V,
- HP_TET,
- HP_NONE,
-};
-int refpyramid_0e_1v_newels[][8] =
-{
- { 1, 2, 4, 5 },
- { 2, 3, 4, 5 },
-};
-HPRef_Struct refpyramid_0e_1v =
-{
- HP_PYRAMID,
- refpyramid_0e_1v_splitedges,
- 0, 0,
- refpyramid_0e_1v_newelstypes,
- refpyramid_0e_1v_newels
-};
-
-
-
-// HP_PYRAMID_EDGES
-int refpyramid_edges_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refpyramid_edges_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_NONE,
-};
-int refpyramid_edges_newels[][8] =
-{
- { 1, 2, 3, 5 },
- { 1, 4, 5, 3 },
-};
-HPRef_Struct refpyramid_edges =
-{
- HP_PYRAMID,
- refpyramid_edges_splitedges,
- 0, 0,
- refpyramid_edges_newelstypes,
- refpyramid_edges_newels
-};
-
-
-
-
-
-
-
-// HP_HEX
-int refhex_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refhex_newelstypes[] =
-{
- HP_HEX,
- HP_NONE,
-};
-int refhex_newels[][8] =
-{
- { 1, 2, 3, 4, 5, 6, 7, 8 }
-};
-HPRef_Struct refhex =
-{
- HP_HEX,
- refhex_splitedges,
- 0, 0,
- refhex_newelstypes,
- refhex_newels
-};
-
-
-
-
-// HP_HEX_0E_1V
-int refhex_0e_1v_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refhex_0e_1v_newelstypes[] =
-{
- HP_TET_0E_1V,
- HP_TET,
- HP_TET,
- HP_TET,
- HP_TET,
- HP_TET,
- HP_NONE,
-};
-int refhex_0e_1v_newels[][8] =
-{
- { 1, 5, 2, 4 },
- { 7, 3, 6, 8 },
- { 2, 8, 5, 6 },
- { 2, 8, 6, 3 },
- { 2, 8, 3, 4 },
- { 2, 8, 4, 5 },
-};
-HPRef_Struct refhex_0e_1v =
-{
- HP_HEX,
- refhex_0e_1v_splitedges,
- 0, 0,
- refhex_0e_1v_newelstypes,
- refhex_0e_1v_newels
-};
-
-
-
-
-
-
-// HP_HEX_3E_0V
-int refhex_3e_0v_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-HPREF_ELEMENT_TYPE refhex_3e_0v_newelstypes[] =
-{
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_TET_1E_1VA,
- HP_TET_0E_1V,
- HP_TET,
- HP_NONE,
-};
-int refhex_3e_0v_newels[][8] =
-{
- { 1, 2, 3, 6 },
- { 1, 4, 8, 3 },
- { 1, 5, 6, 8 },
- { 1, 6, 3, 8 },
- { 3, 8, 6, 7 },
-};
-HPRef_Struct refhex_3e_0v =
-{
- HP_HEX,
- refhex_3e_0v_splitedges,
- 0, 0,
- refhex_3e_0v_newelstypes,
- refhex_3e_0v_newels
-};
-
-
-
-
-// HP_HEX_1E_0V
-int refhex_1e_0v_splitedges[][3] =
-{
- { 0, 0, 0 }
-};
-
-HPREF_ELEMENT_TYPE refhex_1e_0v_newelstypes[] =
-{
- HP_PRISM_SINGEDGE,
- HP_PRISM,
- HP_NONE,
-};
-int refhex_1e_0v_newels[][8] =
-{
- { 1, 4, 5, 2, 3, 6 },
- { 5, 4, 8, 6, 3, 7 },
-};
-HPRef_Struct refhex_1e_0v =
-{
- HP_HEX,
- refhex_1e_0v_splitedges,
- 0, 0,
- refhex_1e_0v_newelstypes,
- refhex_1e_0v_newels
-};
-
-
-
-
-
-
-
-
-HPRef_Struct * Get_HPRef_Struct (HPREF_ELEMENT_TYPE type)
-{
- HPRef_Struct * hps = NULL;
- switch (type)
- {
- case HP_TRIG:
- hps = &reftrig; break;
- case HP_TRIG_SINGCORNER:
- hps = &reftrig_singcorner; break;
- case HP_TRIG_SINGCORNER12:
- hps = &reftrig_singcorner12; break;
- case HP_TRIG_SINGCORNER123:
- hps = &reftrig_singcorner123; break;
- case HP_TRIG_SINGEDGE:
- hps = &reftrig_singedge; break;
- case HP_TRIG_SINGEDGECORNER1:
- hps = &reftrig_singedgecorner1; break;
- case HP_TRIG_SINGEDGECORNER2:
- hps = &reftrig_singedgecorner2; break;
- case HP_TRIG_SINGEDGECORNER12:
- hps = &reftrig_singedgecorner12; break;
- case HP_TRIG_SINGEDGECORNER3:
- hps = &reftrig_singedgecorner3; break;
- case HP_TRIG_SINGEDGECORNER13:
- hps = &reftrig_singedgecorner13; break;
- case HP_TRIG_SINGEDGECORNER23:
- hps = &reftrig_singedgecorner23; break;
- case HP_TRIG_SINGEDGECORNER123:
- hps = &reftrig_singedgecorner123; break;
- case HP_TRIG_SINGEDGES:
- hps = &reftrig_singedges; break;
- case HP_TRIG_SINGEDGES2:
- hps = &reftrig_singedges2; break;
- case HP_TRIG_SINGEDGES3:
- hps = &reftrig_singedges3; break;
- case HP_TRIG_SINGEDGES23:
- hps = &reftrig_singedges23; break;
- case HP_QUAD:
- hps = &refquad; break;
- case HP_DUMMY_QUAD_SINGCORNER:
- hps = &refdummyquad_singcorner; break;
- case HP_QUAD_SINGCORNER:
- hps = &refquad_singcorner; break;
- case HP_QUAD_SINGEDGE:
- hps = &refquad_singedge; break;
- case HP_QUAD_SINGEDGES:
- hps = &refquad_singedges; break;
-
- case HP_TET:
- hps = &reftet; break;
- case HP_TET_0E_1V:
- hps = &reftet_0e_1v; break;
- case HP_TET_0E_2V:
- hps = &reftet_0e_2v; break;
- case HP_TET_0E_3V:
- hps = &reftet_0e_3v; break;
- case HP_TET_0E_4V:
- hps = &reftet_0e_4v; break;
-
- case HP_TET_1E_0V:
- hps = &reftet_1e_0v; break;
- case HP_TET_1E_1VA:
- hps = &reftet_1e_1va; break;
- case HP_TET_1E_1VB:
- hps = &reftet_1e_1vb; break;
-
- case HP_TET_1E_2VA:
- hps = &reftet_1e_2va; break;
- case HP_TET_1E_2VB:
- hps = &reftet_1e_2vb; break;
- case HP_TET_1E_2VC:
- hps = &reftet_1e_2vc; break;
- case HP_TET_1E_2VD:
- hps = &reftet_1e_2vd; break;
-
- case HP_TET_2EA_0V:
- hps = &reftet_2ea_0v; break;
- case HP_TET_2EA_1VB:
- hps = &reftet_2ea_1vb; break;
- case HP_TET_2EA_3V:
- hps = &reftet_2ea_3v; break;
-
- case HP_TET_2EB_4V:
- hps = &reftet_2eb_4v; break;
-
-
- case HP_TET_3EA_0V:
- hps = &reftet_3ea_0v; break;
- case HP_TET_3EA_3V:
- hps = &reftet_3ea_3v; break;
-
- case HP_TET_3EB_2V:
- hps = &reftet_3eb_2v; break;
- case HP_TET_3EC_2V:
- hps = &reftet_3ec_2v; break;
-
- case HP_PRISM:
- hps = &refprism; break;
- case HP_PRISM_SINGEDGE:
- hps = &refprism_singedge; break;
-
- case HP_PYRAMID:
- hps = &refpyramid; break;
- case HP_PYRAMID_0E_1V:
- hps = &refpyramid_0e_1v; break;
- case HP_PYRAMID_EDGES:
- hps = &refpyramid_edges; break;
-
- case HP_HEX:
- hps = &refhex; break;
- case HP_HEX_0E_1V:
- hps = &refhex_0e_1v; break;
- case HP_HEX_1E_0V:
- hps = &refhex_1e_0v; break;
- case HP_HEX_3E_0V:
- hps = &refhex_3e_0v; break;
- }
-
- return hps;
-}
-
-
-
-class HPRefElement
-{
-public:
- HPREF_ELEMENT_TYPE type;
- int pnums[8];
- int index;
- int level;
-};
-
-static ARRAY<HPRefElement> elements;
-
-void PrepareElements (Mesh & mesh)
-{
- cout << "Transform mesh to hp-elements" << endl;
-
- int i, j, k, pi3, pi4;
- INDEX_2_HASHTABLE<int> edges(mesh.GetNSeg()+1);
- BitArray edgepoint(mesh.GetNP());
- edgepoint.Clear();
- BitArray cornerpoint(mesh.GetNP());
- cornerpoint.Clear();
-
- // check, if point has as least 3 different surfs:
- ARRAY<INDEX_3> surfonpoint(mesh.GetNP());
-
- if (mesh.GetDimension() == 3)
- {
- for (i = 1; i <= mesh.GetNP(); i++)
- surfonpoint.Elem(i) = INDEX_3(0,0,0);
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- int ind = el.GetIndex();
- for (j = 0; j < el.GetNP(); j++)
- {
- int pi = el[j];
- INDEX_3 & i3 = surfonpoint.Elem(pi);
- if (ind != i3.I1() &&
- ind != i3.I2() &&
- ind != i3.I3())
- {
- i3.I1() = i3.I2();
- i3.I2() = i3.I3();
- i3.I3() = ind;
- }
- }
- }
- for (i = 1; i <= mesh.GetNP(); i++)
- if (surfonpoint.Get(i).I1())
- cornerpoint.Set(i);
-
- // cornerpoint.Clear();
- // cornerpoint.Set(1);
-
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- INDEX_2 i2 (mesh.LineSegment(i).p1,
- mesh.LineSegment(i).p2);
- i2.Sort();
- // if (i2.I1() == 11 && i2.I2() == 12)
- {
- edges.Set (i2, 1);
- edgepoint.Set (i2.I1());
- edgepoint.Set (i2.I2());
- }
- }
- }
- else
- {
- for (i = 1; i <= mesh.GetNP(); i++)
- surfonpoint.Elem(i) = INDEX_3(0,0,0);
-
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- const Segment & seg = mesh.LineSegment(i);
- int ind = seg.edgenr;
- if (ind <= 12) continue;
-
- INDEX_2 i2 (mesh.LineSegment(i).p1,
- mesh.LineSegment(i).p2);
- i2.Sort();
- edges.Set (i2, 1);
- edgepoint.Set(i2.I1());
- edgepoint.Set(i2.I2());
-
- // (*testout) << "seg = " << ind << ", " << seg.p1 << "-" << seg.p2 << endl;
- for (j = 0; j < 2; j++)
- {
- int pi = (j == 0) ? seg.p1 : seg.p2;
- // if (pi > 20)
- {
- INDEX_3 & i3 = surfonpoint.Elem(pi);
- if (ind != i3.I1() &&
- ind != i3.I2())
- {
- i3.I1() = i3.I2();
- i3.I2() = ind;
- }
- }
- }
- }
- for (i = 1; i <= mesh.GetNP(); i++)
- if (surfonpoint.Get(i).I1())
- {
- cornerpoint.Set(i);
- }
- }
-
- int cnt_undef = 0, cnt_nonimplement = 0;
- ARRAY<int> misses(10000);
- misses = 0;
-
- for (i = 1; i <= mesh.GetNE(); i++)
- {
- Element & el = mesh.VolumeElement(i);
-
- HPREF_ELEMENT_TYPE type = HP_NONE;
- int pnums[8] = { 0 };
-
-
- switch (el.GetType())
- {
- case TET:
- {
- int ep1, ep2, ep3, ep4, cp1, cp2, cp3, cp4;
- int isedge1, isedge2, isedge3, isedge4, isedge5, isedge6;
-
- for (j = 1; j <= 4; j++)
- for (k = 1; k <= 4; k++)
- {
- if (j == k) continue;
- if (type) break;
-
- int pi3 = 1;
- while (pi3 == j || pi3 == k) pi3++;
- pi4 = 10 - j - k - pi3;
-
- // preserve orientation
- int sort[4];
- sort[0] = j; sort[1] = k; sort[2] = pi3; sort[3] = pi4;
- int cnt = 0;
- for (int jj = 0; jj < 4; jj++)
- for (int kk = 0; kk < 3; kk++)
- if (sort[kk] > sort[kk+1])
- {
- cnt++;
- Swap (sort[kk], sort[kk+1]);
- }
- if (cnt % 2 == 1) Swap (pi3, pi4);
-
- ep1 = edgepoint.Test (el.PNum (j));
- ep2 = edgepoint.Test (el.PNum (k));
- ep3 = edgepoint.Test (el.PNum (pi3));
- ep4 = edgepoint.Test (el.PNum (pi4));
-
- cp1 = cornerpoint.Test (el.PNum (j));
- cp2 = cornerpoint.Test (el.PNum (k));
- cp3 = cornerpoint.Test (el.PNum (pi3));
- cp4 = cornerpoint.Test (el.PNum (pi4));
-
- INDEX_2 i2;
- i2 = INDEX_2(el.PNum (j), el.PNum (k));
- i2.Sort();
- isedge1 = edges.Used (i2);
-
- i2 = INDEX_2(el.PNum (j), el.PNum (pi3));
- i2.Sort();
- isedge2 = edges.Used (i2);
-
- i2 = INDEX_2(el.PNum (j), el.PNum (pi4));
- i2.Sort();
- isedge3 = edges.Used (i2);
-
- i2 = INDEX_2(el.PNum (k), el.PNum (pi3));
- i2.Sort();
- isedge4 = edges.Used (i2);
-
- i2 = INDEX_2(el.PNum (k), el.PNum (pi4));
- i2.Sort();
- isedge5 = edges.Used (i2);
-
- i2 = INDEX_2(el.PNum (pi3), el.PNum (pi4));
- i2.Sort();
- isedge6 = edges.Used (i2);
-
- switch (isedge1+isedge2+isedge3+isedge4+isedge5+isedge6)
- {
- case 0:
- {
- if (!ep1 && !ep2 && !ep3 && !ep4)
- type = HP_TET;
-
- if (ep1 && !ep2 && !ep3 && !ep4)
- type = HP_TET_0E_1V;
-
- if (ep1 && ep2 && !ep3 && !ep4)
- type = HP_TET_0E_2V;
-
- if (ep1 && ep2 && ep3 && !ep4)
- type = HP_TET_0E_3V;
-
- if (ep1 && ep2 && ep3 && ep4)
- type = HP_TET_0E_4V;
-
- break;
- }
-
- case 1:
- {
- if (!isedge1) break;
-
- if (!cp1 && !cp2 && !ep3 && !ep4)
- type = HP_TET_1E_0V;
-
- if (cp1 && !cp2 && !ep3 && !ep4)
- type = HP_TET_1E_1VA;
-
- if (!cp1 && !cp2 && !ep3 && ep4)
- type = HP_TET_1E_1VB;
-
- if (cp1 && cp2 && !ep3 && !ep4)
- type = HP_TET_1E_2VA;
-
- if (cp1 && !cp2 && ep3 && !ep4)
- type = HP_TET_1E_2VB;
-
- if (cp1 && !cp2 && !ep3 && ep4)
- type = HP_TET_1E_2VC;
-
- if (!cp1 && !cp2 && ep3 && ep4)
- type = HP_TET_1E_2VD;
-
- if (cp1 && cp2 && ep3 && !ep4)
- type = HP_TET_1E_3VA;
-
- if (cp1 && !cp2 && ep3 && ep4)
- type = HP_TET_1E_3VB;
-
- if (cp1 && cp2 && ep3 && ep4)
- type = HP_TET_1E_4V;
-
- break;
- }
-
- case 2:
- {
- if (isedge1 && isedge2)
- {
- if (!cp2 && !cp3 && !ep4)
- type = HP_TET_2EA_0V;
- if (cp2 && !cp3 && !ep4)
- type = HP_TET_2EA_1VA;
-
- if (!cp2 && cp3 && !ep4)
- type = HP_TET_2EA_1VB;
-
- if (!cp2 && !cp3 && ep4)
- type = HP_TET_2EA_1VC;
-
- if (cp2 && cp3 && !ep4)
- type = HP_TET_2EA_2VA;
- if (cp2 && !cp3 && ep4)
- type = HP_TET_2EA_2VB;
- if (!cp2 && cp3 && ep4)
- type = HP_TET_2EA_2VC;
-
- if (cp2 && cp3 && ep4)
- type = HP_TET_2EA_3V;
- }
-
- if (isedge1 && isedge6)
- {
- if (!cp1 && !cp2 && !cp3 && !cp4)
- type = HP_TET_2EB_0V;
-
- if (cp1 && !cp2 && !cp3 && !cp4)
- type = HP_TET_2EB_1V;
-
- if (cp1 && cp2 && !cp3 && !cp4)
- type = HP_TET_2EB_2VA;
- if (cp1 && !cp2 && cp3 && !cp4)
- type = HP_TET_2EB_2VB;
- if (cp1 && !cp2 && !cp3 && cp4)
- type = HP_TET_2EB_2VC;
-
- if (cp1 && cp2 && cp3 && !cp4)
- type = HP_TET_2EB_3V;
-
- if (cp1 && cp2 && cp3 && cp4)
- type = HP_TET_2EB_4V;
- }
- }
-
- case 3:
- {
- if (isedge1 && isedge2 && isedge3)
- {
- if (!cp2 && !cp3 && !cp4)
- type = HP_TET_3EA_0V;
- if (cp2 && cp3 && ep4)
- type = HP_TET_3EA_3V;
- }
- if (isedge1 && isedge3 && isedge4)
- {
- if (cp3 && ep4)
- type = HP_TET_3EB_2V;
- }
- if (isedge1 && isedge2 && isedge5)
- {
- if (cp3 && ep4)
- type = HP_TET_3EC_2V;
- }
- }
+ for (int i = 0; i < hpelements.Size(); i++)
+ {
+ HPRefElement & hpel = hpelements[i];
+ if (Get_HPRef_Struct (hpel.type))
+ switch (Get_HPRef_Struct (hpel.type) -> geom)
+ {
+ case HP_SEGM:
+ {
+ Segment seg;
+ seg.p1 = hpel.pnums[0];
+ seg.p2 = hpel.pnums[1];
+ // NOTE: only for less than 10000 elements (HACK) !!!
+ seg.edgenr = hpel.index % 10000;
+ seg.si = hpel.index / 10000;
+ seg.epgeominfo[0].dist = hpel.param[0][0];
+ seg.epgeominfo[1].dist = hpel.param[1][0];
+ seg.epgeominfo[0].edgenr = seg.edgenr;
+ seg.epgeominfo[1].edgenr = seg.edgenr;
+ seg.hp_elnr = i;
+ mesh.AddSegment (seg);
+ break;
}
+
- if (type != HP_NONE)
+ case HP_TRIG:
{
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (k);
- pnums[2] = el.PNumMod (pi3);
- pnums[3] = el.PNumMod (pi4);
+ Element2d el(3);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddSurfaceElement (el);
break;
}
- }
-
-
- if (type == HP_NONE)
- {
- cnt_undef++;
- (*testout) << "undefined element" << endl
- << "cp = " << cp1 << cp2 << cp3 << cp4 << endl
- << "ep = " << ep1 << ep2 << ep3 << ep4 << endl
- << "isedge = " << isedge1 << isedge2 << isedge3
- << isedge4 << isedge5 << isedge6 << endl;
- }
- // cout << "hpref - element = " << type << endl;
-
-
-
- break;
- }
- case PRISM:
- {
- int pi1, pi2, pi3, pi4, pi5, pi6;
- int ep1, ep2, ep3, ep4, ep5, ep6, cp1, cp2, cp3, cp4, cp5, cp6;
-
- int ishedge1, ishedge2, ishedge3, ishedge4, ishedge5, ishedge6;
- int isvedge1, isvedge2, isvedge3;
-
- for (j = 1; j <= 3; j++)
+ case HP_QUAD:
{
- if (type) break;
-
- pi1 = j;
- pi2 = pi1%3 + 1;
- pi3 = pi2%3 + 1;
- pi4 = pi1+3;
- pi5 = pi2+3;
- pi6 = pi3+3;
-
- ep1 = edgepoint.Test (el.PNum (pi1));
- ep2 = edgepoint.Test (el.PNum (pi2));
- ep3 = edgepoint.Test (el.PNum (pi3));
- ep4 = edgepoint.Test (el.PNum (pi4));
- ep5 = edgepoint.Test (el.PNum (pi5));
- ep6 = edgepoint.Test (el.PNum (pi6));
-
- cp1 = cornerpoint.Test (el.PNum (pi1));
- cp2 = cornerpoint.Test (el.PNum (pi2));
- cp3 = cornerpoint.Test (el.PNum (pi3));
- cp4 = cornerpoint.Test (el.PNum (pi4));
- cp5 = cornerpoint.Test (el.PNum (pi5));
- cp6 = cornerpoint.Test (el.PNum (pi6));
-
- INDEX_2 i2;
- i2 = INDEX_2(el.PNum (pi1), el.PNum (pi4));
- i2.Sort();
- isvedge1 = edges.Used (i2);
-
-
- if (isvedge1 + isvedge2 + isvedge3 == 0)
- {
- type = HP_PRISM;
- }
- else if (isvedge1)
- {
- type = HP_PRISM_SINGEDGE;
- }
-
-
- if (type != HP_NONE)
- {
- pnums[0] = el.PNum (pi1);
- pnums[1] = el.PNum (pi2);
- pnums[2] = el.PNum (pi3);
- pnums[3] = el.PNum (pi4);
- pnums[4] = el.PNum (pi5);
- pnums[5] = el.PNum (pi6);
- break;
- }
+ Element2d el(4);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.PNum(4) = hpel.pnums[3];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddSurfaceElement (el);
+ break;
}
- break;
- }
- default:
- {
- cerr << "hp-refinement not defined for element" << endl;
- }
- }
-
- if (!Get_HPRef_Struct (type))
- {
- (*testout) << "case " << type << " not implemented " << endl;
- cnt_nonimplement++;
- misses[type]++;
- }
-
- HPRefElement hpel;
- hpel.type = type;
- for (j = 0; j < 8; j++)
- hpel.pnums[j] = pnums[j];
- hpel.index = el.GetIndex();
- hpel.level = 1;
- elements.Append (hpel);
- }
-
- cout << "undefined elements: " << cnt_undef << endl;
- cout << "non-implemented: " << cnt_nonimplement << endl;
-
- for (i = 0; i < misses.Size(); i++)
- if (misses[i])
- cout << "missing case " << i << " occured " << misses[i] << " times" << endl;
-
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- Element2d & el = mesh.SurfaceElement(i);
-
- HPREF_ELEMENT_TYPE type = HP_NONE;
- int pnums[8] = { 0 };
-
- switch (el.GetType())
- {
- case TRIG:
- {
- for (j = 1; j <= 3; j++)
+ case HP_TET:
{
- int ep1 = edgepoint.Test (el.PNumMod (j));
- int ep2 = edgepoint.Test (el.PNumMod (j+1));
- int ep3 = edgepoint.Test (el.PNumMod (j+2));
-
- int cp1 = cornerpoint.Test (el.PNumMod (j));
- int cp2 = cornerpoint.Test (el.PNumMod (j+1));
- int cp3 = cornerpoint.Test (el.PNumMod (j+2));
-
- INDEX_2 i2;
- i2 = INDEX_2(el.PNumMod (j), el.PNumMod (j+1));
- i2.Sort();
- int isedge1 = edges.Used (i2);
- i2 = INDEX_2(el.PNumMod (j+1), el.PNumMod (j+2));
- i2.Sort();
- int isedge2 = edges.Used (i2);
- i2 = INDEX_2(el.PNumMod (j+2), el.PNumMod (j+3));
- i2.Sort();
- int isedge3 = edges.Used (i2);
-
- if (isedge1 + isedge2 + isedge3 == 0)
- {
- if (!ep1 && !ep2 && !ep3)
- type = HP_TRIG;
-
- if (ep1 && !ep2 && !ep3)
- type = HP_TRIG_SINGCORNER;
-
- if (ep1 && ep2 && !ep3)
- type = HP_TRIG_SINGCORNER12;
-
- if (ep1 && ep2 && ep3)
- type = HP_TRIG_SINGCORNER123;
-
- if (type != HP_NONE)
- {
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (j+1);
- pnums[2] = el.PNumMod (j+2);
- break;
- }
- }
-
- if (isedge1 && !isedge2 && !isedge3)
- {
- int code = 0;
- if (cp1) code += 1;
- if (cp2) code += 2;
- if (ep3) code += 4;
-
- HPREF_ELEMENT_TYPE types[] =
- {
- HP_TRIG_SINGEDGE,
- HP_TRIG_SINGEDGECORNER1,
- HP_TRIG_SINGEDGECORNER2,
- HP_TRIG_SINGEDGECORNER12,
- HP_TRIG_SINGEDGECORNER3,
- HP_TRIG_SINGEDGECORNER13,
- HP_TRIG_SINGEDGECORNER23,
- HP_TRIG_SINGEDGECORNER123,
- };
- type = types[code];
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (j+1);
- pnums[2] = el.PNumMod (j+2);
- break;
- }
-
-
- if (isedge1 && !isedge2 && isedge3)
- {
- if (!cp3)
- {
- if (!cp2) type = HP_TRIG_SINGEDGES;
- else type = HP_TRIG_SINGEDGES2;
- }
- else
- {
- if (!cp2) type = HP_TRIG_SINGEDGES3;
- else type = HP_TRIG_SINGEDGES23;
- }
-
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (j+1);
- pnums[2] = el.PNumMod (j+2);
- break;
- }
-
- if (isedge1 && isedge2 && isedge3)
- {
- type = HP_TRIG_3SINGEDGES;
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (j+1);
- pnums[2] = el.PNumMod (j+2);
- break;
- }
+ Element el(4);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.PNum(4) = hpel.pnums[3];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddVolumeElement (el);
+ break;
}
- break;
- }
- case QUAD:
- {
- for (j = 1; j <= 4; j++)
+ case HP_PRISM:
{
- int ep1 = edgepoint.Test (el.PNumMod (j));
- int ep2 = edgepoint.Test (el.PNumMod (j+1));
- int ep3 = edgepoint.Test (el.PNumMod (j+2));
- int ep4 = edgepoint.Test (el.PNumMod (j+3));
-
- int cp1 = cornerpoint.Test (el.PNumMod (j));
- int cp2 = cornerpoint.Test (el.PNumMod (j+1));
- int cp3 = cornerpoint.Test (el.PNumMod (j+2));
- int cp4 = cornerpoint.Test (el.PNumMod (j+3));
-
- INDEX_2 i2;
- i2 = INDEX_2(el.PNumMod (j), el.PNumMod (j+1));
- i2.Sort();
- int isedge1 = edges.Used (i2);
- i2 = INDEX_2(el.PNumMod (j+1), el.PNumMod (j+2));
- i2.Sort();
- int isedge2 = edges.Used (i2);
- i2 = INDEX_2(el.PNumMod (j+2), el.PNumMod (j+3));
- i2.Sort();
- int isedge3 = edges.Used (i2);
- i2 = INDEX_2(el.PNumMod (j+3), el.PNumMod (j+4));
- i2.Sort();
- int isedge4 = edges.Used (i2);
-
-
- if (isedge1 + isedge2 + isedge3 + isedge4 == 0)
- {
- type = HP_QUAD;
- }
- else if (isedge1)
- {
- type = HP_QUAD_SINGEDGE;
- }
-
- if (type != HP_NONE)
- {
- pnums[0] = el.PNumMod (j);
- pnums[1] = el.PNumMod (j+1);
- pnums[2] = el.PNumMod (j+2);
- pnums[3] = el.PNumMod (j+3);
- break;
- }
+ Element el(6);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.PNum(4) = hpel.pnums[3];
+ el.PNum(5) = hpel.pnums[4];
+ el.PNum(6) = hpel.pnums[5];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddVolumeElement (el);
+ break;
}
- break;
- }
- }
-
- HPRefElement hpel;
- hpel.type = type;
- for (j = 0; j < 8; j++)
- hpel.pnums[j] = pnums[j];
- hpel.index = el.GetIndex();
- hpel.level = 1;
-
- elements.Append (hpel);
- }
-}
-
-
-
-void DoRefinement (Mesh & mesh)
-{
- int i, j, k;
-
- INDEX_2_HASHTABLE<int> newpts(elements.Size()+1);
- INDEX_3_HASHTABLE<int> newfacepts(elements.Size()+1);
-
- // prepare new points
-
- (*testout) << "find new points" << endl;
- int oldelsize = elements.Size();
- for (i = 1; i <= oldelsize; i++)
- {
- (*testout) << "el " << i << endl;
-
- HPRefElement & el = elements.Elem(i);
- HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
-
- (*testout) << "type = " << el.type << endl;
-
-
- if (!hprs)
- {
- // cout << "Refinementstruct not defined for element " << el.type << endl;
- continue;
- }
-
- j = 0;
- while (hprs->splitedges[j][0])
- {
- INDEX_2 i2(el.pnums[hprs->splitedges[j][0]-1],
- el.pnums[hprs->splitedges[j][1]-1]);
- if (!newpts.Used (i2))
- {
- Point3d np = Center (mesh.Point (i2.I1()),
- mesh.Point (i2.I2()));
- np = Center (mesh.Point (i2.I1()),np);
- np = Center (mesh.Point (i2.I1()),np);
- int npi = mesh.AddPoint (np);
- newpts.Set (i2, npi);
- }
- j++;
- }
-
-
-
- j = 0;
- if (hprs->splitfaces)
- while (hprs->splitfaces[j][0])
- {
- INDEX_3 i3(el.pnums[hprs->splitfaces[j][0]-1],
- el.pnums[hprs->splitfaces[j][1]-1],
- el.pnums[hprs->splitfaces[j][2]-1]);
- if (i3.I2() > i3.I3())
- Swap (i3.I2(), i3.I3());
- if (!newfacepts.Used (i3))
+
+ case HP_PYRAMID:
{
- Point3d np = Center (mesh.Point (i3.I2()),
- mesh.Point (i3.I3()));
- np = Center (mesh.Point (i3.I1()),np);
- np = Center (mesh.Point (i3.I1()),np);
- int npi = mesh.AddPoint (np);
- newfacepts.Set (i3, npi);
+ Element el(5);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.PNum(4) = hpel.pnums[3];
+ el.PNum(5) = hpel.pnums[4];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddVolumeElement (el);
+ break;
+ }
+ case HP_HEX:
+ {
+ Element el(8);
+ el.PNum(1) = hpel.pnums[0];
+ el.PNum(2) = hpel.pnums[1];
+ el.PNum(3) = hpel.pnums[2];
+ el.PNum(4) = hpel.pnums[3];
+ el.PNum(5) = hpel.pnums[4];
+ el.PNum(6) = hpel.pnums[5];
+ el.PNum(7) = hpel.pnums[6];
+ el.PNum(8) = hpel.pnums[7];
+ el.SetIndex (hpel.index);
+ el.hp_elnr = i;
+ mesh.AddVolumeElement (el);
+ break;
}
- j++;
- }
- }
-
-
-
- (*testout) << "generate elements" << endl;
-
- for (i = 1; i <= oldelsize; i++)
- {
- (*testout) << "el " << i << endl;
-
- HPRefElement & el = elements.Elem(i);
- HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
- int newlevel = el.level + 1;
-
- if (el.type == HP_TRIG ||
- el.type == HP_QUAD ||
- el.type == HP_TET ||
- el.type == HP_PRISM ||
- el.type == HP_HEX)
- newlevel = el.level;
-
- (*testout) << "type = " << el.type << endl;
-
- if (!hprs)
- {
- continue;
- }
-
- int newpnums[33];
- for (j = 0; j < 8; j++)
- newpnums[j] = el.pnums[j];
-
- j = 0;
- while (hprs->splitedges[j][0])
- {
- INDEX_2 i2(el.pnums[hprs->splitedges[j][0]-1],
- el.pnums[hprs->splitedges[j][1]-1]);
-
- int npi = newpts.Get(i2);
- newpnums[hprs->splitedges[j][2]-1] = npi;
- j++;
- }
-
- j = 0;
- if (hprs->splitfaces)
- while (hprs->splitfaces[j][0])
- {
- INDEX_3 i3(el.pnums[hprs->splitfaces[j][0]-1],
- el.pnums[hprs->splitfaces[j][1]-1],
- el.pnums[hprs->splitfaces[j][2]-1]);
- if (i3.I2() > i3.I3())
- Swap (i3.I2(), i3.I3());
- int npi = newfacepts.Get(i3);
- newpnums[hprs->splitfaces[j][3]-1] = npi;
- j++;
- }
-
-
- j = 0;
- if (hprs->splitelements)
- while (hprs->splitelements[j][0])
- {
- int pi1 = el.pnums[hprs->splitelements[j][0]-1];
- Point3d np =
- Center (Center (mesh.Point (pi1),
- mesh.Point (el.pnums[hprs->splitelements[j][1]-1])),
- Center (mesh.Point (el.pnums[hprs->splitelements[j][2]-1]),
- mesh.Point (el.pnums[hprs->splitelements[j][3]-1])));
- np = Center (mesh.Point (pi1),np);
- int npi = mesh.AddPoint (np);
- newpnums[hprs->splitelements[j][4]-1] = npi;
- j++;
- }
- (*testout) << "type = " << el.type << endl;
- (*testout) << "newpnums = ";
- for (k = 0; k < 10; k++)
- (*testout) << newpnums[k] << " ";
- (*testout) << endl;
-
- j = 0;
- while (hprs->neweltypes[j])
- {
- HPRefElement newel;
- newel.type = hprs->neweltypes[j];
- for (k = 0; k < 8; k++)
- newel.pnums[k] = newpnums[hprs->newels[j][k]-1];
-
- if (newel.pnums[1] == newel.pnums[3])
- {
- cout << "same node numbers !!!! " << endl;
- (*testout) << "same node numbers !!!! " << endl;
+ default:
+ PrintSysError ("hpref, backconversion failed for element ",
+ int(Get_HPRef_Struct (hpel.type) -> geom));
}
- (*testout) << "new el: ";
- for (k = 0; k < 8; k++)
- (*testout) << newel.pnums[k] << " ";
- (*testout) << endl;
-
- newel.index = elements.Elem(i).index;
- newel.level = newlevel;
-
- if (j == 0)
- elements.Elem(i) = newel;
- else
- elements.Append (newel);
- j++;
- }
- (*testout) << "el complete" << endl;
- }
-
- cout << "refinement done" << endl;
-}
-
-
-
-void DoRefineDummies (Mesh & mesh)
-{
- cout << "refine dummies" << endl;
- int i, j, k;
-
- int oldelsize = elements.Size();
-
- for (i = 1; i <= oldelsize; i++)
- {
- HPRefElement & el = elements.Elem(i);
- HPRef_Struct * hprs = Get_HPRef_Struct (el.type);
-
- int newlevel = el.level;
-
- if (el.type != HP_DUMMY_QUAD_SINGCORNER &&
- el.type != HP_PYRAMID_EDGES &&
- el.type != HP_PYRAMID_0E_1V &&
- el.type != HP_HEX_0E_1V &&
- el.type != HP_HEX_1E_0V &&
- el.type != HP_HEX_3E_0V
- ) continue;
-
- if (!hprs) continue;
-
- int newpnums[33];
- for (j = 0; j < 8; j++)
- newpnums[j] = el.pnums[j];
-
- j = 0;
- while (hprs->neweltypes[j])
- {
- HPRefElement newel;
- newel.type = hprs->neweltypes[j];
- for (k = 0; k < 8; k++)
- newel.pnums[k] = newpnums[hprs->newels[j][k]-1];
- newel.index = el.index;
-
- newel.level = newlevel;
-
- if (j == 0)
- elements.Elem(i) = newel;
- else
- elements.Append (newel);
- j++;
- }
- }
- cout << "refineme dummies done" << endl;
-}
-
-
-
-
-
-
-
-void CalcStatistics ()
-{
- int i, p;
- int ntrig = 0, nquad = 0;
- int nhex = 0, nprism = 0, ntet = 0;
- int maxlevel = 0;
-
- for (i = 1; i <= elements.Size(); i++)
- {
- const HPRefElement & el = elements.Get(i);
- maxlevel = max2 (el.level, maxlevel);
- switch (el.type)
- {
- case HP_TRIG:
- case HP_TRIG_SINGCORNER:
- case HP_TRIG_SINGEDGE:
- case HP_TRIG_SINGEDGECORNER1:
- case HP_TRIG_SINGEDGECORNER2:
- {
- ntrig ++;
- break;
- }
- case HP_QUAD:
- case HP_QUAD_SINGEDGE:
- {
- nquad++;
- break;
- }
- case HP_TET:
- case HP_TET_0E_1V:
- case HP_TET_1E_0V:
- case HP_TET_1E_1VA:
- {
- ntet++;
- break;
- }
-
- case HP_PRISM:
- case HP_PRISM_SINGEDGE:
- {
- nprism++;
- break;
- }
-
- case HP_HEX:
- {
- nhex++;
- break;
- }
- }
- }
-
- cout << "level = " << maxlevel << endl;
- cout << "ntrig = " << ntrig << ", nquad = " << nquad << endl;
- cout << "ntet = " << ntet << ", nprism = " << nprism << ", nhex = " << nhex << endl;
-
- return;
-
- double memcost = 0, cpucost = 0;
- for (p = 1; p <= 20; p++)
- {
- memcost = (ntet + nprism + nhex) * pow (p, 6.0);
- cpucost = (ntet + nprism + nhex) * pow (p, 9.0);
- cout << "costs for p = " << p << ": mem = " << memcost << ", cpu = " << cpucost << endl;
- }
-
- double memcosttet = 0;
- double memcostprism = 0;
- double memcosthex = 0;
- double memcostsctet = 0;
- double memcostscprism = 0;
- double memcostschex = 0;
- double cpucosttet = 0;
- double cpucostprism = 0;
- double cpucosthex = 0;
-
- for (i = 1; i <= elements.Size(); i++)
- {
- const HPRefElement & el = elements.Get(i);
- switch (el.type)
- {
- case HP_TET:
- case HP_TET_0E_1V:
- case HP_TET_1E_0V:
- case HP_TET_1E_1VA:
- {
- int p1 = maxlevel - el.level + 1;
- (*testout) << "p1 = " << p1 << ", P1^6 = " << pow (p1, 6.0)
- << " (p1-3)^6 = " << pow ( max2(p1-3, 0), 6.0)
- << " p1^3 = " << pow ( p1, 3.0)
- << " (p1-3)^3 = " << pow ( p1-3, 3.0)
- << " [p1^3-(p1-3)^3]^2 = " << sqr (pow (p1,3.0) - pow ( p1-3, 3.0))
- << endl;
-
- p1 /= 2 +1;
- memcosttet += pow (p1, 6.0);
- memcostsctet += pow (p1, 6.0) - pow ( max2(p1-3, 1), 6.0);
- cpucosttet += pow (p1, 9.0);
- break;
- }
- case HP_PRISM:
- case HP_PRISM_SINGEDGE:
- {
- int p1 = maxlevel - el.level + 1;
- p1 /= 2 +1;
- memcostprism += pow (p1, 6.0);
- memcostscprism += pow (p1, 6.0) - pow ( max2(p1-3, 1), 6.0);
- cpucostprism += pow (p1, 9.0);
- break;
- }
- case HP_HEX:
- {
- int p1 = maxlevel - el.level + 1;
- int p2 = maxlevel;
- p1 /= 2 +1;
- p2 /= 2 +1;
- memcosthex += pow (p1, 4.0) * pow (p2, 2.0);
- memcostschex += pow (p1, 6.0) - pow ( max2(p1-2, 0), 6.0);
- cpucosthex += pow (p1, 6.0) * pow (p2, 3.0);
- break;
- }
- default:
- ;
- }
- }
- cout << "TET: hp-memcost = " << memcosttet
- << ", scmemcost = " << memcostsctet
- << ", cpucost = " << cpucosttet
- << endl;
- cout << "PRI: hp-memcost = " << memcostprism
- << ", scmemcost = " << memcostscprism
- << ", cpucost = " << cpucostprism << endl;
- cout << "HEX: hp-memcost = " << memcosthex
- << ", scmemcost = " << memcostschex
- << ", cpucost = " << cpucosthex << endl;
-}
-
-void HPRefinement (Mesh & mesh, int levels)
-{
- int i, j;
- cout << "HP Refinement called, levels = " << levels;
-
- PrepareElements (mesh);
-
- for (j = 1; j <= levels; j++)
- {
- DoRefinement (mesh);
- DoRefineDummies (mesh);
- CalcStatistics ();
- }
-
- mesh.ClearSurfaceElements();
- mesh.ClearVolumeElements();
-
- for (i = 1; i <= elements.Size(); i++)
- {
- HPRefElement & hpel = elements.Elem(i);
- if (Get_HPRef_Struct (hpel.type))
- switch (Get_HPRef_Struct (hpel.type) -> geom)
- {
- case HP_TRIG:
- {
- Element2d el(3);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.SetIndex (hpel.index);
- mesh.AddSurfaceElement (el);
- break;
- }
- case HP_QUAD:
- {
- Element2d el(4);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.PNum(4) = hpel.pnums[3];
- el.SetIndex (hpel.index);
- mesh.AddSurfaceElement (el);
- break;
- }
- case HP_TET:
- {
- Element el(4);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.PNum(4) = hpel.pnums[3];
- el.SetIndex (hpel.index);
- mesh.AddVolumeElement (el);
- break;
- }
- case HP_PRISM:
- {
- Element el(6);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.PNum(4) = hpel.pnums[3];
- el.PNum(5) = hpel.pnums[4];
- el.PNum(6) = hpel.pnums[5];
- el.SetIndex (hpel.index);
- mesh.AddVolumeElement (el);
- break;
- }
-
- case HP_PYRAMID:
- {
- Element el(5);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.PNum(4) = hpel.pnums[3];
- el.PNum(5) = hpel.pnums[4];
- el.SetIndex (hpel.index);
- mesh.AddVolumeElement (el);
- break;
- }
- case HP_HEX:
- {
- Element el(8);
- el.PNum(1) = hpel.pnums[0];
- el.PNum(2) = hpel.pnums[1];
- el.PNum(3) = hpel.pnums[2];
- el.PNum(4) = hpel.pnums[3];
- el.PNum(5) = hpel.pnums[4];
- el.PNum(6) = hpel.pnums[5];
- el.PNum(7) = hpel.pnums[6];
- el.PNum(8) = hpel.pnums[7];
-
- (*testout) << "hex: " << endl;
- for (int ii = 1; ii <= 8; ii++)
- (*testout) << hpel.pnums[ii-1] << " ";
- (*testout) << endl;
-
- el.SetIndex (hpel.index);
- mesh.AddVolumeElement (el);
- break;
- }
-
- default:
- PrintSysError ("hpref, backconversion failed for element ",
- int(Get_HPRef_Struct (hpel.type) -> geom));
- }
- }
+ }
- mesh.UpdateTopology();
-}
+ mesh.UpdateTopology();
+ }
}
diff --git a/Netgen/libsrc/meshing/hprefinement.hpp b/Netgen/libsrc/meshing/hprefinement.hpp
index ca21a886d6..4537b41345 100644
--- a/Netgen/libsrc/meshing/hprefinement.hpp
+++ b/Netgen/libsrc/meshing/hprefinement.hpp
@@ -12,7 +12,212 @@
*/
-extern void HPRefinement (Mesh & mesh, int levels);
+
+
+enum HPREF_ELEMENT_TYPE {
+ HP_NONE=0,
+
+ HP_SEGM = 1,
+ HP_SEGM_SINGCORNERL,
+ HP_SEGM_SINGCORNERR,
+ HP_SEGM_SINGCORNERS,
+
+ HP_TRIG = 10,
+ HP_TRIG_SINGCORNER,
+ HP_TRIG_SINGCORNER12,
+ HP_TRIG_SINGCORNER123,
+ HP_TRIG_SINGCORNER123_2D, // not rotational symmetric
+ HP_TRIG_SINGEDGE = 20,
+ HP_TRIG_SINGEDGECORNER1, // E = 100, V = 100
+ HP_TRIG_SINGEDGECORNER2, // E = 100, V = 010
+ HP_TRIG_SINGEDGECORNER12, // E = 100, V = 110
+ HP_TRIG_SINGEDGECORNER3,
+ HP_TRIG_SINGEDGECORNER13,
+ HP_TRIG_SINGEDGECORNER23,
+ HP_TRIG_SINGEDGECORNER123,
+ HP_TRIG_SINGEDGES = 30,
+ HP_TRIG_SINGEDGES2,
+ HP_TRIG_SINGEDGES3,
+ HP_TRIG_SINGEDGES23,
+ HP_TRIG_3SINGEDGES = 40,
+
+ HP_QUAD = 50,
+ HP_QUAD_SINGCORNER,
+ HP_DUMMY_QUAD_SINGCORNER,
+ HP_QUAD_SINGEDGE,
+ HP_QUAD_0E_2VA, // V = 1100
+ HP_QUAD_0E_2VB, // V = 1010
+ HP_QUAD_0E_3V,
+ HP_QUAD_0E_4V,
+
+ // one edge: marked edge is always edge from vertex 1 to vertex 2 (E = 1000)
+ HP_QUAD_1E_1VA, // vertex on beginning of edge: V = 1000
+ HP_QUAD_1E_1VB, // vertex on end of edge: V = 0100
+ HP_QUAD_1E_1VC, // V = 0010
+ HP_QUAD_1E_1VD, // V = 0001
+
+ HP_QUAD_1E_2VA, // V = 1100
+ HP_QUAD_1E_2VB, // V = 1010
+ HP_QUAD_1E_2VC, // V = 1001
+ HP_QUAD_1E_2VD, // V = 0110
+ HP_QUAD_1E_2VE, // V = 0101
+ HP_QUAD_1E_2VF, // V = 0011
+
+ HP_QUAD_1E_3VA, // V = 1110
+ HP_QUAD_1E_3VB, // V = 1101
+ HP_QUAD_1E_3VC, // V = 1011
+ HP_QUAD_1E_3VD, // V = 0111
+
+ HP_QUAD_1E_4V, // V = 1111
+
+
+ HP_QUAD_2E, // E = 1001, V = 1000
+ HP_QUAD_2E_1VA, // E = 1001, V = 1100
+ HP_QUAD_2E_1VB, // E = 1001, V = 1010
+ HP_QUAD_2E_1VC, // E = 1001, V = 1001
+ HP_QUAD_2E_2VA, // E = 1001, V = 1110
+ HP_QUAD_2E_2VB, // E = 1001, V = 1101
+ HP_QUAD_2E_2VC, // E = 1001, V = 1011
+ HP_QUAD_2E_3V, // E = 1001, V = 1111
+
+ HP_QUAD_2EB_0V, // E = 1010, V = 0000
+ HP_QUAD_2EB_1VA, // E = 1010, V = 1000
+ HP_QUAD_2EB_1VB, // E = 1010, V = 0100
+ HP_QUAD_2EB_2VA, // E = 1010, V = 1100
+ HP_QUAD_2EB_2VB, // E = 1010, V = 1010
+ HP_QUAD_2EB_2VC, // E = 1010, V = 1001
+ HP_QUAD_2EB_2VD, // E = 1010, V = 0101
+ HP_QUAD_2EB_3VA, // E = 1010, V = 1110
+ HP_QUAD_2EB_3VB, // E = 1010, V = 1101
+
+ HP_QUAD_2EB_4V,
+
+
+ HP_QUAD_3E, // E = 1101, V = 1100
+ HP_QUAD_3E_3VA, // E = 1101, V = 1110
+ HP_QUAD_3E_3VB, // E = 1101, V = 1101
+ HP_QUAD_3E_4V, // E = 1101, V = 1111
+
+ HP_QUAD_4E,
+
+
+ HP_TET = 100, // no singular vertex/edge
+ HP_TET_0E_1V, // V1
+ HP_TET_0E_2V, // V1,2
+ HP_TET_0E_3V, // V1,2,3
+ HP_TET_0E_4V, // V1,2,3,4
+ HP_TET_1E_0V = 200, // E1-2
+ HP_TET_1E_1VA, // V1
+ HP_TET_1E_1VB, // V3
+ HP_TET_1E_2VA, // V1,2
+ HP_TET_1E_2VB, // V1,3
+ HP_TET_1E_2VC, // V1,4
+ HP_TET_1E_2VD, // V3,4
+ HP_TET_1E_3VA, // V1,2,3
+ HP_TET_1E_3VB, // V1,3,4
+ HP_TET_1E_4V, // V1,2,3,4
+
+
+ // 2 connected edges, additonally marked Vs
+ HP_TET_2EA_0V = 220, // E1-2, E1-3
+ HP_TET_2EA_1VA, // V2
+ HP_TET_2EA_1VB, // V3
+ HP_TET_2EA_1VC, // V4
+ HP_TET_2EA_2VA, // V2,3
+ HP_TET_2EA_2VB, // V2,4
+ HP_TET_2EA_2VC, // V3,4
+ HP_TET_2EA_3V, // V2,3,4
+
+ // 2 opposite edges
+ HP_TET_2EB_0V = 230, // E1-2, E3-4
+ HP_TET_2EB_1V, // V1
+ HP_TET_2EB_2VA, // V1,2
+ HP_TET_2EB_2VB, // V1,3
+ HP_TET_2EB_2VC, // V1,4
+ HP_TET_2EB_3V, // V1,2,3
+ HP_TET_2EB_4V, // V1,2,3,4
+
+ HP_TET_3EA_0V = 400, // E1-2, E1-3, E1-4, 3 edges connected
+ HP_TET_3EA_1V, // V2
+ HP_TET_3EA_2V, // V2,3
+ HP_TET_3EA_3V, // V2,3,4
+
+ HP_TET_3EB_0V = 420, // E1-2, E1-4, E2-3 3 edges chain
+ HP_TET_3EB_1V, //
+ HP_TET_3EB_2V, //
+ HP_TET_3EC_0V = 430, // 3 edges chain, alter
+ HP_TET_3EC_1V, // 3 edges chain, alter
+ HP_TET_3EC_2V, // 3 edges chain, alter
+
+
+ HP_TET_1F_0E_0V = 500, // 1 singular face
+ HP_TET_1F_0E_1VA, // 1 sing vertex in face (V2)
+ HP_TET_1F_0E_1VB, // 1 sing vertex not in face (V1)
+ HP_TET_1F_1EA_0V, // 1 sing edge not in face
+ HP_TET_1F_1EB_0V, // 1 sing edge in face
+ HP_TET_2F_0E_0V = 600, // 2 singular faces
+
+ HP_PRISM = 1000,
+ HP_PRISM_SINGEDGE,
+ HP_PRISM_SINGEDGE_V12,
+ HP_PRISM_SINGEDGE_H1,
+ HP_PRISM_SINGEDGE_H12,
+
+ HP_PRISM_1FA_0E_0V, // 1 singular trig face
+ HP_PRISM_1FB_0E_0V, // 1 singular quad face 1-2-4-5
+ HP_PRISM_1FB_1EA_0V, // 1 singular quad face, edge is 1-2
+
+ HP_PYRAMID = 2000,
+ HP_PYRAMID_0E_1V,
+ HP_PYRAMID_EDGES,
+ HP_PYRAMID_1FB_0E_1VA, // 1 trig face, top vertex
+
+ HP_HEX = 3000,
+ HP_HEX_0E_1V,
+ HP_HEX_1E_1V,
+ HP_HEX_1E_0V,
+ HP_HEX_3E_0V,
+
+ HP_HEX_1F_0E_0V,
+};
+
+
+
+struct HPRef_Struct {
+ HPREF_ELEMENT_TYPE geom;
+ int (*splitedges)[3];
+ int (*splitfaces)[4];
+ int (*splitelements)[5];
+ HPREF_ELEMENT_TYPE * neweltypes;
+ int (*newels)[8];
+};
+
+
+
+
+class HPRefElement
+{
+public:
+ HPRefElement ()
+ {
+ for (int i = 0; i < 8; i++)
+ {
+ pnums[i] = -1;
+ param[i][0] = param[i][1] = param[i][2] = 0;
+ }
+ }
+ HPREF_ELEMENT_TYPE type;
+ PointIndex pnums[8];
+ double param[8][3];
+ int index;
+ int level;
+ int coarse_elnr;
+ // EdgePointGeomInfo epgeominfo[2];
+};
+
+
+
+extern void HPRefinement (Mesh & mesh, Refinement * ref, int levels);
#endif
diff --git a/Netgen/libsrc/meshing/improve2.cpp b/Netgen/libsrc/meshing/improve2.cpp
index e70944d69b..af0ea0ca45 100644
--- a/Netgen/libsrc/meshing/improve2.cpp
+++ b/Netgen/libsrc/meshing/improve2.cpp
@@ -3,9 +3,9 @@
#include "meshing.hpp"
#include <opti.hpp>
-//removed for gmsh
+#ifndef SMALLLIB
//#include <visual.hpp>
-
+#endif
namespace netgen
{
@@ -44,6 +44,8 @@ public:
void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
{
+ // return;
+
if (!faceindex)
{
if (usemetric)
@@ -60,9 +62,11 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
}
faceindex = 0;
+ mesh.CalcSurfacesOfNode();
return;
}
+
int i, i2, j, k, j2;
bool should;
PointIndex pi;
@@ -247,21 +251,25 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
gi3 = mesh[t1].GeomInfoPiMod(o1);
gi4 = mesh[t2].GeomInfoPiMod(o2);
- // normal of old
+ // normal of old (new ?????)
nv1 = Cross (mesh.Point(pi3)-mesh.Point(pi4),
mesh.Point(pi1)-mesh.Point(pi4));
nv2 = Cross (mesh.Point(pi4)-mesh.Point(pi3),
mesh.Point(pi2)-mesh.Point(pi3));
- // normals of swapped
+ // normals of swapped original (???JS)
Vec3d nv3, nv4;
nv3 = Cross (mesh.Point(pi1)-mesh.Point(pi4),
mesh.Point(pi2)-mesh.Point(pi4));
nv4 = Cross (mesh.Point(pi2)-mesh.Point(pi3),
mesh.Point(pi1)-mesh.Point(pi3));
-
+ nv3 *= -1;
+ nv4 *= -1;
+ nv3.Normalize();
+ nv4.Normalize();
+
nv1.Normalize();
nv2.Normalize();
@@ -287,8 +295,9 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
(nvp3 * nv3 > critval) &&
(nvp4 * nv4 > critval);
+
horder = Dist (mesh.Point(pi1), mesh.Point(pi2));
-
+
if ( // nv1 * nv2 >= 0 &&
nv1.Length() > 1e-3 * horder * horder &&
nv2.Length() > 1e-3 * horder * horder &&
@@ -314,13 +323,14 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
metricweight, loch) +
CalcTriangleBadness (mesh.Point(pi2), mesh.Point(pi1), mesh.Point(pi4),
metricweight, loch);
+
}
if (allowswap)
{
Element2d sw1 (pi4, pi3, pi1);
- Element2d sw2 (pi4, pi4, pi2);
+ Element2d sw2 (pi3, pi4, pi2);
int legal1 =
mesh.LegalTrig (mesh.SurfaceElement (t1)) +
@@ -336,6 +346,8 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
{
// do swapping !
+ // cout << "swap " << endl;
+
nswaps ++;
// testout << "nv1 = " << nv1 << " nv2 = " << nv2 << endl;
@@ -363,8 +375,8 @@ void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
pdef[pi3]++;
pdef[pi4]++;
- swapped.Elem(t1) = 1;
- swapped.Elem(t2) = 1;
+ swapped[t1] = 1;
+ swapped[t2] = 1;
}
}
}
@@ -422,7 +434,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
int should;
PointIndex pi1, pi2;
- Point3d p1, p2, pnew;
+ MeshPoint p1, p2, pnew;
double bad1, bad2;
Vec3d nv;
@@ -436,9 +448,12 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
{
Element2d & el = mesh[seia[i]];
for (j = 0; j < el.GetNP(); j++)
- elementsonnode.Add (el[j], seia[i]);
+ {
+ elementsonnode.Add (el[j], seia[i]);
+ }
}
+
ARRAY<int,PointIndex::BASE> fixed(np);
fixed = 0;
@@ -472,10 +487,11 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
}
}
}
-
+
for (i = 0; i < seia.Size(); i++)
{
+
sei = seia[i];
Element2d & elem = mesh[sei];
if (elem.IsDeleted()) continue;
@@ -508,7 +524,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
// save version:
if (fixed.Get(pi1) || fixed.Get(pi2))
continue;
- if (pi2 < pi1) Swap (pi1, pi2);
+ if (pi2 < pi1) swap (pi1, pi2);
*/
// more general
@@ -550,6 +566,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
}
}
+
Element2d & hel = mesh[hasbothpi[0]];
for (k = 0; k < 3; k++)
if (hel[k] == pi1)
@@ -568,6 +585,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
// nv = normals.Get(pi1);
+
for (k = 0; k < elementsonnode[pi2].Size(); k++)
{
const Element2d & el2 = mesh[elementsonnode[pi2][k]];
@@ -632,6 +650,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
mesh[pi1] = p1;
mesh[pi2] = p2;
+
if (debugflag)
{
(*testout) << "bad1 = " << bad1 << ", bad2 = " << bad2 << endl;
@@ -654,17 +673,29 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
mesh[pi1] = pnew;
PointGeomInfo gi;
+ bool gi_set(false);
- Element2d & el1 = mesh[elementsonnode[pi1][0]];
- for (l = 0; l < el1.GetNP(); l++)
- if (el1[l] == pi1)
- gi = el1.GeomInfoPi (l+1);
-
+
+ Element2d *el1p;
+ l=0;
+ while(mesh[elementsonnode[pi1][l]].IsDeleted() && l<elementsonnode.EntrySize(pi1)) l++;
+ if(l<elementsonnode.EntrySize(pi1))
+ el1p = &mesh[elementsonnode[pi1][l]];
+ else
+ cerr << "OOPS!" << endl;
+
+ for (l = 0; l < el1p->GetNP(); l++)
+ if ((*el1p)[l] == pi1)
+ {
+ gi = el1p->GeomInfoPi (l+1);
+ gi_set = true;
+ }
// (*testout) << "Connect point " << pi2 << " to " << pi1 << "\n";
for (k = 0; k < elementsonnode[pi2].Size(); k++)
{
Element2d & el = mesh[elementsonnode[pi2][k]];
+ if(el.IsDeleted()) continue;
elementsonnode.Add (pi1, elementsonnode[pi2][k]);
bool haspi1 = 0;
@@ -703,6 +734,7 @@ void MeshOptimize2d :: CombineImprove (Mesh & mesh)
mesh[hasbothpi[k]][l] = PointIndex::BASE-1;
*/
}
+
}
}
}
diff --git a/Netgen/libsrc/meshing/improve2.hpp b/Netgen/libsrc/meshing/improve2.hpp
index 39cd1be018..0770a93b05 100644
--- a/Netgen/libsrc/meshing/improve2.hpp
+++ b/Netgen/libsrc/meshing/improve2.hpp
@@ -41,7 +41,7 @@ public:
virtual int CalcPointGeomInfo(PointGeomInfo& gi, const Point3d& /*p3*/) const
{ gi.trignum = 1; return 1;};
- virtual int CalcPointGeomInfo(int surfind, PointGeomInfo& gi, const Point3d& p3) const
+ virtual int CalcPointGeomInfo(int /* surfind */, PointGeomInfo& gi, const Point3d& p3) const
{ return CalcPointGeomInfo (gi, p3); }
///
diff --git a/Netgen/libsrc/meshing/improve2gen.cpp b/Netgen/libsrc/meshing/improve2gen.cpp
index 40291575f5..69f0e23b27 100644
--- a/Netgen/libsrc/meshing/improve2gen.cpp
+++ b/Netgen/libsrc/meshing/improve2gen.cpp
@@ -11,6 +11,7 @@ namespace netgen
public:
ARRAY<Element2d> oldels;
ARRAY<Element2d> newels;
+ ARRAY<INDEX_2> deledges;
ARRAY<int> incelsonnode;
ARRAY<int> reused;
int bonus;
@@ -31,10 +32,10 @@ namespace netgen
faceindex = 0;
}
- int j, k, l, ri;
+ // int j, k, l, ri;
int np = mesh.GetNP();
int ne = mesh.GetNSE();
- SurfaceElementIndex sei;
+ // SurfaceElementIndex sei;
bool ok;
int olddef, newdef;
@@ -54,6 +55,7 @@ namespace netgen
r1->oldels.Append (Element2d (1, 2, 3));
r1->oldels.Append (Element2d (3, 2, 4));
r1->newels.Append (Element2d (1, 2, 4, 3));
+ r1->deledges.Append (INDEX_2 (2,3));
r1->onp = 4;
r1->bonus = 2;
rules.Append (r1);
@@ -63,6 +65,8 @@ namespace netgen
r1->oldels.Append (Element2d (1, 2, 3, 4));
r1->oldels.Append (Element2d (4, 3, 2, 5));
r1->newels.Append (Element2d (1, 2, 5, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
+ r1->deledges.Append (INDEX_2 (3, 4));
r1->onp = 5;
r1->bonus = 0;
rules.Append (r1);
@@ -73,6 +77,7 @@ namespace netgen
r1->oldels.Append (Element2d (3, 2, 5, 6));
r1->newels.Append (Element2d (1, 6, 3, 4));
r1->newels.Append (Element2d (1, 2, 5, 6));
+ r1->deledges.Append (INDEX_2 (2, 3));
r1->onp = 6;
r1->bonus = 0;
rules.Append (r1);
@@ -84,6 +89,9 @@ namespace netgen
r1->oldels.Append (Element2d (3, 6, 7, 4));
r1->newels.Append (Element2d (1, 2, 5, 4));
r1->newels.Append (Element2d (4, 5, 6, 7));
+ r1->deledges.Append (INDEX_2 (2, 3));
+ r1->deledges.Append (INDEX_2 (3, 4));
+ r1->deledges.Append (INDEX_2 (3, 6));
r1->onp = 7;
r1->bonus = -1;
rules.Append (r1);
@@ -94,6 +102,9 @@ namespace netgen
r1->oldels.Append (Element2d (2, 5, 3));
r1->oldels.Append (Element2d (3, 5, 4));
r1->newels.Append (Element2d (1, 2, 5, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
+ r1->deledges.Append (INDEX_2 (3, 4));
+ r1->deledges.Append (INDEX_2 (3, 5));
r1->onp = 5;
r1->bonus = 0;
rules.Append (r1);
@@ -105,6 +116,8 @@ namespace netgen
r1->oldels.Append (Element2d (1, 4, 5));
r1->newels.Append (Element2d (1, 3, 4, 5));
r1->newels.Append (Element2d (1, 2, 6, 3));
+ r1->deledges.Append (INDEX_2 (1, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
r1->onp = 6;
r1->bonus = 0;
rules.Append (r1);
@@ -115,6 +128,8 @@ namespace netgen
r1->oldels.Append (Element2d (1, 4, 5));
r1->newels.Append (Element2d (1, 2, 4, 5));
r1->newels.Append (Element2d (4, 2, 6, 3));
+ r1->deledges.Append (INDEX_2 (1, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
r1->onp = 6;
r1->bonus = 0;
rules.Append (r1);
@@ -126,6 +141,9 @@ namespace netgen
r1->oldels.Append (Element2d (4, 3, 6));
r1->newels.Append (Element2d (1, 2, 6, 4));
r1->newels.Append (Element2d (2, 5, 6));
+ r1->deledges.Append (INDEX_2 (2, 3));
+ r1->deledges.Append (INDEX_2 (3, 4));
+ r1->deledges.Append (INDEX_2 (3, 6));
r1->onp = 6;
r1->bonus = -1;
rules.Append (r1);
@@ -136,6 +154,7 @@ namespace netgen
r1->oldels.Append (Element2d (2, 5, 3));
r1->newels.Append (Element2d (2, 5, 3, 4));
r1->newels.Append (Element2d (1, 2, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
r1->onp = 5;
r1->bonus = 0;
rules.Append (r1);
@@ -145,11 +164,25 @@ namespace netgen
r1->oldels.Append (Element2d (2, 5, 3));
r1->newels.Append (Element2d (1, 2, 5, 3));
r1->newels.Append (Element2d (1, 3, 4));
+ r1->deledges.Append (INDEX_2 (2, 3));
r1->onp = 5;
r1->bonus = 0;
rules.Append (r1);
+ // 2 quads to quad + 2 trigs
+ r1 = new ImprovementRule;
+ r1->oldels.Append (Element2d (1, 2, 3, 4));
+ r1->oldels.Append (Element2d (3, 2, 5, 6));
+ r1->newels.Append (Element2d (1, 5, 6, 4));
+ r1->newels.Append (Element2d (1, 2, 5));
+ r1->newels.Append (Element2d (4, 6, 3));
+ r1->deledges.Append (INDEX_2 (2, 3));
+ r1->onp = 6;
+ r1->bonus = 0;
+ // rules.Append (r1);
+
+
ARRAY<int> mapped(rules.Size());
@@ -159,29 +192,29 @@ namespace netgen
- for (ri = 0; ri < rules.Size(); ri++)
+ for (int ri = 0; ri < rules.Size(); ri++)
{
ImprovementRule & rule = *rules[ri];
rule.incelsonnode.SetSize (rule.onp);
rule.reused.SetSize (rule.onp);
- for (j = 1; j <= rule.onp; j++)
+ for (int j = 1; j <= rule.onp; j++)
{
rule.incelsonnode.Elem(j) = 0;
rule.reused.Elem(j) = 0;
}
- for (j = 1; j <= rule.oldels.Size(); j++)
+ for (int j = 1; j <= rule.oldels.Size(); j++)
{
const Element2d & el = rule.oldels.Elem(j);
- for (k = 1; k <= el.GetNP(); k++)
+ for (int k = 1; k <= el.GetNP(); k++)
rule.incelsonnode.Elem(el.PNum(k))--;
}
- for (j = 1; j <= rule.newels.Size(); j++)
+ for (int j = 1; j <= rule.newels.Size(); j++)
{
const Element2d & el = rule.newels.Elem(j);
- for (k = 1; k <= el.GetNP(); k++)
+ for (int k = 1; k <= el.GetNP(); k++)
{
rule.incelsonnode.Elem(el.PNum(k))++;
rule.reused.Elem(el.PNum(k)) = 1;
@@ -194,34 +227,34 @@ namespace netgen
TABLE<int,PointIndex::BASE> elonnode(np);
ARRAY<int,PointIndex::BASE> nelonnode(np);
- TABLE<int> nbels(ne);
+ TABLE<SurfaceElementIndex> nbels(ne);
nelonnode = -4;
- for (sei = 0; sei < ne; sei++)
+ for (SurfaceElementIndex sei = 0; sei < ne; sei++)
{
const Element2d & el = mesh[sei];
- if (el.GetIndex() == faceindex)
+ if (el.GetIndex() == faceindex && !el.IsDeleted())
{
- for (j = 0; j < el.GetNP(); j++)
+ for (int j = 0; j < el.GetNP(); j++)
elonnode.Add (el[j], sei);
}
- for (j = 0; j < el.GetNP(); j++)
+ for (int j = 0; j < el.GetNP(); j++)
nelonnode[el[j]]++;
}
- for (sei = 0; sei < ne; sei++)
+ for (SurfaceElementIndex sei = 0; sei < ne; sei++)
{
const Element2d & el = mesh[sei];
- if (el.GetIndex() == faceindex)
+ if (el.GetIndex() == faceindex && !el.IsDeleted())
{
- for (j = 0; j < el.GetNP(); j++)
+ for (int j = 0; j < el.GetNP(); j++)
{
- for (k = 0; k < elonnode[el[j]].Size(); k++)
+ for (int k = 0; k < elonnode[el[j]].Size(); k++)
{
int nbel = elonnode[el[j]] [k];
int used = 0;
- for (l = 0; l < nbels[sei].Size(); l++)
+ for (int l = 0; l < nbels[sei].Size(); l++)
if (nbels[sei][l] == nbel)
used = 1;
if (!used)
@@ -232,7 +265,7 @@ namespace netgen
}
- for (ri = 0; ri < rules.Size(); ri++)
+ for (int ri = 0; ri < rules.Size(); ri++)
{
const ImprovementRule & rule = *rules[ri];
@@ -242,221 +275,164 @@ namespace netgen
pgi.SetSize (rule.onp);
- // loop over elements and rotations:
- /*
- int nt = int (pow (ne, elmap.Size()));
- for (i = 1; i <= nt; i++)
- {
- int hi = i-1;
- for (j = 1; j <= elmap.Size(); j++)
- {
- elmap.Elem (j) = hi % ne + 1;
- hi /= ne;
- }
- */
-
- for (sei = 0; sei < ne; sei++)
+ for (SurfaceElementIndex sei = 0; sei < ne; sei++)
{
if (multithread.terminate)
break;
+ if (mesh[sei].IsDeleted()) continue;
elmap[0] = sei;
+ FlatArray<SurfaceElementIndex> neighbours = nbels[sei];
+
+ for (elrot[0] = 0; elrot[0] < mesh[sei].GetNP(); elrot[0]++)
+ {
+ const Element2d & el0 = mesh[sei];
+ const Element2d & rel0 = rule.oldels[0];
- int nnb = nbels[sei].Size();
- int nt = int (pow (double(nnb), double(elmap.Size()-1)));
+ if (el0.GetIndex() != faceindex) continue;
+ if (el0.IsDeleted()) continue;
+ if (el0.GetNP() != rel0.GetNP()) continue;
- for (int i = 1; i <= nt; i++)
- {
- int hi = i-1;
- for (j = 1; j < elmap.Size(); j++)
- {
- elmap[j] = nbels[sei][hi % nnb];
- hi /= nnb;
- }
- ok = 1;
- for (j = 0; j < elmap.Size(); j++)
+ pmap = -1;
+
+ for (int k = 0; k < el0.GetNP(); k++)
{
- const Element2d & el = mesh.SurfaceElement(elmap[j]);
- const Element2d & rel = rule.oldels[j];
-
- if (el.GetNP() != rel.GetNP()) { ok = 0; break; }
- if (el.IsDeleted()) { ok = 0; break; }
+ pmap.Elem(rel0[k]) = el0.PNumMod(k+elrot[0]+1);
+ pgi.Elem(rel0[k]) = el0.GeomInfoPiMod(k+elrot[0]+1);
}
- if (!ok) continue;
+ ok = 1;
+ for (int i = 1; i < elmap.Size(); i++)
+ {
+ // try to find a mapping for reference-element i
+ const Element2d & rel = rule.oldels[i];
+ bool possible = 0;
- int nr = int (pow (4.0, elmap.Size()));
- for (int i2 = 1; i2 <= nr; i2++)
- {
- int hi2 = i2-1;
- for (j = 1; j <= elmap.Size(); j++)
+ for (elmap[i] = 0; elmap[i] < neighbours.Size(); elmap[i]++)
{
- elrot.Elem (j) = hi2 % 4 + 1;
- hi2 /= 4;
- }
-
-
- // check applicable
-
- ok = 1;
+ const Element2d & el = mesh[neighbours[elmap[i]]];
+ if (el.IsDeleted()) continue;
+ if (el.GetNP() != rel.GetNP()) continue;
- // set mapped points
- for (j = 1; j <= elmap.Size(); j++)
- {
- const Element2d & el = mesh.SurfaceElement(elmap.Get(j));
- const Element2d & rel = rule.oldels.Get(j);
-
- /*
- if (el.GetNP() != rel.GetNP())
+ for (elrot[i] = 0; elrot[i] < rel.GetNP(); elrot[i]++)
{
- ok = 0;
- break;
- }
- */
+ possible = 1;
- for (k = 1; k <= el.GetNP(); k++)
- {
- /*
- if (el.PNum(k) < PointIndex::BASE)
+ for (int k = 0; k < rel.GetNP(); k++)
+ if (pmap.Elem(rel[k]) != -1 &&
+ pmap.Elem(rel[k]) != el.PNumMod (k+elrot[i]+1))
+ possible = 0;
+
+ if (possible)
{
- ok = 0;
+ for (int k = 0; k < el.GetNP(); k++)
+ {
+ pmap.Elem(rel[k]) = el.PNumMod(k+elrot[i]+1);
+ pgi.Elem(rel[k]) = el.GeomInfoPiMod(k+elrot[i]+1);
+ }
break;
}
- */
- pmap.Elem(rel.PNum(k)) =
- el.PNumMod(k+elrot.Get(j));
- pgi.Elem(rel.PNum(k)) =
- el.GeomInfoPiMod(k+elrot.Get(j));
}
+ if (possible) break;
}
- if (!ok) continue;
- /*
- (*testout) << "candidates found: " << endl;
- for (j = 1; j <= elmap.Size(); j++)
+ if (!possible)
{
- const Element2d & el = mesh.SurfaceElement(elmap.Get(j));
- (*testout) << "el " << elmap.Get(j)
- << ", rot = " << elrot.Get(j) << " "
- << el << endl;
+ ok = 0;
+ break;
}
- */
-
-
- // check consistently mapped points:
- for (j = 1; j <= elmap.Size(); j++)
- {
- const Element2d & el = mesh.SurfaceElement(elmap.Get(j));
- const Element2d & rel = rule.oldels.Get(j);
-
- for (k = 1; k <= el.GetNP(); k++)
- {
- if (pmap.Elem(rel.PNum(k)) != el.PNumMod(k+elrot.Get(j)))
- ok = 0;
- }
- }
- if (!ok) continue;
+ elmap[i] = neighbours[elmap[i]];
+ }
+ for(int i=0; ok && i<rule.deledges.Size(); i++)
+ {
+ ok = !mesh.IsSegment(pmap.Elem(rule.deledges[i].I1()),
+ pmap.Elem(rule.deledges[i].I2()));
+ }
+
+
+
+
+ if (!ok) continue;
+
+ mapped[ri]++;
+
+ olddef = 0;
+ for (int j = 1; j <= pmap.Size(); j++)
+ olddef += sqr (nelonnode[pmap.Get(j)]);
+ olddef += rule.bonus;
+
+ newdef = 0;
+ for (int j = 1; j <= pmap.Size(); j++)
+ if (rule.reused.Get(j))
+ newdef += sqr (nelonnode[pmap.Get(j)] +
+ rule.incelsonnode.Get(j));
+
+ if (newdef > olddef)
+ continue;
+
+ // calc metric badness
+ double bad1 = 0, bad2 = 0;
+ Vec3d n;
+
+ SelectSurfaceOfPoint (mesh.Point(pmap.Get(1)), pgi.Get(1));
+ GetNormalVector (surfnr, mesh.Point(pmap.Get(1)), pgi.Elem(1), n);
- mapped[ri]++;
-
- /*
- (*testout) << "application found: " << endl;
- for (j = 1; j <= elmap.Size(); j++)
- {
- const Element2d & el = mesh.SurfaceElement(elmap.Get(j));
- (*testout) << "el " << elmap.Get(j)
- << ", rot = " << elrot.Get(j) << " "
- << el << endl;
- }
- (*testout) << "points:";
- for (j = 1; j <= pmap.Size(); j++)
- (*testout) << " " << pmap.Get(j);
- (*testout) << endl;
- */
-
- olddef = 0;
- for (j = 1; j <= pmap.Size(); j++)
- olddef += sqr (nelonnode[pmap.Get(j)]);
- olddef += rule.bonus;
-
- newdef = 0;
- for (j = 1; j <= pmap.Size(); j++)
- if (rule.reused.Get(j))
- newdef += sqr (nelonnode[pmap.Get(j)] +
- rule.incelsonnode.Get(j));
-
- if (newdef > olddef)
- continue;
-
- // calc metric badness
- double bad1 = 0, bad2 = 0;
- Vec3d n;
-
- SelectSurfaceOfPoint (mesh.Point(pmap.Get(1)), pgi.Get(1));
- GetNormalVector (surfnr, mesh.Point(pmap.Get(1)), pgi.Elem(1), n);
-
- for (j = 1; j <= rule.oldels.Size(); j++)
- bad1 += mesh.SurfaceElement(elmap.Get(j)).CalcJacobianBadness (mesh.Points(), n);
+ for (int j = 1; j <= rule.oldels.Size(); j++)
+ bad1 += mesh.SurfaceElement(elmap.Get(j)).CalcJacobianBadness (mesh.Points(), n);
- // check new element:
- for (j = 1; j <= rule.newels.Size(); j++)
- {
- const Element2d & rnel = rule.newels.Get(j);
- Element2d nel(rnel.GetNP());
- for (k = 1; k <= rnel.GetNP(); k++)
- nel.PNum(k) = pmap.Get(rnel.PNum(k));
+ // check new element:
+ for (int j = 1; j <= rule.newels.Size(); j++)
+ {
+ const Element2d & rnel = rule.newels.Get(j);
+ Element2d nel(rnel.GetNP());
+ for (int k = 1; k <= rnel.GetNP(); k++)
+ nel.PNum(k) = pmap.Get(rnel.PNum(k));
- bad2 += nel.CalcJacobianBadness (mesh.Points(), n);
- }
+ bad2 += nel.CalcJacobianBadness (mesh.Points(), n);
+ }
- if (bad2 > 1e3) continue;
+ if (bad2 > 1e3) continue;
- if (newdef == olddef && bad2 > bad1) continue;
+ if (newdef == olddef && bad2 > bad1) continue;
-
- // generate new element:
- for (j = 1; j <= rule.newels.Size(); j++)
+
+ // generate new element:
+ for (int j = 1; j <= rule.newels.Size(); j++)
+ {
+ const Element2d & rnel = rule.newels.Get(j);
+ Element2d nel(rnel.GetNP());
+ nel.SetIndex (faceindex);
+ for (int k = 1; k <= rnel.GetNP(); k++)
{
- const Element2d & rnel = rule.newels.Get(j);
- Element2d nel(rnel.GetNP());
- nel.SetIndex (faceindex);
- for (k = 1; k <= rnel.GetNP(); k++)
- {
- nel.PNum(k) = pmap.Get(rnel.PNum(k));
- nel.GeomInfoPi(k) = pgi.Get(rnel.PNum(k));
- }
-
- mesh.AddSurfaceElement(nel);
+ nel.PNum(k) = pmap.Get(rnel.PNum(k));
+ nel.GeomInfoPi(k) = pgi.Get(rnel.PNum(k));
}
+
+ mesh.AddSurfaceElement(nel);
+ }
- for (j = 1; j <= rule.oldels.Size(); j++)
- mesh.DeleteSurfaceElement (elmap.Get(j));
+ for (int j = 0; j < rule.oldels.Size(); j++)
+ mesh.DeleteSurfaceElement ( elmap[j] );
- for (j = 1; j <= pmap.Size(); j++)
- nelonnode[pmap.Get(j)] += rule.incelsonnode.Get(j);
+ for (int j = 1; j <= pmap.Size(); j++)
+ nelonnode[pmap.Get(j)] += rule.incelsonnode.Get(j);
- used[ri]++;
- break;
- }
+ used[ri]++;
}
}
}
mesh.Compress();
- for (ri = 0; ri < rules.Size(); ri++)
+ for (int ri = 0; ri < rules.Size(); ri++)
{
PrintMessage (5, "rule ", ri+1, " ",
mapped[ri], "/", used[ri], " mapped/used");
}
-
- int sum = 0;
- for (int i = 0; i < used.Size(); i++)
- sum += used[i];
}
diff --git a/Netgen/libsrc/meshing/improve3.cpp b/Netgen/libsrc/meshing/improve3.cpp
index 625abaef65..1b9c8c52f6 100644
--- a/Netgen/libsrc/meshing/improve3.cpp
+++ b/Netgen/libsrc/meshing/improve3.cpp
@@ -21,22 +21,10 @@ namespace netgen
void MeshOptimize3d :: CombineImprove (Mesh & mesh,
OPTIMIZEGOAL goal)
{
- int j, k, l;
-
- ElementIndex ei;
- PointIndex pi1, pi2;
-
- Point3d p1, p2, pnew;
-
- double bad1, bad2;
-
int np = mesh.GetNP();
int ne = mesh.GetNE();
TABLE<ElementIndex, PointIndex::BASE> elementsonnode(np);
- ARRAY<Element*> hasonepoint;
- ARRAY<Element*> hasbothpoints;
-
ARRAY<ElementIndex> hasonepi, hasbothpi;
ARRAY<double> oneperr;
@@ -46,35 +34,35 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
(*testout) << "Start CombineImprove" << "\n";
// mesh.CalcSurfacesOfNode ();
-
char * savetask = multithread.task;
multithread.task = "Combine Improve";
- int cnt = 0;
- bad1 = 0;
- for (ei = 0; ei < ne; ei++)
+ double totalbad = 0;
+ for (ElementIndex ei = 0; ei < ne; ei++)
{
double elerr = CalcBad (mesh.Points(), mesh[ei], 0);
- bad1 += elerr;
+ totalbad += elerr;
elerrs[ei] = elerr;
}
if (goal == OPT_QUALITY)
{
- bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
- (*testout) << "Total badness = " << bad1 << endl;
- PrintMessage (5, "Total badness = ", bad1);
+ totalbad = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
+ (*testout) << "Total badness = " << totalbad << endl;
+ PrintMessage (5, "Total badness = ", totalbad);
}
- for (ei = 0; ei < ne; ei++)
- for (j = 0; j < mesh[ei].GetNP(); j++)
- elementsonnode.Add (mesh[ei][j], ei);
+ for (ElementIndex ei = 0; ei < ne; ei++)
+ if (!mesh[ei].IsDeleted())
+ for (int j = 0; j < mesh[ei].GetNP(); j++)
+ elementsonnode.Add (mesh[ei][j], ei);
- INDEX_2_HASHTABLE<int> edgetested (np);
+ INDEX_2_HASHTABLE<int> edgetested (np+1);
+ int cnt = 0;
- for (ei = 0; ei < ne; ei++)
+ for (ElementIndex ei = 0; ei < ne; ei++)
{
if (multithread.terminate)
break;
@@ -84,7 +72,7 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
if (mesh.ElementType(ei) == FIXEDELEMENT)
continue;
- for (j = 0; j < 6; j++)
+ for (int j = 0; j < 6; j++)
{
Element & elemi = mesh[ei];
if (elemi.IsDeleted()) continue;
@@ -93,8 +81,8 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
{ { 0, 1 }, { 0, 2 }, { 0, 3 },
{ 1, 2 }, { 1, 3 }, { 2, 3 } };
- pi1 = elemi[tetedges[j][0]];
- pi2 = elemi[tetedges[j][1]];
+ PointIndex pi1 = elemi[tetedges[j][0]];
+ PointIndex pi2 = elemi[tetedges[j][1]];
if (pi2 < pi1) Swap (pi1, pi2);
@@ -105,13 +93,13 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
edgetested.Set (si2, 1);
- hasonepoint.SetSize(0);
- hasbothpoints.SetSize(0);
+ // hasonepoint.SetSize(0);
+ // hasbothpoints.SetSize(0);
hasonepi.SetSize(0);
hasbothpi.SetSize(0);
FlatArray<ElementIndex> row1 = elementsonnode[pi1];
- for (k = 0; k < row1.Size(); k++)
+ for (int k = 0; k < row1.Size(); k++)
{
Element & elem = mesh[row1[k]];
if (elem.IsDeleted()) continue;
@@ -119,18 +107,16 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
if (elem[0] == pi2 || elem[1] == pi2 ||
elem[2] == pi2 || elem[3] == pi2)
{
- hasbothpoints.Append (&elem);
hasbothpi.Append (row1[k]);
}
else
{
- hasonepoint.Append (&elem);
hasonepi.Append (row1[k]);
}
}
FlatArray<ElementIndex> row2 = elementsonnode[pi2];
- for (k = 0; k < row2.Size(); k++)
+ for (int k = 0; k < row2.Size(); k++)
{
Element & elem = mesh[row2[k]];
if (elem.IsDeleted()) continue;
@@ -140,25 +126,26 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
;
else
{
- hasonepoint.Append (&elem);
hasonepi.Append (row2[k]);
}
}
- bad1 = 0;
- for (k = 0; k < hasonepoint.Size(); k++)
+ double bad1 = 0;
+ for (int k = 0; k < hasonepi.Size(); k++)
bad1 += elerrs[hasonepi[k]];
-
- for (k = 0; k < hasbothpoints.Size(); k++)
+ for (int k = 0; k < hasbothpi.Size(); k++)
bad1 += elerrs[hasbothpi[k]];
- p1 = mesh[pi1];
- p2 = mesh[pi2];
+ MeshPoint p1 = mesh[pi1];
+ MeshPoint p2 = mesh[pi2];
- if (mesh.PointType(pi2) != INNERPOINT)
+ // if (mesh.PointType(pi2) != INNERPOINT)
+ if (p2.Type() != INNERPOINT)
continue;
- if (mesh.PointType(pi1) != INNERPOINT)
+ MeshPoint pnew;
+ // if (mesh.PointType(pi1) != INNERPOINT)
+ if (p1.Type() != INNERPOINT)
pnew = p1;
else
pnew = Center (p1, p2);
@@ -166,11 +153,12 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
mesh[pi1] = pnew;
mesh[pi2] = pnew;
- oneperr.SetSize (hasonepoint.Size());
- bad2 = 0;
- for (k = 0; k < hasonepoint.Size(); k++)
+ oneperr.SetSize (hasonepi.Size());
+
+ double bad2 = 0;
+ for (int k = 0; k < hasonepi.Size(); k++)
{
- const Element & elem = *hasonepoint[k];
+ const Element & elem = mesh[hasonepi[k]];
double err = CalcTetBadness (mesh[elem[0]], mesh[elem[1]],
mesh[elem[2]], mesh[elem[3]], 0);
bad2 += err;
@@ -181,11 +169,13 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
mesh[pi2] = p2;
- if (mesh.PointType(pi1) != INNERPOINT)
+ // if (mesh.PointType(pi1) != INNERPOINT)
+ if (p1.Type() != INNERPOINT)
{
- for (k = 0; k < hasonepoint.Size(); k++)
+ for (int k = 0; k < hasonepi.Size(); k++)
{
- Element & elem = *hasonepoint[k];
+ Element & elem = mesh[hasonepi[k]];
+ int l;
for (l = 0; l < 4; l++)
if (elem[l] == pi2)
{
@@ -205,33 +195,35 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
}
}
- if (bad2 / hasonepoint.Size() <
- bad1 / (hasonepoint.Size()+hasbothpoints.Size()) )
+ if (bad2 / hasonepi.Size() <
+ bad1 / (hasonepi.Size()+hasbothpi.Size()))
{
mesh[pi1] = pnew;
cnt++;
FlatArray<ElementIndex> row = elementsonnode[pi2];
- for (k = 0; k < row.Size(); k++)
+ for (int k = 0; k < row.Size(); k++)
{
Element & elem = mesh[row[k]];
+ if (elem.IsDeleted()) continue;
+
elementsonnode.Add (pi1, row[k]);
- for (l = 0; l < elem.GetNP(); l++)
+ for (int l = 0; l < elem.GetNP(); l++)
if (elem[l] == pi2)
elem[l] = pi1;
elem.flags.illegal_valid = 0;
if (!mesh.LegalTet (elem))
- (*testout) << "illegal tet " << elementsonnode.Get (pi2, k) << endl;
+ (*testout) << "illegal tet " << elementsonnode[pi2][k] << endl;
}
- for (k = 0; k < hasonepoint.Size(); k++)
+ for (int k = 0; k < hasonepi.Size(); k++)
elerrs[hasonepi[k]] = oneperr[k];
- for (k = 0; k < hasbothpoints.Size(); k++)
+ for (int k = 0; k < hasbothpi.Size(); k++)
{
- hasbothpoints[k] -> flags.illegal_valid = 0;
- hasbothpoints[k] -> Delete();
+ mesh[hasbothpi[k]].flags.illegal_valid = 0;
+ mesh[hasbothpi[k]].Delete();
}
}
}
@@ -243,18 +235,18 @@ void MeshOptimize3d :: CombineImprove (Mesh & mesh,
PrintMessage (5, cnt, " elements combined");
(*testout) << "CombineImprove done" << "\n";
- bad1 = 0;
- for (ei = 0; ei < mesh.GetNE(); ei++)
- bad1 += CalcBad (mesh.Points(), mesh[ei], 0);
+ totalbad = 0;
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ totalbad += CalcBad (mesh.Points(), mesh[ei], 0);
if (goal == OPT_QUALITY)
{
- bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
- (*testout) << "Total badness = " << bad1 << endl;
+ totalbad = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
+ (*testout) << "Total badness = " << totalbad << endl;
int cntill = 0;
int ne = mesh.GetNE();
- for (ei = 0; ei < ne; ei++)
+ for (ElementIndex ei = 0; ei < ne; ei++)
if (!mesh.LegalTet (mesh[ei]))
cntill++;
@@ -529,7 +521,7 @@ void MeshOptimize3d :: SplitImprove (Mesh & mesh,
if (!mesh.LegalTet (newel2)) bad2 += 1e6;
}
- mesh.PointTypes().DeleteLast();
+ // mesh.PointTypes().DeleteLast();
mesh.Points().DeleteLast();
if (bad2 < bad1)
@@ -594,12 +586,9 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
{
int j, k, l;
- (*testout) << "swapimprove" << endl;
-
ElementIndex ei;
SurfaceElementIndex sei;
- int mattyp;
PointIndex pi1, pi2, pi3, pi4, pi5, pi6;
int cnt = 0;
@@ -710,7 +699,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
const Element & elemi = mesh[ei];
if (elemi.IsDeleted()) continue;
- mattyp = elemi.GetIndex();
+
+ // (*testout) << "check element " << elemi << endl;
+
+ int mattyp = elemi.GetIndex();
static const int tetedges[6][2] =
{ { 0, 1 }, { 0, 2 }, { 0, 3 },
@@ -860,8 +852,8 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
face.Sort();
if (faces.Used(face))
{
- (*testout) << "3->2 swap, could improve conformity, bad1 = " << bad1
- << ", bad2 = " << bad2 << endl;
+ // (*testout) << "3->2 swap, could improve conformity, bad1 = " << bad1
+ // << ", bad2 = " << bad2 << endl;
if (bad2 < 1e4)
bad1 = 2 * bad2;
}
@@ -890,6 +882,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
cnt++;
+ /*
(*testout) << "3->2 swap, old els = " << endl
<< mesh[hasbothpoints[0]] << endl
<< mesh[hasbothpoints[1]] << endl
@@ -897,7 +890,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
<< "new els = " << endl
<< el21 << endl
<< el22 << endl;
-
+ */
el21.flags.illegal_valid = 0;
@@ -1157,6 +1150,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
// (*mycout) << "bad1 = " << bad1 << " bad2 = " << bad2 << "\n";
+ /*
(*testout) << "4->4 swap A, old els = " << endl
<< mesh[hasbothpoints[0]] << endl
<< mesh[hasbothpoints[1]] << endl
@@ -1167,7 +1161,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
<< el2 << endl
<< el3 << endl
<< el4 << endl;
-
+ */
@@ -1194,7 +1188,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
el4b.flags.illegal_valid = 0;
-
+ /*
(*testout) << "4->4 swap A, old els = " << endl
<< mesh[hasbothpoints[0]] << endl
<< mesh[hasbothpoints[1]] << endl
@@ -1205,7 +1199,7 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
<< el2b << endl
<< el3b << endl
<< el4b << endl;
-
+ */
mesh[hasbothpoints[0]] = el1b;
@@ -1349,8 +1343,8 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
hi3.Sort();
if (faces.Used(hi3))
{
- (*testout) << "could improve face conformity, bad1 = " << bad1
- << ", bad 2 = " << bad2 << ", nottoobad = " << nottoobad << endl;
+ // (*testout) << "could improve face conformity, bad1 = " << bad1
+ // << ", bad 2 = " << bad2 << ", nottoobad = " << nottoobad << endl;
if (nottoobad)
confface = l;
}
@@ -1361,8 +1355,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
if (mesh.BoundaryEdge (suroundpts[l],
suroundpts[k % nsuround]))
{
+ /*
*testout << "could improve edge conformity, bad1 = " << bad1
<< ", bad 2 = " << bad2 << ", nottoobad = " << nottoobad << endl;
+ */
if (nottoobad)
confedge = l;
}
@@ -1390,9 +1386,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
hel[3] = pi2;
hel.flags.illegal_valid = 0;
+ /*
(*testout) << nsuround << "-swap, new el,top = "
<< hel << endl;
-
+ */
mesh.AddVolumeElement (hel);
for (k1 = 0; k1 < 4; k1++)
elementsonnode.Add (hel[k1], mesh.GetNE()-1);
@@ -1402,10 +1399,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
hel[1] = suroundpts[(k+1) % nsuround];
hel[3] = pi1;
-
+ /*
(*testout) << nsuround << "-swap, new el,bot = "
<< hel << endl;
-
+ */
mesh.AddVolumeElement (hel);
for (k1 = 0; k1 < 4; k1++)
@@ -1415,10 +1412,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
for (k = 0; k < nsuround; k++)
{
Element & rel = mesh[hasbothpoints[k]];
-
+ /*
(*testout) << nsuround << "-swap, old el = "
<< rel << endl;
-
+ */
rel.Delete();
for (int k1 = 0; k1 < 4; k1++)
rel[k1] = 0;
@@ -1451,11 +1448,13 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
mesh.Compress ();
+ /*
if (goal == OPT_QUALITY)
{
bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
- (*testout) << "Total badness = " << bad1 << endl;
+ // (*testout) << "Total badness = " << bad1 << endl;
}
+ */
/*
for (i = 1; i <= GetNE(); i++)
@@ -1486,12 +1485,10 @@ void MeshOptimize3d :: SwapImprove (Mesh & mesh, OPTIMIZEGOAL goal)
void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
{
int j, k, l;
- // INDEX_2 i2;
ElementIndex ei, eli1, eli2, elnr;
SurfaceElementIndex sei;
PointIndex pi1, pi2, pi3, pi4, pi5;
- int mattyp;
int cnt = 0;
Element el21(TET), el22(TET), el31(TET), el32(TET), el33(TET);
@@ -1530,6 +1527,7 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
bad1 = CalcTotalBad (mesh.Points(), mesh.VolumeElements());
(*testout) << "Total badness = " << bad1 << endl;
+ // cout << "tot bad = " << bad1 << endl;
// find elements on node
@@ -1541,9 +1539,7 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
for (j = 0; j < 3; j++)
belementsonnode.Add (mesh[sei][j], sei);
- // cout << "main loop" << endl;
-
- for (eli1 = 0; eli1 < mesh.GetNE(); eli1++)
+ for (eli1 = 0; eli1 < ne; eli1++)
{
if (multithread.terminate)
break;
@@ -1559,7 +1555,8 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
CalcBad (mesh.Points(), mesh[eli1], 0) < 1e3)
continue;
-
+ // cout << "eli = " << eli1 << endl;
+ // (*testout) << "swapimp2, eli = " << eli1 << "; el = " << mesh[eli1] << endl;
for (j = 0; j < 4; j++)
{
@@ -1569,7 +1566,7 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
// if (elem[0] < PointIndex::BASE) continue;
if (elem.IsDeleted()) continue;
- mattyp = elem.GetIndex();
+ int mattyp = elem.GetIndex();
switch (j)
{
@@ -1694,6 +1691,7 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
if (do_swap)
{
+ // cout << "do swap, eli1 = " << eli1 << "; eli2 = " << eli2 << endl;
// (*mycout) << "2->3 " << flush;
cnt++;
@@ -1730,7 +1728,6 @@ void MeshOptimize3d :: SwapImprove2 (Mesh & mesh, OPTIMIZEGOAL goal)
}
}
- // cout << "loop done" << endl;
PrintMessage (5, cnt, " swaps performed");
diff --git a/Netgen/libsrc/meshing/localh.hpp b/Netgen/libsrc/meshing/localh.hpp
index 9d6ea35a50..7531bc7faf 100644
--- a/Netgen/libsrc/meshing/localh.hpp
+++ b/Netgen/libsrc/meshing/localh.hpp
@@ -74,6 +74,8 @@ public:
///
void Delete();
///
+ void SetGrading (double agrading) { grading = agrading; }
+ ///
void SetH (const Point3d & x, double h);
///
double GetH (const Point3d & x) const;
diff --git a/Netgen/libsrc/meshing/meshclass.cpp b/Netgen/libsrc/meshing/meshclass.cpp
index 668c1f3d6e..25c44f337e 100644
--- a/Netgen/libsrc/meshing/meshclass.cpp
+++ b/Netgen/libsrc/meshing/meshclass.cpp
@@ -5,734 +5,982 @@
namespace netgen
{
-Mesh :: Mesh ()
- : ident (*this)
+ Mesh :: Mesh ()
+ {
+ boundaryedges = NULL;
+ surfelementht = NULL;
+ segmentht = NULL;
+
+ lochfunc = NULL;
+ mglevels = 1;
+ elementsearchtree = NULL;
+ elementsearchtreets = NextTimeStamp();
+ majortimestamp = timestamp = NextTimeStamp();
+ hglob = 1e10;
+ numvertices = -1;
+ dimension = 3;
+ topology = new MeshTopology (*this);
+ curvedelems = new CurvedElements (*this);
+ clusters = new AnisotropicClusters (*this);
+ ident = new Identifications (*this);
+
+ hpelements = NULL;
+ coarsemesh = NULL;
-{
- boundaryedges = NULL;
- surfelementht = NULL;
- segmentht = NULL;
-
- lochfunc = NULL;
- mglevels = 1;
- elementsearchtree = NULL;
- elementsearchtreets = NextTimeStamp();
- majortimestamp = timestamp = NextTimeStamp();
- hglob = 1e10;
- numvertices = -1;
- dimension = 3;
- topology = new MeshTopology (*this);
- curvedelems = new CurvedElements (*this);
- clusters = new AnisotropicClusters (*this);
-
- // volelements.SetName ("Volume Elements");
- // surfelements.SetName ("Surface Elements");
- // points.SetName ("Mesh Points");
-}
+ }
-Mesh :: ~Mesh()
-{
- // DeleteMesh();
- delete lochfunc;
- delete boundaryedges;
- delete surfelementht;
- delete segmentht;
- delete curvedelems;
- delete clusters;
- delete topology;
-}
+ Mesh :: ~Mesh()
+ {
+ delete lochfunc;
+ delete boundaryedges;
+ delete surfelementht;
+ delete segmentht;
+ delete curvedelems;
+ delete clusters;
+ delete topology;
+ delete ident;
-void Mesh :: DeleteMesh()
-{
- points.SetSize(0);
- ptyps.SetSize(0);
- segments.SetSize(0);
- surfelements.SetSize(0);
- volelements.SetSize(0);
- lockedpoints.SetSize(0);
- surfacesonnode.SetSize(0);
-
- delete boundaryedges;
- boundaryedges = NULL;
-
- openelements.SetSize(0);
- facedecoding.SetSize(0);
-
- ident.Delete();
-
- delete topology;
- topology = new MeshTopology (*this);
- delete curvedelems;
- curvedelems = new CurvedElements (*this);
- delete clusters;
- clusters = new AnisotropicClusters (*this);
-
- timestamp = NextTimeStamp();
-}
+ delete coarsemesh;
+ delete hpelements;
+
+ for (int i = 0; i < materials.Size(); i++)
+ delete [] materials[i];
+ }
+
+
+ Mesh & Mesh :: operator= (const Mesh & mesh2)
+ {
+ points = mesh2.points;
+ eltyps = mesh2.eltyps;
+ segments = mesh2.segments;
+ surfelements = mesh2.surfelements;
+ volelements = mesh2.volelements;
+ lockedpoints = mesh2.lockedpoints;
+ facedecoding = mesh2.facedecoding;
+ dimension = mesh2.dimension;
+ return *this;
+ }
+
+ void Mesh :: DeleteMesh()
+ {
+ points.SetSize(0);
+ // ptyps.SetSize(0);
+ segments.SetSize(0);
+ surfelements.SetSize(0);
+ volelements.SetSize(0);
+ lockedpoints.SetSize(0);
+ surfacesonnode.SetSize(0);
+ delete boundaryedges;
+ boundaryedges = NULL;
+ openelements.SetSize(0);
+ facedecoding.SetSize(0);
-PointIndex Mesh :: AddPoint (const Point3d & p, int layer)
-{
- NgLock lock(mutex);
- lock.Lock();
+ // ident -> Delete();
+ delete ident;
+ ident = new Identifications (*this);
+ delete topology;
+ topology = new MeshTopology (*this);
+ delete curvedelems;
+ curvedelems = new CurvedElements (*this);
+ delete clusters;
+ clusters = new AnisotropicClusters (*this);
- timestamp = NextTimeStamp();
+ timestamp = NextTimeStamp();
+ }
- if (ptyps.Size() == points.Size())
- ptyps.Append (INNERPOINT);
- PointIndex pi = points.Size() + PointIndex::BASE;
- points.Append ( MeshPoint (p, layer) );
- lock.UnLock();
+ PointIndex Mesh :: AddPoint (const Point3d & p, int layer)
+ {
+ NgLock lock(mutex);
+ lock.Lock();
- return pi;
-}
+ timestamp = NextTimeStamp();
+
+ PointIndex pi = points.Size() + PointIndex::BASE;
+ points.Append ( MeshPoint (p, layer, INNERPOINT) );
+ lock.UnLock();
-SegmentIndex Mesh :: AddSegment (const Segment & s)
-{
- NgLock lock(mutex);
- lock.Lock();
- timestamp = NextTimeStamp();
+ return pi;
+ }
- int maxn = max2 (s.p1, s.p2);
- maxn += 1-PointIndex::BASE;
- if (maxn > ptyps.Size())
- {
+ SegmentIndex Mesh :: AddSegment (const Segment & s)
+ {
+ NgLock lock(mutex);
+ lock.Lock();
+ timestamp = NextTimeStamp();
+
+ int maxn = max2 (s.p1, s.p2);
+ maxn += 1-PointIndex::BASE;
+
+ /*
+ if (maxn > ptyps.Size())
+ {
int maxo = ptyps.Size();
ptyps.SetSize (maxn);
for (int i = maxo; i < maxn; i++)
- ptyps[i] = INNERPOINT;
- }
+ ptyps[i] = INNERPOINT;
+ }
- if (ptyps[s.p1] > EDGEPOINT) ptyps[s.p1] = EDGEPOINT;
- if (ptyps[s.p2] > EDGEPOINT) ptyps[s.p2] = EDGEPOINT;
-
- SegmentIndex si = segments.Size();
- segments.Append (s);
+ if (ptyps[s.p1] > EDGEPOINT) ptyps[s.p1] = EDGEPOINT;
+ if (ptyps[s.p2] > EDGEPOINT) ptyps[s.p2] = EDGEPOINT;
+ */
+
+ if (maxn <= points.Size())
+ {
+ if (points[s.p1].Type() > EDGEPOINT)
+ points[s.p1].SetType (EDGEPOINT);
+ if (points[s.p2].Type() > EDGEPOINT)
+ points[s.p2].SetType (EDGEPOINT);
+ }
+ /*
+ else
+ {
+ cerr << "edge points nrs > points.Size" << endl;
+ }
+ */
+
+ SegmentIndex si = segments.Size();
+ segments.Append (s);
- lock.UnLock();
- return si;
-}
+ lock.UnLock();
+ return si;
+ }
-SurfaceElementIndex Mesh :: AddSurfaceElement (const Element2d & el)
-{
- NgLock lock(mutex);
- lock.Lock();
- timestamp = NextTimeStamp();
+ SurfaceElementIndex Mesh :: AddSurfaceElement (const Element2d & el)
+ {
+ NgLock lock(mutex);
+ lock.Lock();
+ timestamp = NextTimeStamp();
- int i;
- int maxn = el[0];
- for (i = 1; i < el.GetNP(); i++)
- if (el[i] > maxn) maxn = el[i];
+ int maxn = el[0];
+ for (int i = 1; i < el.GetNP(); i++)
+ if (el[i] > maxn) maxn = el[i];
- maxn += 1-PointIndex::BASE;
+ maxn += 1-PointIndex::BASE;
- if (maxn > ptyps.Size())
- {
+ /*
+ if (maxn > ptyps.Size())
+ {
int maxo = ptyps.Size();
ptyps.SetSize (maxn);
for (i = maxo+PointIndex::BASE;
- i < maxn+PointIndex::BASE; i++)
- ptyps[i] = INNERPOINT;
- }
-
- for (i = 0; i < el.GetNP(); i++)
- if (ptyps[el[i]] > SURFACEPOINT)
- ptyps[el[i]] = SURFACEPOINT;
-
- SurfaceElementIndex si = surfelements.Size();
- surfelements.Append (el);
+ i < maxn+PointIndex::BASE; i++)
+ ptyps[i] = INNERPOINT;
+
+ }
+ */
+ if (maxn <= points.Size())
+ {
+ for (int i = 0; i < el.GetNP(); i++)
+ if (points[el[i]].Type() > SURFACEPOINT)
+ points[el[i]].SetType(SURFACEPOINT);
+ }
+ /*
+ else
+ {
+ cerr << "surf points nrs > points.Size" << endl;
+ }
+ */
- lock.UnLock();
- return si;
-}
+ SurfaceElementIndex si = surfelements.Size();
+ surfelements.Append (el);
+ lock.UnLock();
+ return si;
+ }
-ElementIndex Mesh :: AddVolumeElement (const Element & el)
-{
- NgLock lock(mutex);
- lock.Lock();
- int i;
+ ElementIndex Mesh :: AddVolumeElement (const Element & el)
+ {
+ NgLock lock(mutex);
+ lock.Lock();
- int maxn = el[0];
- for (i = 1; i < el.GetNP(); i++)
- if (el[i] > maxn) maxn = el[i];
+ int maxn = el[0];
+ for (int i = 1; i < el.GetNP(); i++)
+ if (el[i] > maxn) maxn = el[i];
- maxn += 1-PointIndex::BASE;
+ maxn += 1-PointIndex::BASE;
- if (maxn > ptyps.Size())
- {
+ /*
+ if (maxn > ptyps.Size())
+ {
int maxo = ptyps.Size();
ptyps.SetSize (maxn);
for (i = maxo+PointIndex::BASE;
- i < maxn+PointIndex::BASE; i++)
- ptyps[i] = INNERPOINT;
- }
-
+ i < maxn+PointIndex::BASE; i++)
+ ptyps[i] = INNERPOINT;
+ }
+ */
+ /*
+ if (maxn > points.Size())
+ {
+ cerr << "add vol element before point" << endl;
+ }
+ */
- int ve = volelements.Size();
+ int ve = volelements.Size();
- volelements.Append (el);
- volelements.Last().flags.illegal_valid = 0;
+ volelements.Append (el);
+ volelements.Last().flags.illegal_valid = 0;
- while (volelements.Size() > eltyps.Size())
- eltyps.Append (FREEELEMENT);
+ while (volelements.Size() > eltyps.Size())
+ eltyps.Append (FREEELEMENT);
- timestamp = NextTimeStamp();
-
- lock.UnLock();
- return ve;
-}
+ timestamp = NextTimeStamp();
+ lock.UnLock();
+ return ve;
+ }
-void Mesh :: Save (const char * filename) const
-{
- int i, j;
- double scale = 1; // globflags.GetNumFlag ("scale", 1);
- int inverttets = 0; // globflags.GetDefineFlag ("inverttets");
- int invertsurf = 0; // globflags.GetDefineFlag ("invertsurfacemesh");
+ void Mesh :: Save (const string & filename) const
+ {
+ int i, j;
- ofstream outfile(filename);
+ double scale = 1; // globflags.GetNumFlag ("scale", 1);
+ int inverttets = 0; // globflags.GetDefineFlag ("inverttets");
+ int invertsurf = 0; // globflags.GetDefineFlag ("invertsurfacemesh");
+ ofstream outfile(filename.c_str());
- outfile << "mesh3d" << "\n";
- outfile << "dimension\n" << GetDimension() << "\n";
+ outfile << "mesh3d" << "\n";
- outfile << "\n";
- outfile << "# surfnr bcnr domin domout np p1 p2 p3"
- << "\n";
+ outfile << "dimension\n" << GetDimension() << "\n";
- outfile << "surfaceelementsgi" << "\n";
- // outfile << "surfaceelements" << "\n";
- outfile << GetNSE() << "\n";
+ outfile << "\n";
+ outfile << "# surfnr bcnr domin domout np p1 p2 p3"
+ << "\n";
- SurfaceElementIndex sei;
- for (sei = 0; sei < GetNSE(); sei++)
- {
- if ((*this)[sei].GetIndex())
- {
- outfile.width(8);
- outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).SurfNr()+1;
- outfile.width(8);
- outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).BCProperty();
- outfile.width(8);
- outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).DomainIn();
- outfile.width(8);
- outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).DomainOut();
- }
- else
- outfile << " 0 0 0";
+ outfile << "surfaceelementsgi" << "\n";
+ // outfile << "surfaceelements" << "\n";
+ outfile << GetNSE() << "\n";
+ SurfaceElementIndex sei;
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
+ if ((*this)[sei].GetIndex())
+ {
+ outfile.width(8);
+ outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).SurfNr()+1;
+ outfile.width(8);
+ outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).BCProperty();
+ outfile.width(8);
+ outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).DomainIn();
+ outfile.width(8);
+ outfile << GetFaceDescriptor((*this)[sei].GetIndex ()).DomainOut();
+ }
+ else
+ outfile << " 0 0 0";
- Element2d sel = (*this)[sei];
- if (invertsurf)
- sel.Invert();
- outfile.width(8);
- outfile << sel.GetNP();
+ Element2d sel = (*this)[sei];
+ if (invertsurf)
+ sel.Invert();
- for (j = 0; j < sel.GetNP(); j++)
- {
- outfile.width(8);
- outfile << sel[j];
- }
+ outfile.width(8);
+ outfile << sel.GetNP();
- for (j = 1; j <= sel.GetNP(); j++)
- {
- outfile.width(7);
- outfile << " " << sel.GeomInfoPi(j).trignum;
- }
- outfile << endl;
- }
+ for (j = 0; j < sel.GetNP(); j++)
+ {
+ outfile.width(8);
+ outfile << sel[j];
+ }
- outfile << "\n" << "\n";
- outfile << "# matnr np p1 p2 p3 p4" << "\n";
- outfile << "volumeelements" << "\n";
- outfile << GetNE() << "\n";
+ for (j = 1; j <= sel.GetNP(); j++)
+ {
+ outfile.width(7);
+ outfile << " " << sel.GeomInfoPi(j).trignum;
+ }
+ outfile << endl;
+ }
- for (ElementIndex ei = 0; ei < GetNE(); ei++)
- {
- outfile.width(8);
- outfile << (*this)[ei].GetIndex();
- outfile.width(8);
- outfile << (*this)[ei].GetNP();
+ outfile << "\n" << "\n";
+ outfile << "# matnr np p1 p2 p3 p4" << "\n";
+ outfile << "volumeelements" << "\n";
+ outfile << GetNE() << "\n";
- Element el = (*this)[ei];
- if (inverttets)
- el.Invert();
+ for (ElementIndex ei = 0; ei < GetNE(); ei++)
+ {
+ outfile.width(8);
+ outfile << (*this)[ei].GetIndex();
+ outfile.width(8);
+ outfile << (*this)[ei].GetNP();
- for (j = 0; j < el.GetNP(); j++)
- {
- outfile.width(8);
- outfile << el[j];
- }
- outfile << "\n";
- }
+ Element el = (*this)[ei];
+ if (inverttets)
+ el.Invert();
+ for (j = 0; j < el.GetNP(); j++)
+ {
+ outfile.width(8);
+ outfile << el[j];
+ }
+ outfile << "\n";
+ }
- outfile << "\n" << "\n";
- outfile << " surf1 surf2 p1 p2" << "\n";
- outfile << "edgesegmentsgi2" << "\n";
- outfile << GetNSeg() << "\n";
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment (i);
- outfile.width(8);
- outfile << seg.si;
- outfile.width(8);
- outfile << 0;
- outfile.width(8);
- outfile << seg.p1;
- outfile.width(8);
- outfile << seg.p2;
- outfile << " ";
- outfile.width(8);
- outfile << seg.geominfo[0].trignum;
- outfile << " ";
- outfile.width(8);
- outfile << seg.geominfo[1].trignum << endl;
-
- outfile << " ";
- outfile.width(8);
- outfile << seg.surfnr1+1;
- outfile << " ";
- outfile.width(8);
- outfile << seg.surfnr2+1;
- outfile << " ";
- outfile.width(8);
- outfile << seg.edgenr;
- // outfile << seg.epgeominfo[0].edgenr;
- /*
- outfile.width(8);
- outfile << seg.epgeominfo[0].lefttrig;
- outfile.width(8);
- outfile << seg.epgeominfo[0].righttrig;
- */
- outfile << " ";
- outfile.width(12);
- outfile << seg.epgeominfo[0].dist;
- outfile << " ";
- outfile.width(8);
- outfile << seg.epgeominfo[1].edgenr;
- /*
- outfile.width(8);
- outfile << seg.epgeominfo[1].lefttrig;
- outfile.width(8);
- outfile << seg.epgeominfo[1].righttrig;
- */
- outfile << " ";
- outfile.width(12);
- outfile << seg.epgeominfo[1].dist;
-
- outfile << "\n";
- }
+ outfile << "\n" << "\n";
+ outfile << " surf1 surf2 p1 p2" << "\n";
+ outfile << "edgesegmentsgi2" << "\n";
+ outfile << GetNSeg() << "\n";
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment (i);
+ outfile.width(8);
+ outfile << seg.si;
+ outfile.width(8);
+ outfile << 0;
+ outfile.width(8);
+ outfile << seg.p1;
+ outfile.width(8);
+ outfile << seg.p2;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.geominfo[0].trignum;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.geominfo[1].trignum << endl;
+
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.surfnr1+1;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.surfnr2+1;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.edgenr;
+ // outfile << seg.epgeominfo[0].edgenr;
+ /*
+ outfile.width(8);
+ outfile << seg.epgeominfo[0].lefttrig;
+ outfile.width(8);
+ outfile << seg.epgeominfo[0].righttrig;
+ */
+ outfile << " ";
+ outfile.width(12);
+ outfile << seg.epgeominfo[0].dist;
+ outfile << " ";
+ outfile.width(8);
+ outfile << seg.epgeominfo[1].edgenr;
+ /*
+ outfile.width(8);
+ outfile << seg.epgeominfo[1].lefttrig;
+ outfile.width(8);
+ outfile << seg.epgeominfo[1].righttrig;
+ */
+ outfile << " ";
+ outfile.width(12);
+ outfile << seg.epgeominfo[1].dist;
+ outfile << "\n";
+ }
- outfile << "\n" << "\n";
- outfile << "# X Y Z" << "\n";
- outfile << "points" << "\n";
- outfile << GetNP() << "\n";
- outfile.precision(16);
- outfile.setf (ios::fixed, ios::floatfield);
- outfile.setf (ios::showpoint);
+ outfile << "\n" << "\n";
+ outfile << "# X Y Z" << "\n";
+ outfile << "points" << "\n";
+ outfile << GetNP() << "\n";
+ outfile.precision(16);
+ outfile.setf (ios::fixed, ios::floatfield);
+ outfile.setf (ios::showpoint);
- PointIndex pi;
- for (pi = 1; pi <= GetNP(); pi++)
- {
- outfile.width(22);
- outfile << (*this)[pi].X()/scale << " ";
- outfile.width(22);
- outfile << (*this)[pi].Y()/scale << " ";
- outfile.width(22);
- outfile << (*this)[pi].Z()/scale << "\n";
- }
-
- if (ident.GetMaxNr() > 0)
- {
- outfile << "identifications\n";
- ARRAY<INDEX_2> identpairs;
- int cnt = 0;
- for (i = 1; i <= ident.GetMaxNr(); i++)
- {
- ident.GetPairs (i, identpairs);
- cnt += identpairs.Size();
- }
- outfile << cnt << "\n";
- for (i = 1; i <= ident.GetMaxNr(); i++)
- {
- ident.GetPairs (i, identpairs);
- for (j = 1; j <= identpairs.Size(); j++)
- {
- outfile.width (8);
- outfile << identpairs.Get(j).I1();
- outfile.width (8);
- outfile << identpairs.Get(j).I2();
- outfile.width (8);
- outfile << i << "\n";
- }
- }
- }
+ PointIndex pi;
+ for (pi = PointIndex::BASE;
+ pi < GetNP()+PointIndex::BASE; pi++)
+ {
+ outfile.width(22);
+ outfile << (*this)[pi].X()/scale << " ";
+ outfile.width(22);
+ outfile << (*this)[pi].Y()/scale << " ";
+ outfile.width(22);
+ outfile << (*this)[pi].Z()/scale << "\n";
+ }
+
+ if (ident -> GetMaxNr() > 0)
+ {
+ outfile << "identifications\n";
+ ARRAY<INDEX_2> identpairs;
+ int cnt = 0;
+ for (i = 1; i <= ident -> GetMaxNr(); i++)
+ {
+ ident -> GetPairs (i, identpairs);
+ cnt += identpairs.Size();
+ }
+ outfile << cnt << "\n";
+ for (i = 1; i <= ident -> GetMaxNr(); i++)
+ {
+ ident -> GetPairs (i, identpairs);
+ for (j = 1; j <= identpairs.Size(); j++)
+ {
+ outfile.width (8);
+ outfile << identpairs.Get(j).I1();
+ outfile.width (8);
+ outfile << identpairs.Get(j).I2();
+ outfile.width (8);
+ outfile << i << "\n";
+ }
+ }
+ }
- int cntmat = 0;
- for (i = 1; i <= materials.Size(); i++)
- if (materials.Get(i) && strlen (materials.Get(i)))
- cntmat++;
+ int cntmat = 0;
+ for (i = 1; i <= materials.Size(); i++)
+ if (materials.Get(i) && strlen (materials.Get(i)))
+ cntmat++;
- if (cntmat)
- {
- outfile << "materials" << endl;
- outfile << cntmat << endl;
- for (i = 1; i <= materials.Size(); i++)
- if (materials.Get(i) && strlen (materials.Get(i)))
- outfile << i << " " << materials.Get(i) << endl;
- }
+ if (cntmat)
+ {
+ outfile << "materials" << endl;
+ outfile << cntmat << endl;
+ for (i = 1; i <= materials.Size(); i++)
+ if (materials.Get(i) && strlen (materials.Get(i)))
+ outfile << i << " " << materials.Get(i) << endl;
+ }
- // delete houtfile;
-}
+
+ int cnt_sing = 0;
+ for (PointIndex pi = PointIndex::BASE; pi < GetNP()+PointIndex::BASE; pi++)
+ if ((*this)[pi].IsSingular()) cnt_sing++;
+
+ if (cnt_sing)
+ {
+ outfile << "singular_points" << endl << cnt_sing << endl;
+ for (PointIndex pi = PointIndex::BASE; pi < GetNP()+PointIndex::BASE; pi++)
+ if ((*this)[pi].IsSingular())
+ outfile << int(pi) << endl;
+ }
+ cnt_sing = 0;
+ for (SegmentIndex si = 0; si < GetNSeg(); si++)
+ if ( segments[si].singedge_left ) cnt_sing++;
+ if (cnt_sing)
+ {
+ outfile << "singular_edge_left" << endl << cnt_sing << endl;
+ for (SegmentIndex si = 0; si < GetNSeg(); si++)
+ if ( segments[si].singedge_left )
+ outfile << int(si) << endl;
+ }
-void Mesh :: Load (const char * filename)
-{
- char str[100];
- int i, n;
+ cnt_sing = 0;
+ for (SegmentIndex si = 0; si < GetNSeg(); si++)
+ if ( segments[si].singedge_right ) cnt_sing++;
+ if (cnt_sing)
+ {
+ outfile << "singular_edge_right" << endl << cnt_sing << endl;
+ for (SegmentIndex si = 0; si < GetNSeg(); si++)
+ if ( segments[si].singedge_right )
+ outfile << int(si) << endl;
+ }
- double scale = 1; // globflags.GetNumFlag ("scale", 1);
- int inverttets = 0; // globflags.GetDefineFlag ("inverttets");
- int invertsurf = 0; // globflags.GetDefineFlag ("invertsurfacemesh");
+ cnt_sing = 0;
+ for (SurfaceElementIndex sei = 0; sei < GetNSE(); sei++)
+ if ( GetFaceDescriptor ((*this)[sei].GetIndex()).domin_singular) cnt_sing++;
+ if (cnt_sing)
+ {
+ outfile << "singular_face_inside" << endl << cnt_sing << endl;
+ for (SurfaceElementIndex sei = 0; sei < GetNSE(); sei++)
+ if ( GetFaceDescriptor ((*this)[sei].GetIndex()).domin_singular)
+ outfile << int(sei) << endl;
+ }
- ifstream infile(filename);
- if (!infile.good())
- {
- throw NgException ("mesh file not found");
- // cerr << "mesh file not found !!" << endl;
- // return;
- }
+ cnt_sing = 0;
+ for (SurfaceElementIndex sei = 0; sei < GetNSE(); sei++)
+ if ( GetFaceDescriptor ((*this)[sei].GetIndex()).domout_singular) cnt_sing++;
+ if (cnt_sing)
+ {
+ outfile << "singular_face_outside" << endl << cnt_sing << endl;
+ for (SurfaceElementIndex sei = 0; sei < GetNSE(); sei++)
+ if ( GetFaceDescriptor ((*this)[sei].GetIndex()).domout_singular)
+ outfile << int(sei) << endl;
+ }
- facedecoding.SetSize(0);
- while (infile.good())
- {
- infile >> str;
+ }
- if (strcmp (str, "dimension") == 0)
- {
- infile >> dimension;
- }
- if (strcmp (str, "surfaceelements") == 0)
- {
- infile >> n;
- PrintMessage (3, n, " surface elements");
- for (i = 1; i <= n; i++)
- {
- int j;
- int surfnr, bcp, domin, domout, nep, faceind = 0;
+ void Mesh :: Load (const string & filename)
+ {
+ char str[100];
+ int i, n;
- infile >> surfnr >> bcp >> domin >> domout;
- surfnr--;
+ double scale = 1; // globflags.GetNumFlag ("scale", 1);
+ int inverttets = 0; // globflags.GetDefineFlag ("inverttets");
+ int invertsurf = 0; // globflags.GetDefineFlag ("invertsurfacemesh");
- for (j = 1; j <= facedecoding.Size(); j++)
- if (GetFaceDescriptor(j).SurfNr() == surfnr &&
- GetFaceDescriptor(j).BCProperty() == bcp &&
- GetFaceDescriptor(j).DomainIn() == domin &&
- GetFaceDescriptor(j).DomainOut() == domout)
- faceind = j;
+ ifstream infile(filename.c_str());
+ if (!infile.good())
+ throw NgException ("mesh file not found");
- if (!faceind)
- {
- faceind = AddFaceDescriptor (FaceDescriptor(surfnr, domin, domout, 0));
- GetFaceDescriptor(faceind).SetBCProperty (bcp);
- }
+ facedecoding.SetSize(0);
- infile >> nep;
- if (!nep) nep = 3;
+ while (infile.good())
+ {
+ infile >> str;
- Element2d tri(nep);
- tri.SetIndex(faceind);
+ if (strcmp (str, "dimension") == 0)
+ {
+ infile >> dimension;
+ }
- for (j = 1; j <= nep; j++)
- infile >> tri.PNum(j);
+ if (strcmp (str, "surfaceelements") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " surface elements");
+ for (i = 1; i <= n; i++)
+ {
+ int j;
+ int surfnr, bcp, domin, domout, nep, faceind = 0;
- if (invertsurf)
- tri.Invert();
+ infile >> surfnr >> bcp >> domin >> domout;
+ surfnr--;
- AddSurfaceElement (tri);
- }
- }
+ for (j = 1; j <= facedecoding.Size(); j++)
+ if (GetFaceDescriptor(j).SurfNr() == surfnr &&
+ GetFaceDescriptor(j).BCProperty() == bcp &&
+ GetFaceDescriptor(j).DomainIn() == domin &&
+ GetFaceDescriptor(j).DomainOut() == domout)
+ faceind = j;
- if (strcmp (str, "surfaceelementsgi") == 0)
- {
- infile >> n;
- PrintMessage (3, n, " surface elements");
- for (i = 1; i <= n; i++)
- {
- int j;
- int surfnr, bcp, domin, domout, nep, faceind = 0;
- infile >> surfnr >> bcp >> domin >> domout;
- surfnr--;
-
- for (j = 1; j <= facedecoding.Size(); j++)
- if (GetFaceDescriptor(j).SurfNr() == surfnr &&
- GetFaceDescriptor(j).BCProperty() == bcp &&
- GetFaceDescriptor(j).DomainIn() == domin &&
- GetFaceDescriptor(j).DomainOut() == domout)
- faceind = j;
-
- if (!faceind)
- {
- faceind = AddFaceDescriptor (FaceDescriptor(surfnr, domin, domout, 0));
- GetFaceDescriptor(faceind).SetBCProperty (bcp);
- }
+ if (!faceind)
+ {
+ faceind = AddFaceDescriptor (FaceDescriptor(surfnr, domin, domout, 0));
+ GetFaceDescriptor(faceind).SetBCProperty (bcp);
+ }
- infile >> nep;
- if (!nep) nep = 3;
+ infile >> nep;
+ if (!nep) nep = 3;
- Element2d tri(nep);
- tri.SetIndex(faceind);
+ Element2d tri(nep);
+ tri.SetIndex(faceind);
- for (j = 1; j <= nep; j++)
- infile >> tri.PNum(j);
+ for (j = 1; j <= nep; j++)
+ infile >> tri.PNum(j);
- for (j = 1; j <= nep; j++)
- infile >> tri.GeomInfoPi(j).trignum;
+ if (invertsurf)
+ tri.Invert();
- if (invertsurf)
- tri.Invert();
+ AddSurfaceElement (tri);
+ }
+ }
+
+ if (strcmp (str, "surfaceelementsgi") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " surface elements");
+ for (i = 1; i <= n; i++)
+ {
+ int j;
+ int surfnr, bcp, domin, domout, nep, faceind = 0;
+ infile >> surfnr >> bcp >> domin >> domout;
+ surfnr--;
+
+ for (j = 1; j <= facedecoding.Size(); j++)
+ if (GetFaceDescriptor(j).SurfNr() == surfnr &&
+ GetFaceDescriptor(j).BCProperty() == bcp &&
+ GetFaceDescriptor(j).DomainIn() == domin &&
+ GetFaceDescriptor(j).DomainOut() == domout)
+ faceind = j;
+
+ if (!faceind)
+ {
+ faceind = AddFaceDescriptor (FaceDescriptor(surfnr, domin, domout, 0));
+ GetFaceDescriptor(faceind).SetBCProperty (bcp);
+ }
- AddSurfaceElement (tri);
- }
- }
+ infile >> nep;
+ if (!nep) nep = 3;
+ Element2d tri(nep);
+ tri.SetIndex(faceind);
+ for (j = 1; j <= nep; j++)
+ infile >> tri.PNum(j);
- if (strcmp (str, "volumeelements") == 0)
- {
- infile >> n;
- PrintMessage (3, n, " volume elements");
- for (i = 1; i <= n; i++)
- {
- Element el;
- int hi, nep;
- infile >> hi;
- if (hi == 0) hi = 1;
- el.SetIndex(hi);
- infile >> nep;
- el.SetNP(nep);
-
- for (int j = 0; j < nep; j++)
- infile >> (int&)(el[j]);
-
- if (inverttets)
- el.Invert();
+ for (j = 1; j <= nep; j++)
+ infile >> tri.GeomInfoPi(j).trignum;
- AddVolumeElement (el);
-
- }
- }
+ if (invertsurf)
+ tri.Invert();
- if (strcmp (str, "edgesegments") == 0)
- {
- infile >> n;
- for (i = 1; i <= n; i++)
- {
- Segment seg;
- int hi;
- infile >> seg.si >> hi >> seg.p1 >> seg.p2;
- AddSegment (seg);
- }
- }
-
- if (strcmp (str, "edgesegmentsgi") == 0)
- {
- infile >> n;
- for (i = 1; i <= n; i++)
- {
- Segment seg;
- int hi;
- infile >> seg.si >> hi >> seg.p1 >> seg.p2
- >> seg.geominfo[0].trignum
- >> seg.geominfo[1].trignum;
- AddSegment (seg);
- }
- }
- if (strcmp (str, "edgesegmentsgi2") == 0)
- {
- infile >> n;
- PrintMessage (3, n, " curve elements");
+ AddSurfaceElement (tri);
+ }
+ }
- for (i = 1; i <= n; i++)
- {
- Segment seg;
- int hi;
- infile >> seg.si >> hi >> seg.p1 >> seg.p2
- >> seg.geominfo[0].trignum
- >> seg.geominfo[1].trignum
- >> seg.surfnr1 >> seg.surfnr2
- >> seg.epgeominfo[0].edgenr
- // >> seg.epgeominfo[0].lefttrig
- // >> seg.epgeominfo[0].righttrig
- >> seg.epgeominfo[0].dist
- >> seg.epgeominfo[1].edgenr
- // >> seg.epgeominfo[1].lefttrig
- // >> seg.epgeominfo[1].righttrig
- >> seg.epgeominfo[1].dist;
- seg.edgenr = seg.epgeominfo[0].edgenr;
-
- seg.surfnr1--;
- seg.surfnr2--;
+ if (strcmp (str, "volumeelements") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " volume elements");
+ for (i = 1; i <= n; i++)
+ {
+ Element el;
+ int hi, nep;
+ infile >> hi;
+ if (hi == 0) hi = 1;
+ el.SetIndex(hi);
+ infile >> nep;
+ el.SetNP(nep);
- AddSegment (seg);
- }
- }
-
- if (strcmp (str, "points") == 0)
- {
- infile >> n;
- PrintMessage (3, n, " points");
- for (i = 1; i <= n; i++)
- {
- Point3d p;
- infile >> p.X() >> p.Y() >> p.Z();
- p.X() *= scale;
- p.Y() *= scale;
- p.Z() *= scale;
- AddPoint (p);
- }
- }
-
- if (strcmp (str, "identifications") == 0)
- {
- infile >> n;
- for (i = 1; i <= n; i++)
- {
- PointIndex pi1, pi2;
- int ind;
- infile >> pi1 >> pi2 >> ind;
- ident.Add (pi1, pi2, ind);
- }
- }
- if (strcmp (str, "materials") == 0)
- {
- infile >> n;
- for (i = 1; i <= n; i++)
- {
- int nr;
- string mat;
- infile >> nr >> mat;
- SetMaterial (nr, mat.c_str());
- }
- }
+ for (int j = 0; j < nep; j++)
+ infile >> (int&)(el[j]);
+
+ if (inverttets)
+ el.Invert();
- strcpy (str, "");
- }
-
- CalcSurfacesOfNode ();
- // BuildConnectedNodes ();
- topology -> Update();
- clusters -> Update();
-
- SetNextMajorTimeStamp();
- // PrintMemInfo (cout);
-}
-
-
+ AddVolumeElement (el);
+ }
+ }
+
-bool Mesh :: TestOk () const
-{
- for (ElementIndex ei = 0; ei < volelements.Size(); ei++)
- {
- for (int j = 0; j < 4; j++)
- if ( (*this)[ei][j] <= PointIndex::BASE-1)
+ if (strcmp (str, "edgesegments") == 0)
{
- (*testout) << "El " << ei << " has 0 nodes: ";
- for (int k = 0; k < 4; k++)
- (*testout) << (*this)[ei][k];
- break;
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ Segment seg;
+ int hi;
+ infile >> seg.si >> hi >> seg.p1 >> seg.p2;
+ AddSegment (seg);
+ }
}
- }
- CheckMesh3D (*this);
- return 1;
-}
+
-void Mesh :: CalcSurfacesOfNode ()
-{
- int i, j, k;
- SurfaceElementIndex sei;
- surfacesonnode.SetSize (GetNP());
- if (boundaryedges)
- delete boundaryedges;
- if (surfelementht)
- delete surfelementht;
- if (segmentht)
- delete segmentht;
+ if (strcmp (str, "edgesegmentsgi") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ Segment seg;
+ int hi;
+ infile >> seg.si >> hi >> seg.p1 >> seg.p2
+ >> seg.geominfo[0].trignum
+ >> seg.geominfo[1].trignum;
+ AddSegment (seg);
+ }
+ }
+ if (strcmp (str, "edgesegmentsgi2") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " curve elements");
- boundaryedges = new INDEX_2_CLOSED_HASHTABLE<int>
- (3 * (GetNSE() + GetNOpenElements()) + GetNSeg() + 1);
- surfelementht = new INDEX_3_HASHTABLE<int> (GetNSE()/4 + 1);
- segmentht = new INDEX_2_HASHTABLE<int> (GetNSeg() + 1);
+ for (i = 1; i <= n; i++)
+ {
+ Segment seg;
+ int hi;
+ infile >> seg.si >> hi >> seg.p1 >> seg.p2
+ >> seg.geominfo[0].trignum
+ >> seg.geominfo[1].trignum
+ >> seg.surfnr1 >> seg.surfnr2
+ >> seg.edgenr
+ // >> seg.epgeominfo[0].edgenr
+ // >> seg.epgeominfo[0].lefttrig
+ // >> seg.epgeominfo[0].righttrig
+ >> seg.epgeominfo[0].dist
+ >> seg.epgeominfo[1].edgenr
+ // >> seg.epgeominfo[1].lefttrig
+ // >> seg.epgeominfo[1].righttrig
+ >> seg.epgeominfo[1].dist;
+ // seg.edgenr = seg.epgeominfo[0].edgenr;
+ seg.epgeominfo[0].edgenr = seg.epgeominfo[1].edgenr;
+
+ seg.surfnr1--;
+ seg.surfnr2--;
+
+ AddSegment (seg);
+ }
+ }
+
+ if (strcmp (str, "points") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " points");
+ for (i = 1; i <= n; i++)
+ {
+ Point3d p;
+ infile >> p.X() >> p.Y() >> p.Z();
+ p.X() *= scale;
+ p.Y() *= scale;
+ p.Z() *= scale;
+ AddPoint (p);
+ }
+ }
- for (sei = 0; sei < GetNSE(); sei++)
- {
- const Element2d & sel = surfelements[sei];
- if (sel.IsDeleted()) continue;
+ if (strcmp (str, "identifications") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ PointIndex pi1, pi2;
+ int ind;
+ infile >> pi1 >> pi2 >> ind;
+ ident -> Add (pi1, pi2, ind);
+ }
+ }
+ if (strcmp (str, "materials") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ int nr;
+ string mat;
+ infile >> nr >> mat;
+ SetMaterial (nr, mat.c_str());
+ }
+ }
+
+ if (strcmp (str, "singular_points") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ PointIndex pi;
+ infile >> pi;
+ (*this)[pi].SetSingular (1);
+ }
+ }
- int si = sel.GetIndex();
-
- for (j = 0; j < sel.GetNP(); j++)
- {
- PointIndex pi = sel[j];
- bool found = 0;
- for (k = 0; k < surfacesonnode[pi].Size(); k++)
- if (surfacesonnode[pi][k] == si)
+ if (strcmp (str, "singular_edge_left") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
{
- found = 1;
- break;
+ SegmentIndex si;
+ infile >> si;
+ (*this)[si].singedge_left = 1;
}
-
- if (!found)
- surfacesonnode.Add (pi, si);
+ }
+ if (strcmp (str, "singular_edge_right") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ SegmentIndex si;
+ infile >> si;
+ (*this)[si].singedge_right = 1;
+ }
+ }
- INDEX_2 i2;
- i2.I1() = sel.PNumMod(j+1);
- i2.I2() = sel.PNumMod(j+2);
- i2.Sort();
- if (sel.GetNP() <= 4)
- boundaryedges->Set (i2, 1);
- }
- }
+ if (strcmp (str, "singular_face_inside") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ SurfaceElementIndex sei;
+ infile >> sei;
+ GetFaceDescriptor((*this)[sei].GetIndex()).domin_singular = 1;
+ }
+ }
- for (sei = 0; sei < GetNSE(); sei++)
- {
- const Element2d & sel = surfelements[sei];
- if (sel.IsDeleted()) continue;
+ if (strcmp (str, "singular_face_outside") == 0)
+ {
+ infile >> n;
+ for (i = 1; i <= n; i++)
+ {
+ SurfaceElementIndex sei;
+ infile >> sei;
+ GetFaceDescriptor((*this)[sei].GetIndex()).domout_singular = 1;
+ }
+ }
- INDEX_3 i3;
- i3.I1() = sel.PNum(1);
- i3.I2() = sel.PNum(2);
- i3.I3() = sel.PNum(3);
- i3.Sort();
- surfelementht -> PrepareSet (i3);
- }
- surfelementht -> AllocateElements();
- for (sei = 0; sei < GetNSE(); sei++)
- {
+
+ strcpy (str, "");
+ }
+
+ CalcSurfacesOfNode ();
+ // BuildConnectedNodes ();
+ topology -> Update();
+ clusters -> Update();
+
+ SetNextMajorTimeStamp();
+ // PrintMemInfo (cout);
+ }
+
+
+
+
+
+
+ void Mesh :: Merge (const string & filename)
+ {
+ char str[100];
+ int i, n;
+
+ ifstream infile(filename.c_str());
+ if (!infile.good())
+ throw NgException ("mesh file not found");
+
+ int oldnp = GetNP();
+
+ while (infile.good())
+ {
+ infile >> str;
+
+ if (strcmp (str, "surfaceelementsgi") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " surface elements");
+ for (i = 1; i <= n; i++)
+ {
+ int j;
+ int surfnr, bcp, domin, domout, nep, faceind = 0;
+ infile >> surfnr >> bcp >> domin >> domout;
+ surfnr--;
+
+ // surfnr = 0;
+ // bcp = 1;
+ domin = 2;
+ domout = 1;
+
+ for (j = 1; j <= facedecoding.Size(); j++)
+ if (GetFaceDescriptor(j).SurfNr() == surfnr &&
+ GetFaceDescriptor(j).BCProperty() == bcp &&
+ GetFaceDescriptor(j).DomainIn() == domin &&
+ GetFaceDescriptor(j).DomainOut() == domout)
+ faceind = j;
+
+ if (!faceind)
+ {
+ faceind = AddFaceDescriptor (FaceDescriptor(surfnr, domin, domout, 0));
+ GetFaceDescriptor(faceind).SetBCProperty (bcp);
+ }
+
+ infile >> nep;
+ if (!nep) nep = 3;
+
+ Element2d tri(nep);
+ tri.SetIndex(faceind);
+
+ for (j = 1; j <= nep; j++)
+ {
+ infile >> tri.PNum(j);
+ tri.PNum(j) = tri.PNum(j) + oldnp;
+ }
+
+ for (j = 1; j <= nep; j++)
+ infile >> tri.GeomInfoPi(j).trignum;
+
+ AddSurfaceElement (tri);
+ }
+ }
+
+ if (strcmp (str, "points") == 0)
+ {
+ infile >> n;
+ PrintMessage (3, n, " points");
+ for (i = 1; i <= n; i++)
+ {
+ Point3d p;
+ infile >> p.X() >> p.Y() >> p.Z();
+ AddPoint (p);
+ }
+ }
+
+ strcpy (str, "");
+ }
+
+ CalcSurfacesOfNode ();
+
+ topology -> Update();
+ clusters -> Update();
+
+ SetNextMajorTimeStamp();
+ }
+
+
+
+
+
+
+
+
+
+
+ bool Mesh :: TestOk () const
+ {
+ for (ElementIndex ei = 0; ei < volelements.Size(); ei++)
+ {
+ for (int j = 0; j < 4; j++)
+ if ( (*this)[ei][j] <= PointIndex::BASE-1)
+ {
+ (*testout) << "El " << ei << " has 0 nodes: ";
+ for (int k = 0; k < 4; k++)
+ (*testout) << (*this)[ei][k];
+ break;
+ }
+ }
+ CheckMesh3D (*this);
+ return 1;
+ }
+
+ void Mesh :: CalcSurfacesOfNode ()
+ {
+ int i, j, k;
+ SurfaceElementIndex sei;
+
+ surfacesonnode.SetSize (GetNP());
+ if (boundaryedges)
+ delete boundaryedges;
+ if (surfelementht)
+ delete surfelementht;
+ if (segmentht)
+ delete segmentht;
+
+ boundaryedges = new INDEX_2_CLOSED_HASHTABLE<int>
+ (3 * (GetNSE() + GetNOpenElements()) + GetNSeg() + 1);
+
+ /*
+ surfelementht = new INDEX_3_HASHTABLE<int> (GetNSE()/4 + 1);
+ segmentht = new INDEX_2_HASHTABLE<int> (GetNSeg() + 1);
+ */
+
+ surfelementht = new INDEX_3_CLOSED_HASHTABLE<int> (3*GetNSE() + 1);
+ segmentht = new INDEX_2_CLOSED_HASHTABLE<int> (3*GetNSeg() + 1);
+
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
+ const Element2d & sel = surfelements[sei];
+ if (sel.IsDeleted()) continue;
+
+ int si = sel.GetIndex();
+
+ for (j = 0; j < sel.GetNP(); j++)
+ {
+ PointIndex pi = sel[j];
+ bool found = 0;
+ for (k = 0; k < surfacesonnode[pi].Size(); k++)
+ if (surfacesonnode[pi][k] == si)
+ {
+ found = 1;
+ break;
+ }
+
+ if (!found)
+ surfacesonnode.Add (pi, si);
+
+ INDEX_2 i2;
+ i2.I1() = sel.PNumMod(j+1);
+ i2.I2() = sel.PNumMod(j+2);
+ i2.Sort();
+ if (sel.GetNP() <= 4)
+ boundaryedges->Set (i2, 1);
+ }
+ }
+ /*
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
const Element2d & sel = surfelements[sei];
if (sel.IsDeleted()) continue;
@@ -741,1101 +989,1165 @@ void Mesh :: CalcSurfacesOfNode ()
i3.I2() = sel.PNum(2);
i3.I3() = sel.PNum(3);
i3.Sort();
- surfelementht -> Set (i3, sel.GetIndex());
- }
+ surfelementht -> PrepareSet (i3);
+ }
- int np = GetNP();
- ptyps.SetSize(np);
- ptyps = INNERPOINT;
+ surfelementht -> AllocateElements();
+ */
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
+ const Element2d & sel = surfelements[sei];
+ if (sel.IsDeleted()) continue;
+
+ INDEX_3 i3;
+ i3.I1() = sel.PNum(1);
+ i3.I2() = sel.PNum(2);
+ i3.I3() = sel.PNum(3);
+ i3.Sort();
+ surfelementht -> Set (i3, sel.GetIndex());
+ }
- if (GetNFD() == 0) // || GetFaceDescriptor(1).SurfNr() == 0)
- {
- for (sei = 0; sei < GetNSE(); sei++)
- {
- const Element2d & sel = surfelements[sei];
- if (sel.IsDeleted()) continue;
- for (j = 0; j < sel.GetNP(); j++)
- {
- PointIndex pi = SurfaceElement(sei)[j];
- ptyps[pi] = FIXEDPOINT;
- }
- }
- }
- else
- {
- for (sei = 0; sei < GetNSE(); sei++)
- {
- const Element2d & sel = surfelements[sei];
- if (sel.IsDeleted()) continue;
- for (j = 0; j < sel.GetNP(); j++)
- {
- int pi = sel[j];
- int ns = surfacesonnode[pi].Size();
- if (ns == 1)
- ptyps[pi] = SURFACEPOINT;
- if (ns == 2)
- ptyps[pi] = EDGEPOINT;
- if (ns >= 3)
- ptyps[pi] = FIXEDPOINT;
- }
- }
- }
+ int np = GetNP();
+ // ptyps.SetSize(np);
+ // ptyps = INNERPOINT;
+ for (PointIndex pi = PointIndex::BASE;
+ pi < np+PointIndex::BASE; pi++)
+ points[pi].SetType (INNERPOINT);
- for (i = 0; i < segments.Size(); i++)
- {
- const Segment & seg = segments[i];
- for (j = 1; j <= 2; j++)
- {
- PointIndex hi = (j == 1) ? seg.p1 : seg.p2;
+ if (GetNFD() == 0) // || GetFaceDescriptor(1).SurfNr() == 0)
+ {
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
+ const Element2d & sel = surfelements[sei];
+ if (sel.IsDeleted()) continue;
+ for (j = 0; j < sel.GetNP(); j++)
+ {
+ PointIndex pi = SurfaceElement(sei)[j];
+ points[pi].SetType(FIXEDPOINT);
+ }
+ }
+ }
+ else
+ {
+ for (sei = 0; sei < GetNSE(); sei++)
+ {
+ const Element2d & sel = surfelements[sei];
+ if (sel.IsDeleted()) continue;
+ for (j = 0; j < sel.GetNP(); j++)
+ {
+ PointIndex pi = sel[j];
+ int ns = surfacesonnode[pi].Size();
+ if (ns == 1)
+ points[pi].SetType(SURFACEPOINT);
+ if (ns == 2)
+ points[pi].SetType(EDGEPOINT);
+ if (ns >= 3)
+ points[pi].SetType(FIXEDPOINT);
+ }
+ }
+ }
+
+ for (i = 0; i < segments.Size(); i++)
+ {
+ const Segment & seg = segments[i];
+ for (j = 1; j <= 2; j++)
+ {
+ PointIndex hi = (j == 1) ? seg.p1 : seg.p2;
- if (ptyps[hi] == INNERPOINT ||
- ptyps[hi] == SURFACEPOINT)
- ptyps[hi] = EDGEPOINT;
- }
- }
+ if (points[hi].Type() == INNERPOINT ||
+ points[hi].Type() == SURFACEPOINT)
+ points[hi].SetType(EDGEPOINT);
+ }
+ }
- for (i = 0; i < lockedpoints.Size(); i++)
- ptyps[lockedpoints[i]] = FIXEDPOINT;
+ for (i = 0; i < lockedpoints.Size(); i++)
+ points[lockedpoints[i]].SetType(FIXEDPOINT);
- for (i = 0; i < openelements.Size(); i++)
- {
- const Element2d & sel = openelements[i];
- for (j = 0; j < sel.GetNP(); j++)
- {
- INDEX_2 i2;
- i2.I1() = sel.PNumMod(j+1);
- i2.I2() = sel.PNumMod(j+2);
- i2.Sort();
- boundaryedges->Set (i2, 1);
+ for (i = 0; i < openelements.Size(); i++)
+ {
+ const Element2d & sel = openelements[i];
+ for (j = 0; j < sel.GetNP(); j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = sel.PNumMod(j+1);
+ i2.I2() = sel.PNumMod(j+2);
+ i2.Sort();
+ boundaryedges->Set (i2, 1);
- ptyps[sel[j]] = FIXEDPOINT;
- }
- }
+ points[sel[j]].SetType(FIXEDPOINT);
+ }
+ }
- eltyps.SetSize (GetNE());
- eltyps = FREEELEMENT;
+ eltyps.SetSize (GetNE());
+ eltyps = FREEELEMENT;
- for (i = 0; i < GetNSeg(); i++)
- {
- const Segment & seg = segments[i];
- INDEX_2 i2(seg.p1, seg.p2);
- i2.Sort();
+ for (i = 0; i < GetNSeg(); i++)
+ {
+ const Segment & seg = segments[i];
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort();
- boundaryedges -> Set (i2, 2);
- segmentht -> Set (i2, 1);
- }
-}
+ boundaryedges -> Set (i2, 2);
+ segmentht -> Set (i2, i);
+ }
+ }
-void Mesh :: FixPoints (const BitArray & fixpoints)
-{
- if (fixpoints.Size() != GetNP())
- {
- cerr << "Mesh::FixPoints: sizes don´t fit" << endl;
- return;
- }
- int np = GetNP();
- for (int i = 1; i <= np; i++)
- if (fixpoints.Test(i))
+ void Mesh :: FixPoints (const BitArray & fixpoints)
+ {
+ if (fixpoints.Size() != GetNP())
{
- ptyps.Elem(i) = FIXEDPOINT;
+ cerr << "Mesh::FixPoints: sizes don´t fit" << endl;
+ return;
}
-}
+ int np = GetNP();
+ for (int i = 1; i <= np; i++)
+ if (fixpoints.Test(i))
+ {
+ points.Elem(i).SetType (FIXEDPOINT);
+ }
+ }
-void Mesh :: FindOpenElements (int dom)
-{
- int i, ii, j, k, l;
- PointIndex pi;
- SurfaceElementIndex sei;
- Element2d hel;
+ void Mesh :: FindOpenElements (int dom)
+ {
+ int i, ii, j, k, l;
+ PointIndex pi;
+ SurfaceElementIndex sei;
+ Element2d hel;
+ if (1)
+ { // nodebased
- if (1)
- { // nodebased
+ int np = GetNP();
+ int ne = GetNE();
+ int nse = GetNSE();
- int np = GetNP();
- int ne = GetNE();
- int nse = GetNSE();
+ ARRAY<int,PointIndex::BASE> numonpoint(np);
- ARRAY<int,PointIndex::BASE> numonpoint(np);
+ Element2d hel;
- Element2d hel;
+ numonpoint = 0;
+ ElementIndex ei;
+ for (ei = 0; ei < ne; ei++)
+ {
+ const Element & el = (*this)[ei];
+ if (dom == 0 || dom == el.GetIndex())
+ {
+ if (el.GetNP() == 4)
+ {
+ INDEX_4 i4(el[0], el[1], el[2], el[3]);
+ i4.Sort();
+ numonpoint[i4.I1()]++;
+ numonpoint[i4.I2()]++;
+ }
+ else
+ for (j = 0; j < el.GetNP(); j++)
+ numonpoint[el[j]]++;
+ }
+ }
- numonpoint = 0;
- /*
- for (i = 1; i <= np; i++)
- numonpoint.Elem(i) = 0;
- */
- ElementIndex ei;
- for (ei = 0; ei < ne; ei++)
- {
- const Element & el = (*this)[ei];
- if (el.GetNP() == 4)
- {
- INDEX_4 i4(el[0], el[1], el[2], el[3]);
- i4.Sort();
- numonpoint[i4.I1()]++;
- numonpoint[i4.I2()]++;
- }
- else
- for (j = 0; j < el.GetNP(); j++)
- numonpoint[el[j]]++;
- }
- TABLE<ElementIndex,PointIndex::BASE> elsonpoint(numonpoint);
- for (ei = 0; ei < ne; ei++)
- {
- const Element & el = (*this)[ei];
- if (el.GetNP() == 4)
- {
- INDEX_4 i4(el[0], el[1], el[2], el[3]);
- i4.Sort();
- elsonpoint.Add (i4.I1(), ei);
- elsonpoint.Add (i4.I2(), ei);
- }
- else
- for (j = 0; j < el.GetNP(); j++)
- elsonpoint.Add (el[j], ei);
- }
+ TABLE<ElementIndex,PointIndex::BASE> elsonpoint(numonpoint);
+ for (ei = 0; ei < ne; ei++)
+ {
+ const Element & el = (*this)[ei];
+ if (dom == 0 || dom == el.GetIndex())
+ {
+ if (el.GetNP() == 4)
+ {
+ INDEX_4 i4(el[0], el[1], el[2], el[3]);
+ i4.Sort();
+ elsonpoint.Add (i4.I1(), ei);
+ elsonpoint.Add (i4.I2(), ei);
+ }
+ else
+ for (j = 0; j < el.GetNP(); j++)
+ elsonpoint.Add (el[j], ei);
+ }
+ }
- numonpoint = 0;
- for (i = 0; i < nse; i++)
- {
- hel = surfelements[i];
- hel.NormalizeNumbering();
- numonpoint[hel[0]]++;
- }
+ numonpoint = 0;
+ for (i = 0; i < nse; i++)
+ {
+ int ind = surfelements[i].GetIndex();
+ if (
+ GetFaceDescriptor(ind).DomainIn() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn())
+ ||
+ GetFaceDescriptor(ind).DomainOut() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut())
+ )
+ {
+ hel = surfelements[i];
+ hel.NormalizeNumbering();
+ numonpoint[hel[0]]++;
+ }
+ }
- TABLE<SurfaceElementIndex,PointIndex::BASE> selsonpoint(numonpoint);
- for (i = 0; i < nse; i++)
- {
- hel = surfelements[i];
- hel.NormalizeNumbering();
- selsonpoint.Add (hel[0], i);
- }
+ TABLE<SurfaceElementIndex,PointIndex::BASE> selsonpoint(numonpoint);
+ for (i = 0; i < nse; i++)
+ {
+ int ind = surfelements[i].GetIndex();
+ if (
+ GetFaceDescriptor(ind).DomainIn() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn())
+ ||
+ GetFaceDescriptor(ind).DomainOut() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut())
+ )
+ {
+ hel = surfelements[i];
+ hel.NormalizeNumbering();
+ selsonpoint.Add (hel[0], i);
+ }
+ }
- INDEX_3_CLOSED_HASHTABLE<INDEX_2> faceht(100);
- openelements.SetSize(0);
+ INDEX_3_CLOSED_HASHTABLE<INDEX_2> faceht(100);
+ openelements.SetSize(0);
- for (pi = PointIndex::BASE;
- pi < np+PointIndex::BASE; pi++)
- {
- faceht.SetSize (2 * selsonpoint[pi].Size() + 4 * elsonpoint[pi].Size());
-
-
- FlatArray<SurfaceElementIndex> row = selsonpoint[pi];
- for (ii = 0; ii < row.Size(); ii++)
+ for (pi = PointIndex::BASE;
+ pi < np+PointIndex::BASE; pi++)
+ if (selsonpoint[pi].Size()+elsonpoint[pi].Size())
{
- hel = SurfaceElement(row[ii]);
- int ind = hel.GetIndex();
-
- if (GetFaceDescriptor(ind).DomainIn() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
+ faceht.SetSize (2 * selsonpoint[pi].Size() + 4 * elsonpoint[pi].Size());
+
+ FlatArray<SurfaceElementIndex> row = selsonpoint[pi];
+ for (ii = 0; ii < row.Size(); ii++)
{
- hel.NormalizeNumbering();
- if (hel.PNum(1) == pi)
+ hel = SurfaceElement(row[ii]);
+ int ind = hel.GetIndex();
+
+ if (GetFaceDescriptor(ind).DomainIn() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
{
- INDEX_3 i3(hel[0], hel[1], hel[2]);
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
- (hel.GetNP() == 3)
- ? PointIndex (PointIndex::BASE-1)
- : hel.PNum(4));
- faceht.Set (i3, i2);
+ hel.NormalizeNumbering();
+ if (hel.PNum(1) == pi)
+ {
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
+ (hel.GetNP() == 3)
+ ? PointIndex (PointIndex::BASE-1)
+ : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
}
- }
- if (GetFaceDescriptor(ind).DomainOut() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
- {
- hel.Invert();
- hel.NormalizeNumbering();
- if (hel.PNum(1) == pi)
+ if (GetFaceDescriptor(ind).DomainOut() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
{
- INDEX_3 i3(hel[0], hel[1], hel[2]);
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
- (hel.GetNP() == 3)
- ? PointIndex (PointIndex::BASE-1)
- : hel.PNum(4));
- faceht.Set (i3, i2);
+ hel.Invert();
+ hel.NormalizeNumbering();
+ if (hel.PNum(1) == pi)
+ {
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
+ (hel.GetNP() == 3)
+ ? PointIndex (PointIndex::BASE-1)
+ : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
}
}
- }
- FlatArray<ElementIndex> rowel = elsonpoint[pi];
- for (ii = 0; ii < rowel.Size(); ii++)
- {
- const Element & el = VolumeElement(rowel[ii]);
-
- if (dom == 0 || el.GetIndex() == dom)
+ FlatArray<ElementIndex> rowel = elsonpoint[pi];
+ for (ii = 0; ii < rowel.Size(); ii++)
{
- for (j = 1; j <= el.GetNFaces(); j++)
- {
- el.GetFace (j, hel);
- hel.Invert();
- hel.NormalizeNumbering();
+ const Element & el = VolumeElement(rowel[ii]);
- if (hel[0] == pi)
+ if (dom == 0 || el.GetIndex() == dom)
+ {
+ for (j = 1; j <= el.GetNFaces(); j++)
{
- INDEX_3 i3(hel[0], hel[1], hel[2]);
-
- if (faceht.Used (i3))
+ el.GetFace (j, hel);
+ hel.Invert();
+ hel.NormalizeNumbering();
+
+ if (hel[0] == pi)
{
- INDEX_2 i2 = faceht.Get(i3);
- if (i2.I1() == el.GetIndex())
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
+
+ if (faceht.Used (i3))
{
- i2.I1() = PointIndex::BASE-1;
- faceht.Set (i3, i2);
+ INDEX_2 i2 = faceht.Get(i3);
+ if (i2.I1() == el.GetIndex())
+ {
+ i2.I1() = PointIndex::BASE-1;
+ faceht.Set (i3, i2);
+ }
+ else
+ {
+ if (i2.I1() == 0)
+ {
+ PrintSysError ("more elements on face");
+ (*testout) << "more elements on face!!!" << endl;
+ (*testout) << "el = " << el << endl;
+ (*testout) << "hel = " << hel << endl;
+ (*testout) << "face = " << i3 << endl;
+ (*testout) << "points = " << endl;
+ for (int jj = 1; jj <= 3; jj++)
+ (*testout) << "p = " << Point(i3.I(jj)) << endl;
+ }
+ }
}
else
{
- if (i2.I1() == 0)
- {
- PrintSysError ("more elements on face");
- (*testout) << "more elements on face!!!" << endl;
- (*testout) << "el = " << el << endl;
- (*testout) << "hel = " << hel << endl;
- (*testout) << "face = " << i3 << endl;
- (*testout) << "points = " << endl;
- for (int jj = 1; jj <= 3; jj++)
- (*testout) << "p = " << Point(i3.I(jj)) << endl;
- }
+ hel.Invert();
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel[0], hel[1], hel[2]);
+ INDEX_2 i2(el.GetIndex(),
+ (hel.GetNP() == 3)
+ ? PointIndex (PointIndex::BASE-1)
+ : hel[3]);
+ faceht.Set (i3, i2);
}
}
- else
- {
- hel.Invert();
- hel.NormalizeNumbering();
- INDEX_3 i3(hel[0], hel[1], hel[2]);
- INDEX_2 i2(el.GetIndex(),
- (hel.GetNP() == 3)
- ? PointIndex (PointIndex::BASE-1)
- : hel[3]);
- faceht.Set (i3, i2);
- }
}
}
}
- }
- for (i = 1; i <= faceht.Size(); i++)
- if (faceht.UsedPos (i))
- {
- INDEX_3 i3;
- INDEX_2 i2;
- faceht.GetData (i, i3, i2);
- if (i2.I1() != PointIndex::BASE-1)
+ for (i = 1; i <= faceht.Size(); i++)
+ if (faceht.UsedPos (i))
{
- Element2d tri;
- tri.SetType ( (i2.I2() == PointIndex::BASE-1) ? TRIG : QUAD);
- for (l = 0; l < 3; l++)
- tri[l] = i3.I(l+1);
- tri.PNum(4) = i2.I2();
- tri.SetIndex (i2.I1());
-
- // tri.Invert();
+ INDEX_3 i3;
+ INDEX_2 i2;
+ faceht.GetData (i, i3, i2);
+ if (i2.I1() != PointIndex::BASE-1)
+ {
+ Element2d tri;
+ tri.SetType ( (i2.I2() == PointIndex::BASE-1) ? TRIG : QUAD);
+ for (l = 0; l < 3; l++)
+ tri[l] = i3.I(l+1);
+ tri.PNum(4) = i2.I2();
+ tri.SetIndex (i2.I1());
+
+ // tri.Invert();
- openelements.Append (tri);
+ openelements.Append (tri);
+ }
}
- }
- }
- }
+ }
+ }
- else if (GetNE() || 1)
- {
- // new version, general elemetns
- // hash index: pnum1-3
- // hash data : domain nr, pnum4
- openelements.SetSize(0);
+#ifdef OLD
+
+ else if (GetNE() || 1)
+ {
+ // new version, general elemetns
+ // hash index: pnum1-3
+ // hash data : domain nr, pnum4
+
+ openelements.SetSize(0);
- const int steps = 4;
+ const int steps = 4;
- for (k = 0; k < steps; k++)
- {
+ for (k = 0; k < steps; k++)
+ {
- INDEX_3_CLOSED_HASHTABLE<INDEX_2> faceht( (5 * GetNE() + 2 * GetNSE() ) / steps +1);
+ INDEX_3_CLOSED_HASHTABLE<INDEX_2> faceht( (5 * GetNE() + 2 * GetNSE() ) / steps +1);
- for (i = 1; i <= GetNSE(); i++)
- {
- hel = SurfaceElement(i);
- int ind = hel.GetIndex();
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ hel = SurfaceElement(i);
+ int ind = hel.GetIndex();
- if (GetFaceDescriptor(ind).DomainIn() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
- {
- hel.Invert();
- hel.NormalizeNumbering();
- if (hel.PNum(1) % steps == k)
- {
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
- (hel.GetNP() == 3)
- ? PointIndex (PointIndex::BASE-1)
- : hel.PNum(4));
- faceht.Set (i3, i2);
- }
- }
- if (GetFaceDescriptor(ind).DomainOut() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
- {
- hel.NormalizeNumbering();
- if (hel.PNum(1) % steps == k)
- {
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
- (hel.GetNP() == 3)
- ? PointIndex(0)
- : hel.PNum(4));
- faceht.Set (i3, i2);
- }
- }
- }
+ if (GetFaceDescriptor(ind).DomainIn() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
+ {
+ hel.Invert();
+ hel.NormalizeNumbering();
+ if (hel.PNum(1) % steps == k)
+ {
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
+ (hel.GetNP() == 3)
+ ? PointIndex (PointIndex::BASE-1)
+ : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
+ }
+ if (GetFaceDescriptor(ind).DomainOut() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
+ {
+ hel.NormalizeNumbering();
+ if (hel.PNum(1) % steps == k)
+ {
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
+ (hel.GetNP() == 3)
+ ? PointIndex(0)
+ : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
+ }
+ }
- for (i = 1; i <= GetNE(); i++)
- {
- const Element & el = VolumeElement(i);
+ for (i = 1; i <= GetNE(); i++)
+ {
+ const Element & el = VolumeElement(i);
- if (dom == 0 || el.GetIndex() == dom)
- {
- for (j = 1; j <= el.GetNFaces(); j++)
- {
- el.GetFace (j, hel);
+ if (dom == 0 || el.GetIndex() == dom)
+ {
+ for (j = 1; j <= el.GetNFaces(); j++)
+ {
+ el.GetFace (j, hel);
- hel.NormalizeNumbering();
- if (hel.PNum(1) % steps != k)
- continue;
+ hel.NormalizeNumbering();
+ if (hel.PNum(1) % steps != k)
+ continue;
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
-
- int pos = faceht.Position (i3);
- if (pos)
- {
- INDEX_2 i2;
- faceht.GetData (pos, i2);
- if (i2.I1() == el.GetIndex())
- {
- i2.I1() = 0;
- faceht.SetData (pos, i2);
- }
- else
- {
- if (i2.I1() == 0)
- PrintSysError ("more elements on face");
- }
- }
- else
- {
- hel.Invert();
- hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2(el.GetIndex(),
- (hel.GetNP() == 3)
- ? PointIndex(0)
- : hel.PNum(4));
- faceht.Set (i3, i2);
- }
- }
- }
- }
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+
+ int pos = faceht.Position (i3);
+ if (pos)
+ {
+ INDEX_2 i2;
+ faceht.GetData (pos, i2);
+ if (i2.I1() == el.GetIndex())
+ {
+ i2.I1() = 0;
+ faceht.SetData (pos, i2);
+ }
+ else
+ {
+ if (i2.I1() == 0)
+ PrintSysError ("more elements on face");
+ }
+ }
+ else
+ {
+ hel.Invert();
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2(el.GetIndex(),
+ (hel.GetNP() == 3)
+ ? PointIndex(0)
+ : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
+ }
+ }
+ }
- for (i = 1; i <= faceht.Size(); i++)
- if (faceht.UsedPos (i))
- {
- INDEX_3 i3;
- INDEX_2 i2;
- faceht.GetData (i, i3, i2);
- if (i2.I1() != 0)
- {
- Element2d tri;
- tri.SetType ( (i2.I2() == 0) ? TRIG : QUAD);
- for (l = 1; l <= 3; l++)
- tri.PNum(l) = i3.I(l);
- tri.PNum(4) = i2.I2();
- tri.SetIndex (i2.I1());
-
- tri.Invert();
+ for (i = 1; i <= faceht.Size(); i++)
+ if (faceht.UsedPos (i))
+ {
+ INDEX_3 i3;
+ INDEX_2 i2;
+ faceht.GetData (i, i3, i2);
+ if (i2.I1() != 0)
+ {
+ Element2d tri;
+ tri.SetType ( (i2.I2() == 0) ? TRIG : QUAD);
+ for (l = 1; l <= 3; l++)
+ tri.PNum(l) = i3.I(l);
+ tri.PNum(4) = i2.I2();
+ tri.SetIndex (i2.I1());
+
+ tri.Invert();
- openelements.Append (tri);
- }
- }
- /*
- cout << "FindOpenElements, mem = ";
- faceht.PrintMemInfo (cout);
- */
- }
+ openelements.Append (tri);
+ }
+ }
+ /*
+ cout << "FindOpenElements, mem = ";
+ faceht.PrintMemInfo (cout);
+ */
+ }
- /*
+ /*
// open hashing version:
INDEX_3_HASHTABLE<INDEX_2> faceht(4 * GetNE()+GetNSE()+1);
- for (i = 1; i <= GetNSE(); i++)
+ for (i = 1; i <= GetNSE(); i++)
{
- Element2d hel = SurfaceElement(i);
- int ind = hel.GetIndex();
+ Element2d hel = SurfaceElement(i);
+ int ind = hel.GetIndex();
- if (GetFaceDescriptor(ind).DomainIn() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
- {
- hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
- (hel.GetNP() == 3) ? 0 : hel.PNum(4));
- faceht.Set (i3, i2);
- }
- if (GetFaceDescriptor(ind).DomainOut() &&
- (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
- {
- hel.Invert();
- hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
- (hel.GetNP() == 3) ? 0 : hel.PNum(4));
- faceht.Set (i3, i2);
- }
+ if (GetFaceDescriptor(ind).DomainIn() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainIn()) )
+ {
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainIn(),
+ (hel.GetNP() == 3) ? 0 : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
+ if (GetFaceDescriptor(ind).DomainOut() &&
+ (dom == 0 || dom == GetFaceDescriptor(ind).DomainOut()) )
+ {
+ hel.Invert();
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2 (GetFaceDescriptor(ind).DomainOut(),
+ (hel.GetNP() == 3) ? 0 : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
}
- for (i = 1; i <= GetNE(); i++)
+ for (i = 1; i <= GetNE(); i++)
{
- const Element & el = VolumeElement(i);
- // INDEX_3 i3;
+ const Element & el = VolumeElement(i);
+ // INDEX_3 i3;
- if (dom == 0 || el.GetIndex() == dom)
- {
- for (j = 1; j <= el.GetNFaces(); j++)
- {
- Element2d hel;
- el.GetFace (j, hel);
- hel.Invert();
+ if (dom == 0 || el.GetIndex() == dom)
+ {
+ for (j = 1; j <= el.GetNFaces(); j++)
+ {
+ Element2d hel;
+ el.GetFace (j, hel);
+ hel.Invert();
- hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- if (faceht.Used (i3))
- {
- INDEX_2 i2 = faceht.Get(i3);
- if (i2.I1() == el.GetIndex())
- {
- i2.I1() = 0;
- faceht.Set (i3, i2);
- }
- else
- {
- if (i2.I1() == 0)
- PrintSysError ("more elements on face");
- }
- }
- else
- {
- hel.Invert();
- hel.NormalizeNumbering();
- INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
- INDEX_2 i2(el.GetIndex(),
- (hel.GetNP() == 3) ? 0 : hel.PNum(4));
- faceht.Set (i3, i2);
- }
- }
- }
+ if (faceht.Used (i3))
+ {
+ INDEX_2 i2 = faceht.Get(i3);
+ if (i2.I1() == el.GetIndex())
+ {
+ i2.I1() = 0;
+ faceht.Set (i3, i2);
+ }
+ else
+ {
+ if (i2.I1() == 0)
+ PrintSysError ("more elements on face");
+ }
+ }
+ else
+ {
+ hel.Invert();
+ hel.NormalizeNumbering();
+ INDEX_3 i3(hel.PNum(1), hel.PNum(2), hel.PNum(3));
+ INDEX_2 i2(el.GetIndex(),
+ (hel.GetNP() == 3) ? 0 : hel.PNum(4));
+ faceht.Set (i3, i2);
+ }
+ }
+ }
}
- openelements.SetSize(0);
- for (i = 1; i <= faceht.GetNBags(); i++)
+ openelements.SetSize(0);
+ for (i = 1; i <= faceht.GetNBags(); i++)
for (j = 1; j <= faceht.GetBagSize(i); j++)
+ {
+ INDEX_3 i3;
+ INDEX_2 i2;
+ faceht.GetData (i, j, i3, i2);
+ if (i2.I1() != 0)
+ {
+ Element2d tri;
+ tri.SetNP ( (i2.I2() == 0) ? 3 : 4);
+ for (k = 1; k <= 3; k++)
+ tri.PNum(k) = i3.I(k);
+ tri.PNum(4) = i2.I2();
+ tri.SetIndex (i2.I1());
+
+ openelements.Append (tri);
+ }
+ }
+ */
+
+ }
+ else
+ {
+ for (i = 1; i <= GetNSE(); i++)
{
- INDEX_3 i3;
- INDEX_2 i2;
- faceht.GetData (i, j, i3, i2);
- if (i2.I1() != 0)
- {
- Element2d tri;
- tri.SetNP ( (i2.I2() == 0) ? 3 : 4);
- for (k = 1; k <= 3; k++)
- tri.PNum(k) = i3.I(k);
- tri.PNum(4) = i2.I2();
- tri.SetIndex (i2.I1());
+ Element2d hel = SurfaceElement(i);
+ int ind = SurfaceElement(i).GetIndex();
- openelements.Append (tri);
+ if (GetFaceDescriptor(ind).DomainIn())
+ openelements.Append (hel);
+ if (GetFaceDescriptor(ind).DomainOut())
+ {
+ hel.Invert();
+ openelements.Append (hel);
}
}
- */
+ }
+#endif
- }
- else
- {
- for (i = 1; i <= GetNSE(); i++)
- {
- Element2d hel = SurfaceElement(i);
- int ind = SurfaceElement(i).GetIndex();
- if (GetFaceDescriptor(ind).DomainIn())
- openelements.Append (hel);
- if (GetFaceDescriptor(ind).DomainOut())
- {
- hel.Invert();
- openelements.Append (hel);
- }
- }
- }
+ int cnt3 = 0, cnt4 = 0;
+ for (i = 1; i <= openelements.Size(); i++)
+ if (openelements.Elem(i).GetNP() == 3)
+ cnt3++;
+ else
+ cnt4++;
- int cnt3 = 0, cnt4 = 0;
- for (i = 1; i <= openelements.Size(); i++)
- if (openelements.Elem(i).GetNP() == 3)
- cnt3++;
- else
- cnt4++;
+ MyStr treequad;
+ if (cnt4)
+ treequad = MyStr(" (") + MyStr(cnt3) + MyStr (" + ") +
+ MyStr(cnt4) + MyStr(")");
+ PrintMessage (5, openelements.Size(), treequad, " open elements");
+
+
+ for (i = 1; i <= openelements.Size(); i++)
+ {
+ const Element2d & sel = openelements.Get(i);
- MyStr treequad;
- if (cnt4)
- treequad = MyStr(" (") + MyStr(cnt3) + MyStr (" + ") +
- MyStr(cnt4) + MyStr(")");
+ if (boundaryedges)
+ for (j = 1; j <= sel.GetNP(); j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = sel.PNumMod(j);
+ i2.I2() = sel.PNumMod(j+1);
+ i2.Sort();
+ boundaryedges->Set (i2, 1);
+ }
+
+ for (j = 1; j <= 3; j++)
+ {
+ int pi = sel.PNum(j);
+ if (pi < points.Size()+PointIndex::BASE)
+ points[pi].SetType (FIXEDPOINT);
+ }
+ }
- PrintMessage (5, openelements.Size(), treequad, " open elements");
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment(i);
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort();
- for (i = 1; i <= openelements.Size(); i++)
- {
- const Element2d & sel = openelements.Get(i);
+ if (!boundaryedges->Used (i2))
+ cerr << "WARNING: no boundedge, but seg edge: " << i2 << endl;
- if (boundaryedges)
- for (j = 1; j <= sel.GetNP(); j++)
- {
- INDEX_2 i2;
- i2.I1() = sel.PNumMod(j);
- i2.I2() = sel.PNumMod(j+1);
- i2.Sort();
- boundaryedges->Set (i2, 1);
- }
-
- for (j = 1; j <= 3; j++)
- {
- int pi = sel.PNum(j);
- if (pi < ptyps.Size()+PointIndex::BASE)
- ptyps[pi] = FIXEDPOINT;
- }
- }
+ boundaryedges -> Set (i2, 2);
+ segmentht -> Set (i2, i-1);
+ }
+ }
+ int Mesh :: HasOpenQuads () const
+ {
+ int i;
+ int no = GetNOpenElements();
+ for (i = 1; i <= no; i++)
+ if (OpenElement(i).GetNP() == 4)
+ return 1;
+ return 0;
+ }
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment(i);
- INDEX_2 i2(seg.p1, seg.p2);
- i2.Sort();
- if (!boundaryedges->Used (i2))
- cerr << "WARNING: no boundedge, but seg edge: " << i2 << endl;
- boundaryedges -> Set (i2, 2);
- segmentht -> Set (i2, 1);
- }
-}
-int Mesh :: HasOpenQuads () const
-{
- int i;
- int no = GetNOpenElements();
- for (i = 1; i <= no; i++)
- if (OpenElement(i).GetNP() == 4)
- return 1;
- return 0;
-}
+ void Mesh :: FindOpenSegments (int surfnr)
+ {
+ int i, j, k;
+ // new version, general elemetns
+ // hash index: pnum1-2
+ // hash data : surfnr, surfel-nr (pos) or segment nr(neg)
+ INDEX_2_HASHTABLE<INDEX_2> faceht(4 * GetNSE()+GetNSeg()+1);
+
+ PrintMessage (5, "Test Opensegments");
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment (i);
+ if (surfnr == 0 || seg.si == surfnr)
+ {
+ INDEX_2 key(seg.p1, seg.p2);
+ INDEX_2 data(seg.si, -i);
+ if (faceht.Used (key))
+ {
+ cerr << "ERROR: Segment " << seg << " already used" << endl;
+ (*testout) << "ERROR: Segment " << seg << " already used" << endl;
+ }
-void Mesh :: FindOpenSegments (int surfnr)
-{
- int i, j, k;
+ faceht.Set (key, data);
+ }
+ }
- // new version, general elemetns
- // hash index: pnum1-2
- // hash data : surfnr, surfel-nr (pos) or segment nr(neg)
- INDEX_2_HASHTABLE<INDEX_2> faceht(4 * GetNSE()+GetNSeg()+1);
-
- PrintMessage (5, "Test Opensegments");
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment (i);
- if (surfnr == 0 || seg.si == surfnr)
- {
- INDEX_2 key(seg.p1, seg.p2);
- INDEX_2 data(seg.si, -i);
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment (i);
- if (faceht.Used (key))
- {
- cerr << "ERROR: Segment " << seg << " already used" << endl;
- (*testout) << "ERROR: Segment " << seg << " already used" << endl;
- }
+ if (surfnr == 0 || seg.si == surfnr)
+ {
+ INDEX_2 key(seg.p2, seg.p1);
+ if (!faceht.Used(key))
+ {
+ cerr << "ERROR: Segment " << seg << " brother not used" << endl;
+ (*testout) << "ERROR: Segment " << seg << " brother not used" << endl;
+ }
+ }
+ }
- faceht.Set (key, data);
- }
- }
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ const Element2d & el = SurfaceElement(i);
+ if (el.IsDeleted()) continue;
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment (i);
+ if (surfnr == 0 || el.GetIndex() == surfnr)
+ {
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ INDEX_2 seg (el.PNumMod(j), el.PNumMod(j+1));
+ INDEX_2 data;
- if (surfnr == 0 || seg.si == surfnr)
- {
- INDEX_2 key(seg.p2, seg.p1);
- if (!faceht.Used(key))
- {
- cerr << "ERROR: Segment " << seg << " brother not used" << endl;
- (*testout) << "ERROR: Segment " << seg << " brother not used" << endl;
- }
- }
- }
+ if (seg.I1() <= 0 || seg.I2() <= 0)
+ cerr << "seg = " << seg << endl;
+ if (faceht.Used(seg))
+ {
+ data = faceht.Get(seg);
+ if (data.I1() == el.GetIndex())
+ {
+ data.I1() = 0;
+ faceht.Set (seg, data);
+ }
+ else
+ {
+ PrintSysError ("hash table si not fitting for segment: ",
+ seg.I1(), "-", seg.I2(), " other = ",
+ data.I2());
+ }
+ }
+ else
+ {
+ Swap (seg.I1(), seg.I2());
+ data.I1() = el.GetIndex();
+ data.I2() = i;
+ faceht.Set (seg, data);
+ }
+ }
+ }
+ }
-
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & el = SurfaceElement(i);
-
- if (surfnr == 0 || el.GetIndex() == surfnr)
+ (*testout) << "open segments: " << endl;
+ opensegments.SetSize(0);
+ for (i = 1; i <= faceht.GetNBags(); i++)
+ for (j = 1; j <= faceht.GetBagSize(i); j++)
{
- for (j = 1; j <= el.GetNP(); j++)
+ INDEX_2 i2;
+ INDEX_2 data;
+ faceht.GetData (i, j, i2, data);
+ if (data.I1()) // surfnr
{
- INDEX_2 seg (el.PNumMod(j), el.PNumMod(j+1));
- INDEX_2 data;
+ Segment seg;
+ seg.p1 = i2.I1();
+ seg.p2 = i2.I2();
+ seg.si = data.I1();
- if (faceht.Used(seg))
+ // find geomdata:
+ if (data.I2() > 0)
{
- data = faceht.Get(seg);
- if (data.I1() == el.GetIndex())
+ // segment due to triangle
+ const Element2d & el = SurfaceElement (data.I2());
+ for (k = 1; k <= el.GetNP(); k++)
{
- data.I1() = 0;
- faceht.Set (seg, data);
- }
- else
- {
- PrintSysError ("hash table si not fitting for segment: ",
- seg.I1(), "-", seg.I2(), " other = ",
- data.I2());
+ if (seg.p1 == el.PNum(k))
+ seg.geominfo[0] = el.GeomInfoPi(k);
+ if (seg.p2 == el.PNum(k))
+ seg.geominfo[1] = el.GeomInfoPi(k);
}
+
+ (*testout) << "trig seg: ";
}
else
{
- Swap (seg.I1(), seg.I2());
- data.I1() = el.GetIndex();
- data.I2() = i;
+ // segment due to line
+ const Segment & lseg = LineSegment (-data.I2());
+ seg.geominfo[0] = lseg.geominfo[0];
+ seg.geominfo[1] = lseg.geominfo[1];
- faceht.Set (seg, data);
+ (*testout) << "line seg: ";
}
- }
- }
- }
-
- (*testout) << "open segments: " << endl;
- opensegments.SetSize(0);
- for (i = 1; i <= faceht.GetNBags(); i++)
- for (j = 1; j <= faceht.GetBagSize(i); j++)
- {
- INDEX_2 i2;
- INDEX_2 data;
- faceht.GetData (i, j, i2, data);
- if (data.I1()) // surfnr
- {
- Segment seg;
- seg.p1 = i2.I1();
- seg.p2 = i2.I2();
- seg.si = data.I1();
-
- // find geomdata:
- if (data.I2() > 0)
- {
- // segment due to triangle
- const Element2d & el = SurfaceElement (data.I2());
- for (k = 1; k <= el.GetNP(); k++)
- {
- if (seg.p1 == el.PNum(k))
- seg.geominfo[0] = el.GeomInfoPi(k);
- if (seg.p2 == el.PNum(k))
- seg.geominfo[1] = el.GeomInfoPi(k);
- }
-
- (*testout) << "trig seg: ";
- }
- else
- {
- // segment due to line
- const Segment & lseg = LineSegment (-data.I2());
- seg.geominfo[0] = lseg.geominfo[0];
- seg.geominfo[1] = lseg.geominfo[1];
-
- (*testout) << "line seg: ";
- }
- (*testout) << seg.p1 << " - " << seg.p2
- << " len = " << Dist (Point(seg.p1), Point(seg.p2))
- << endl;
+ (*testout) << seg.p1 << " - " << seg.p2
+ << " len = " << Dist (Point(seg.p1), Point(seg.p2))
+ << endl;
- opensegments.Append (seg);
- if (seg.geominfo[0].trignum <= 0 || seg.geominfo[1].trignum <= 0)
- {
- (*testout) << "Problem with open segment: " << seg << endl;
- }
+ opensegments.Append (seg);
+ if (seg.geominfo[0].trignum <= 0 || seg.geominfo[1].trignum <= 0)
+ {
+ (*testout) << "Problem with open segment: " << seg << endl;
+ }
- }
- }
+ }
+ }
- PrintMessage (3, opensegments.Size(), " open segments found");
- (*testout) << opensegments.Size() << " open segments found" << endl;
+ PrintMessage (3, opensegments.Size(), " open segments found");
+ (*testout) << opensegments.Size() << " open segments found" << endl;
- ptyps.SetSize (GetNP());
- for (i = 1; i <= ptyps.Size(); i++)
- ptyps.Elem(i) = SURFACEPOINT;
+ /*
+ ptyps.SetSize (GetNP());
+ for (i = 1; i <= ptyps.Size(); i++)
+ ptyps.Elem(i) = SURFACEPOINT;
- for (i = 1; i <= GetNSeg(); i++)
- {
+ for (i = 1; i <= GetNSeg(); i++)
+ {
const Segment & seg = LineSegment (i);
ptyps.Elem(seg.p1) = EDGEPOINT;
ptyps.Elem(seg.p2) = EDGEPOINT;
- }
- for (i = 1; i <= GetNOpenSegments(); i++)
- {
+ }
+ for (i = 1; i <= GetNOpenSegments(); i++)
+ {
const Segment & seg = GetOpenSegment (i);
ptyps.Elem(seg.p1) = EDGEPOINT;
ptyps.Elem(seg.p2) = EDGEPOINT;
- }
+ }
+ */
+ for (i = 1; i <= points.Size(); i++)
+ points.Elem(i).SetType(SURFACEPOINT);
+
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment (i);
+ points[seg.p1].SetType(EDGEPOINT);
+ points[seg.p2].SetType(EDGEPOINT);
+ }
+ for (i = 1; i <= GetNOpenSegments(); i++)
+ {
+ const Segment & seg = GetOpenSegment (i);
+ points[seg.p1].SetType (EDGEPOINT);
+ points[seg.p2].SetType (EDGEPOINT);
+ }
- /*
+
+ /*
- for (i = 1; i <= openelements.Size(); i++)
+ for (i = 1; i <= openelements.Size(); i++)
{
- const Element2d & sel = openelements.Get(i);
+ const Element2d & sel = openelements.Get(i);
- if (boundaryedges)
- for (j = 1; j <= sel.GetNP(); j++)
- {
- INDEX_2 i2;
- i2.I1() = sel.PNumMod(j);
- i2.I2() = sel.PNumMod(j+1);
- i2.Sort();
- boundaryedges->Set (i2, 1);
- }
+ if (boundaryedges)
+ for (j = 1; j <= sel.GetNP(); j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = sel.PNumMod(j);
+ i2.I2() = sel.PNumMod(j+1);
+ i2.Sort();
+ boundaryedges->Set (i2, 1);
+ }
- for (j = 1; j <= 3; j++)
- {
- int pi = sel.PNum(j);
- if (pi <= ptyps.Size())
- ptyps.Elem(pi) = FIXEDPOINT;
- }
+ for (j = 1; j <= 3; j++)
+ {
+ int pi = sel.PNum(j);
+ if (pi <= ptyps.Size())
+ ptyps.Elem(pi) = FIXEDPOINT;
}
- */
-}
+ }
+ */
+ }
-void Mesh :: RemoveOneLayerSurfaceElements ()
-{
- int i, j;
- int np = GetNP();
+ void Mesh :: RemoveOneLayerSurfaceElements ()
+ {
+ int i, j;
+ int np = GetNP();
- FindOpenSegments();
- BitArray frontpoints(np);
+ FindOpenSegments();
+ BitArray frontpoints(np);
- frontpoints.Clear();
- for (i = 1; i <= GetNOpenSegments(); i++)
- {
- const Segment & seg = GetOpenSegment(i);
- frontpoints.Set (seg.p1);
- frontpoints.Set (seg.p2);
- }
+ frontpoints.Clear();
+ for (i = 1; i <= GetNOpenSegments(); i++)
+ {
+ const Segment & seg = GetOpenSegment(i);
+ frontpoints.Set (seg.p1);
+ frontpoints.Set (seg.p2);
+ }
- for (i = 1; i <= GetNSE(); i++)
- {
- Element2d & sel = surfelements.Elem(i);
- int remove = 0;
- for (j = 1; j <= sel.GetNP(); j++)
- if (frontpoints.Test(sel.PNum(j)))
- remove = 1;
- if (remove)
- sel.PNum(1) = 0;
- }
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ Element2d & sel = surfelements.Elem(i);
+ int remove = 0;
+ for (j = 1; j <= sel.GetNP(); j++)
+ if (frontpoints.Test(sel.PNum(j)))
+ remove = 1;
+ if (remove)
+ sel.PNum(1) = 0;
+ }
- for (i = surfelements.Size(); i >= 1; i--)
- {
- if (surfelements.Elem(i).PNum(1) == 0)
- {
- surfelements.Elem(i) = surfelements.Last();
- surfelements.DeleteLast();
- }
- }
- timestamp = NextTimeStamp();
- // Compress();
-}
+ for (i = surfelements.Size(); i >= 1; i--)
+ {
+ if (surfelements.Elem(i).PNum(1) == 0)
+ {
+ surfelements.Elem(i) = surfelements.Last();
+ surfelements.DeleteLast();
+ }
+ }
+ timestamp = NextTimeStamp();
+ // Compress();
+ }
-void Mesh :: FreeOpenElementsEnvironment (int layers)
-{
- int i, j, k;
- PointIndex pi;
- const int large = 9999;
- ARRAY<int,PointIndex::BASE> dist(GetNP());
+ void Mesh :: FreeOpenElementsEnvironment (int layers)
+ {
+ int i, j, k;
+ PointIndex pi;
+ const int large = 9999;
+ ARRAY<int,PointIndex::BASE> dist(GetNP());
- dist = large;
+ dist = large;
- for (i = 1; i <= GetNOpenElements(); i++)
- {
- const Element2d & face = OpenElement(i);
- for (j = 1; j <= face.GetNP(); j++)
- dist[face.PNum(j)] = 1;
- }
+ for (i = 1; i <= GetNOpenElements(); i++)
+ {
+ const Element2d & face = OpenElement(i);
+ for (j = 1; j <= face.GetNP(); j++)
+ dist[face.PNum(j)] = 1;
+ }
+
+ for (k = 1; k <= layers; k++)
+ for (i = 1; i <= GetNE(); i++)
+ {
+ const Element & el = VolumeElement(i);
+ if (el[0] == -1 || el.IsDeleted()) continue;
+
+ int elmin = large;
+ for (j = 0; j < el.GetNP(); j++)
+ if (dist[el[j]] < elmin)
+ elmin = dist[el[j]];
+
+ if (elmin < large)
+ {
+ for (j = 0; j < el.GetNP(); j++)
+ if (dist[el[j]] > elmin+1)
+ dist[el[j]] = elmin+1;
+ }
+ }
- for (k = 1; k <= layers; k++)
+ int cntfree = 0;
for (i = 1; i <= GetNE(); i++)
{
const Element & el = VolumeElement(i);
if (el[0] == -1 || el.IsDeleted()) continue;
-
+
int elmin = large;
for (j = 0; j < el.GetNP(); j++)
if (dist[el[j]] < elmin)
elmin = dist[el[j]];
-
- if (elmin < large)
- {
- for (j = 0; j < el.GetNP(); j++)
- if (dist[el[j]] > elmin+1)
- dist[el[j]] = elmin+1;
- }
- }
-
- int cntfree = 0;
- for (i = 1; i <= GetNE(); i++)
- {
- const Element & el = VolumeElement(i);
- if (el[0] == -1 || el.IsDeleted()) continue;
-
- int elmin = large;
- for (j = 0; j < el.GetNP(); j++)
- if (dist[el[j]] < elmin)
- elmin = dist[el[j]];
- eltyps.Elem(i) = (elmin <= layers) ?
- FREEELEMENT : FIXEDELEMENT;
- if (elmin <= layers)
- cntfree++;
- }
+ eltyps.Elem(i) = (elmin <= layers) ?
+ FREEELEMENT : FIXEDELEMENT;
+ if (elmin <= layers)
+ cntfree++;
+ }
- PrintMessage (5, "free: ", cntfree, ", fixed: ", GetNE()-cntfree);
- (*testout) << "free: " << cntfree << ", fixed: " << GetNE()-cntfree << endl;
+ PrintMessage (5, "free: ", cntfree, ", fixed: ", GetNE()-cntfree);
+ (*testout) << "free: " << cntfree << ", fixed: " << GetNE()-cntfree << endl;
- for (pi = PointIndex::BASE;
- pi < GetNP()+PointIndex::BASE; pi++)
- {
- if (dist[pi] > layers+1)
- ptyps[pi] = FIXEDPOINT;
- }
-}
+ for (pi = PointIndex::BASE;
+ pi < GetNP()+PointIndex::BASE; pi++)
+ {
+ if (dist[pi] > layers+1)
+ points[pi].SetType(FIXEDPOINT);
+ }
+ }
-void Mesh :: SetLocalH (const Point3d & pmin, const Point3d & pmax, double grading)
-{
- Point3d c = Center (pmin, pmax);
- double d = max3 (pmax.X()-pmin.X(),
- pmax.Y()-pmin.Y(),
- pmax.Z()-pmin.Z());
- d /= 2;
- Point3d pmin2 = c - Vec3d (d, d, d);
- Point3d pmax2 = c + Vec3d (d, d, d);
+ void Mesh :: SetLocalH (const Point3d & pmin, const Point3d & pmax, double grading)
+ {
+ Point3d c = Center (pmin, pmax);
+ double d = max3 (pmax.X()-pmin.X(),
+ pmax.Y()-pmin.Y(),
+ pmax.Z()-pmin.Z());
+ d /= 2;
+ Point3d pmin2 = c - Vec3d (d, d, d);
+ Point3d pmax2 = c + Vec3d (d, d, d);
- delete lochfunc;
- lochfunc = new LocalH (pmin2, pmax2, grading);
-}
+ delete lochfunc;
+ lochfunc = new LocalH (pmin2, pmax2, grading);
+ }
-void Mesh :: RestrictLocalH (const Point3d & p, double hloc)
-{
- // cout << "restrict h in " << p << " to " << hloc << endl;
- if (!lochfunc)
- {
- PrintWarning("RestrictLocalH called, creating mesh-size tree");
+ void Mesh :: RestrictLocalH (const Point3d & p, double hloc)
+ {
+ //cout << "restrict h in " << p << " to " << hloc << endl;
+ if (!lochfunc)
+ {
+ PrintWarning("RestrictLocalH called, creating mesh-size tree");
- Point3d boxmin, boxmax;
- GetBox (boxmin, boxmax);
- SetLocalH (boxmin, boxmax, 0.8);
- }
+ Point3d boxmin, boxmax;
+ GetBox (boxmin, boxmax);
+ SetLocalH (boxmin, boxmax, 0.8);
+ }
- lochfunc -> SetH (p, hloc);
-}
+ lochfunc -> SetH (p, hloc);
+ }
-void Mesh :: RestrictLocalHLine (const Point3d & p1,
- const Point3d & p2,
- double hloc)
-{
- // cout << "restrict h along " << p1 << " - " << p2 << " to " << hloc << endl;
- int i;
- int steps = int (Dist (p1, p2) / hloc) + 2;
- Vec3d v(p1, p2);
+ void Mesh :: RestrictLocalHLine (const Point3d & p1,
+ const Point3d & p2,
+ double hloc)
+ {
+ // cout << "restrict h along " << p1 << " - " << p2 << " to " << hloc << endl;
+ int i;
+ int steps = int (Dist (p1, p2) / hloc) + 2;
+ Vec3d v(p1, p2);
- for (i = 0; i <= steps; i++)
- {
- Point3d p = p1 + (double(i)/double(steps) * v);
- RestrictLocalH (p, hloc);
- }
-}
-
-
-void Mesh :: SetGlobalH (double h)
-{
- hglob = h;
-}
+ for (i = 0; i <= steps; i++)
+ {
+ Point3d p = p1 + (double(i)/double(steps) * v);
+ RestrictLocalH (p, hloc);
+ }
+ }
-double Mesh :: MaxHDomain (int dom) const
-{
- if (maxhdomain.Size())
- return maxhdomain.Get(dom);
- else
- return 1e10;
-}
-void Mesh :: SetMaxHDomain (const ARRAY<double> & mhd)
-{
- maxhdomain.SetSize(mhd.Size());
- for (int i = 1; i <= mhd.Size(); i++)
- maxhdomain.Elem(i) = mhd.Get(i);
-}
+ void Mesh :: SetGlobalH (double h)
+ {
+ hglob = h;
+ }
+ double Mesh :: MaxHDomain (int dom) const
+ {
+ if (maxhdomain.Size())
+ return maxhdomain.Get(dom);
+ else
+ return 1e10;
+ }
-double Mesh :: GetH (const Point3d & p) const
-{
- double hmin = hglob;
- if (lochfunc)
- {
- double hl = lochfunc->GetH (p);
- if (hl < hglob)
- hmin = hl;
- }
- return hmin;
-}
+ void Mesh :: SetMaxHDomain (const ARRAY<double> & mhd)
+ {
+ maxhdomain.SetSize(mhd.Size());
+ for (int i = 1; i <= mhd.Size(); i++)
+ maxhdomain.Elem(i) = mhd.Get(i);
+ }
-double Mesh :: GetMinH (const Point3d & pmin, const Point3d & pmax)
-{
- double hmin = hglob;
- if (lochfunc)
- {
- double hl = lochfunc->GetMinH (pmin, pmax);
- if (hl < hmin)
- hmin = hl;
- }
- return hmin;
-}
+ double Mesh :: GetH (const Point3d & p) const
+ {
+ double hmin = hglob;
+ if (lochfunc)
+ {
+ double hl = lochfunc->GetH (p);
+ if (hl < hglob)
+ hmin = hl;
+ }
+ return hmin;
+ }
+ double Mesh :: GetMinH (const Point3d & pmin, const Point3d & pmax)
+ {
+ double hmin = hglob;
+ if (lochfunc)
+ {
+ double hl = lochfunc->GetMinH (pmin, pmax);
+ if (hl < hmin)
+ hmin = hl;
+ }
+ return hmin;
+ }
-double Mesh :: AverageH (int surfnr) const
-{
- int i, j, n;
- double hi, hsum;
- double maxh = 0, minh = 1e10;
- hsum = 0;
- n = 0;
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & el = SurfaceElement(i);
- if (surfnr == 0 || el.GetIndex() == surfnr)
- {
- for (j = 1; j <= 3; j++)
- {
- hi = Dist (Point (el.PNumMod(j)),
- Point (el.PNumMod(j+1)));
- hsum += hi;
+ double Mesh :: AverageH (int surfnr) const
+ {
+ int i, j, n;
+ double hi, hsum;
+ double maxh = 0, minh = 1e10;
- if (hi > maxh) maxh = hi;
- if (hi < minh) minh = hi;
- n++;
- }
- }
- }
+ hsum = 0;
+ n = 0;
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ const Element2d & el = SurfaceElement(i);
+ if (surfnr == 0 || el.GetIndex() == surfnr)
+ {
+ for (j = 1; j <= 3; j++)
+ {
+ hi = Dist (Point (el.PNumMod(j)),
+ Point (el.PNumMod(j+1)));
- PrintMessage (5, "minh = ", minh, " avh = ", (hsum/n), " maxh = ", maxh);
- return (hsum / n);
-}
+ hsum += hi;
+ if (hi > maxh) maxh = hi;
+ if (hi < minh) minh = hi;
+ n++;
+ }
+ }
+ }
+ PrintMessage (5, "minh = ", minh, " avh = ", (hsum/n), " maxh = ", maxh);
+ return (hsum / n);
+ }
-void Mesh :: CalcLocalH ()
-{
- if (!lochfunc)
- {
- Point3d pmin, pmax;
- GetBox (pmin, pmax);
- SetLocalH (pmin, pmax, mparam.grading);
- }
- PrintMessage (3,
- "CalcLocalH: ",
- GetNP(), " Points ",
- GetNE(), " Elements ",
- GetNSE(), " Surface Elements");
+ void Mesh :: CalcLocalH ()
+ {
+ if (!lochfunc)
+ {
+ Point3d pmin, pmax;
+ GetBox (pmin, pmax);
+ SetLocalH (pmin, pmax, mparam.grading);
+ }
- int i;
- for (i = 0; i < GetNSE(); i++)
- {
- const Element2d & el = surfelements[i];
- int j;
+ PrintMessage (3,
+ "CalcLocalH: ",
+ GetNP(), " Points ",
+ GetNE(), " Elements ",
+ GetNSE(), " Surface Elements");
- if (el.GetNP() == 3)
- {
- double hel = -1;
- for (j = 1; j <= 3; j++)
- {
- const Point3d & p1 = points[el.PNumMod(j)];
- const Point3d & p2 = points[el.PNumMod(j+1)];
+
+ int i;
+ for (i = 0; i < GetNSE(); i++)
+ {
+ const Element2d & el = surfelements[i];
+ int j;
+
+ if (el.GetNP() == 3)
+ {
+ double hel = -1;
+ for (j = 1; j <= 3; j++)
+ {
+ const Point3d & p1 = points[el.PNumMod(j)];
+ const Point3d & p2 = points[el.PNumMod(j+1)];
- /*
- INDEX_2 i21(el.PNumMod(j), el.PNumMod(j+1));
- INDEX_2 i22(el.PNumMod(j+1), el.PNumMod(j));
- if (! identifiedpoints->Used (i21) &&
+ /*
+ INDEX_2 i21(el.PNumMod(j), el.PNumMod(j+1));
+ INDEX_2 i22(el.PNumMod(j+1), el.PNumMod(j));
+ if (! identifiedpoints->Used (i21) &&
! identifiedpoints->Used (i22) )
- */
- if (!ident.UsedSymmetric (el.PNumMod(j),
- el.PNumMod(j+1)))
- {
- double hedge = Dist (p1, p2);
- if (hedge > hel)
- hel = hedge;
- // lochfunc->SetH (Center (p1, p2), 2 * Dist (p1, p2));
- // (*testout) << "trigseth, p1,2 = " << el.PNumMod(j) << ", " << el.PNumMod(j+1)
- // << " h = " << (2 * Dist(p1, p2)) << endl;
- }
- }
+ */
+ if (!ident -> UsedSymmetric (el.PNumMod(j),
+ el.PNumMod(j+1)))
+ {
+ double hedge = Dist (p1, p2);
+ if (hedge > hel)
+ hel = hedge;
+ // lochfunc->SetH (Center (p1, p2), 2 * Dist (p1, p2));
+ // (*testout) << "trigseth, p1,2 = " << el.PNumMod(j) << ", " << el.PNumMod(j+1)
+ // << " h = " << (2 * Dist(p1, p2)) << endl;
+ }
+ }
- if (hel > 0)
- {
- const Point3d & p1 = points[el.PNum(1)];
- const Point3d & p2 = points[el.PNum(2)];
- const Point3d & p3 = points[el.PNum(3)];
- lochfunc->SetH (Center (p1, p2, p3), hel);
- }
- }
- else
+ if (hel > 0)
+ {
+ const Point3d & p1 = points[el.PNum(1)];
+ const Point3d & p2 = points[el.PNum(2)];
+ const Point3d & p3 = points[el.PNum(3)];
+ lochfunc->SetH (Center (p1, p2, p3), hel);
+ }
+ }
+ else
{
{
const Point3d & p1 = points[el.PNum(1)];
@@ -1848,565 +2160,614 @@ void Mesh :: CalcLocalH ()
lochfunc->SetH (Center (p1, p2), 2 * Dist (p1, p2));
}
}
- }
+ }
- for (i = 0; i < GetNSeg(); i++)
- {
- const Segment & seg = segments[i];
- const Point3d & p1 = points[seg.p1];
- const Point3d & p2 = points[seg.p2];
- /*
- INDEX_2 i21(seg.p1, seg.p2);
- INDEX_2 i22(seg.p2, seg.p1);
- if (identifiedpoints)
- if (!identifiedpoints->Used (i21) && !identifiedpoints->Used (i22))
- */
- if (!ident.UsedSymmetric (seg.p1, seg.p2))
- {
- lochfunc->SetH (Center (p1, p2), Dist (p1, p2));
- }
- }
- /*
- cerr << "do vol" << endl;
- for (i = 1; i <= GetNE(); i++)
- {
+ for (i = 0; i < GetNSeg(); i++)
+ {
+ const Segment & seg = segments[i];
+ const Point3d & p1 = points[seg.p1];
+ const Point3d & p2 = points[seg.p2];
+ /*
+ INDEX_2 i21(seg.p1, seg.p2);
+ INDEX_2 i22(seg.p2, seg.p1);
+ if (identifiedpoints)
+ if (!identifiedpoints->Used (i21) && !identifiedpoints->Used (i22))
+ */
+ if (!ident -> UsedSymmetric (seg.p1, seg.p2))
+ {
+ lochfunc->SetH (Center (p1, p2), Dist (p1, p2));
+ }
+ }
+ /*
+ cerr << "do vol" << endl;
+ for (i = 1; i <= GetNE(); i++)
+ {
const Element & el = VolumeElement(i);
if (el.GetType() == TET)
- {
- int j, k;
- for (j = 2; j <= 4; j++)
- for (k = 1; k < j; k++)
- {
- const Point3d & p1 = Point (el.PNum(j));
- const Point3d & p2 = Point (el.PNum(k));
- lochfunc->SetH (Center (p1, p2), 2 * Dist (p1, p2));
- (*testout) << "set vol h to " << (2 * Dist (p1, p2)) << endl;
+ {
+ int j, k;
+ for (j = 2; j <= 4; j++)
+ for (k = 1; k < j; k++)
+ {
+ const Point3d & p1 = Point (el.PNum(j));
+ const Point3d & p2 = Point (el.PNum(k));
+ lochfunc->SetH (Center (p1, p2), 2 * Dist (p1, p2));
+ (*testout) << "set vol h to " << (2 * Dist (p1, p2)) << endl;
- }
- }
- }
- */
+ }
+ }
+ }
+ */
- /*
- const char * meshsizefilename =
- globflags.GetStringFlag ("meshsize", NULL);
- if (meshsizefilename)
- {
+ /*
+ const char * meshsizefilename =
+ globflags.GetStringFlag ("meshsize", NULL);
+ if (meshsizefilename)
+ {
ifstream msf(meshsizefilename);
if (msf)
- {
- int nmsp;
- msf >> nmsp;
- for (i = 1; i <= nmsp; i++)
- {
- Point3d pi;
- double hi;
- msf >> pi.X() >> pi.Y() >> pi.Z();
- msf >> hi;
- lochfunc->SetH (pi, hi);
- }
- }
- }
- */
- // lochfunc -> Convexify();
- // lochfunc -> PrintMemInfo (cout);
-}
+ {
+ int nmsp;
+ msf >> nmsp;
+ for (i = 1; i <= nmsp; i++)
+ {
+ Point3d pi;
+ double hi;
+ msf >> pi.X() >> pi.Y() >> pi.Z();
+ msf >> hi;
+ lochfunc->SetH (pi, hi);
+ }
+ }
+ }
+ */
+ // lochfunc -> Convexify();
+ // lochfunc -> PrintMemInfo (cout);
+ }
+ void Mesh :: CalcLocalHFromPointDistances(void)
+ {
+ PrintMessage (3, "Calculating local h from point distances");
+
+ if (!lochfunc)
+ {
+ Point3d pmin, pmax;
+ GetBox (pmin, pmax);
+
+ SetLocalH (pmin, pmax, mparam.grading);
+ }
-void Mesh :: CalcLocalHFromSurfaceCurvature (double elperr)
-{
- PrintMessage (3, "Calculating local h from Surface curvature");
+ PointIndex i,j;
+ double hl;
- if (!lochfunc)
- {
- Point3d pmin, pmax;
- GetBox (pmin, pmax);
+
+ for (i = PointIndex::BASE;
+ i < GetNP()+PointIndex::BASE; i++)
+ {
+ for(j=i+1; j<GetNP()+PointIndex::BASE; j++)
+ {
+ const Point3d & p1 = points[i];
+ const Point3d & p2 = points[j];
+ hl = Dist(p1,p2);
+ RestrictLocalH(p1,hl);
+ RestrictLocalH(p2,hl);
+ //cout << "restricted h at " << p1 << " and " << p2 << " to " << hl << endl;
+ }
+ }
+
+
+ }
+
+
+ void Mesh :: CalcLocalHFromSurfaceCurvature (double elperr)
+ {
+ PrintMessage (3, "Calculating local h from surface curvature");
+
+ if (!lochfunc)
+ {
+ Point3d pmin, pmax;
+ GetBox (pmin, pmax);
- SetLocalH (pmin, pmax, mparam.grading);
- }
+ SetLocalH (pmin, pmax, mparam.grading);
+ }
- INDEX_2_HASHTABLE<int> edges(3 * GetNP() + 2);
- INDEX_2_HASHTABLE<int> bedges(GetNSeg() + 2);
- int i, j;
+ INDEX_2_HASHTABLE<int> edges(3 * GetNP() + 2);
+ INDEX_2_HASHTABLE<int> bedges(GetNSeg() + 2);
+ int i, j;
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment(i);
- INDEX_2 i2(seg.p1, seg.p2);
- i2.Sort();
- bedges.Set (i2, 1);
- }
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & sel = SurfaceElement(i);
- if (!sel.PNum(1))
- continue;
- for (j = 1; j <= 3; j++)
- {
- INDEX_2 i2(sel.PNumMod(j), sel.PNumMod(j+1));
- i2.Sort();
- if (bedges.Used(i2)) continue;
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment(i);
+ INDEX_2 i2(seg.p1, seg.p2);
+ i2.Sort();
+ bedges.Set (i2, 1);
+ }
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ const Element2d & sel = SurfaceElement(i);
+ if (!sel.PNum(1))
+ continue;
+ for (j = 1; j <= 3; j++)
+ {
+ INDEX_2 i2(sel.PNumMod(j), sel.PNumMod(j+1));
+ i2.Sort();
+ if (bedges.Used(i2)) continue;
- if (edges.Used(i2))
- {
- int other = edges.Get(i2);
-
- const Element2d & elother = SurfaceElement(other);
-
- int pi3 = 1;
- while ( (sel.PNum(pi3) == i2.I1()) ||
- (sel.PNum(pi3) == i2.I2()))
- pi3++;
- pi3 = sel.PNum(pi3);
-
- int pi4 = 1;
- while ( (elother.PNum(pi4) == i2.I1()) ||
- (elother.PNum(pi4) == i2.I2()))
- pi4++;
- pi4 = elother.PNum(pi4);
-
- double rad = ComputeCylinderRadius (Point (i2.I1()),
- Point (i2.I2()),
- Point (pi3),
- Point (pi4));
+ if (edges.Used(i2))
+ {
+ int other = edges.Get(i2);
+
+ const Element2d & elother = SurfaceElement(other);
+
+ int pi3 = 1;
+ while ( (sel.PNum(pi3) == i2.I1()) ||
+ (sel.PNum(pi3) == i2.I2()))
+ pi3++;
+ pi3 = sel.PNum(pi3);
+
+ int pi4 = 1;
+ while ( (elother.PNum(pi4) == i2.I1()) ||
+ (elother.PNum(pi4) == i2.I2()))
+ pi4++;
+ pi4 = elother.PNum(pi4);
+
+ double rad = ComputeCylinderRadius (Point (i2.I1()),
+ Point (i2.I2()),
+ Point (pi3),
+ Point (pi4));
- RestrictLocalHLine (Point(i2.I1()), Point(i2.I2()), rad/elperr);
+ RestrictLocalHLine (Point(i2.I1()), Point(i2.I2()), rad/elperr);
- /*
- (*testout) << "pi1,2, 3, 4 = " << i2.I1() << ", " << i2.I2() << ", " << pi3 << ", " << pi4
- << " p1 = " << Point(i2.I1())
- << ", p2 = " << Point(i2.I2())
- // << ", p3 = " << Point(pi3)
- // << ", p4 = " << Point(pi4)
- << ", rad = " << rad << endl;
- */
- }
- else
- edges.Set (i2, i);
- }
- }
+ /*
+ (*testout) << "pi1,2, 3, 4 = " << i2.I1() << ", " << i2.I2() << ", " << pi3 << ", " << pi4
+ << " p1 = " << Point(i2.I1())
+ << ", p2 = " << Point(i2.I2())
+ // << ", p3 = " << Point(pi3)
+ // << ", p4 = " << Point(pi4)
+ << ", rad = " << rad << endl;
+ */
+ }
+ else
+ edges.Set (i2, i);
+ }
+ }
- // Restrict h due to line segments
+ // Restrict h due to line segments
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment(i);
- const Point3d & p1 = Point(seg.p1);
- const Point3d & p2 = Point(seg.p2);
- RestrictLocalH (Center (p1, p2), Dist (p1, p2));
- }
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment(i);
+ const Point3d & p1 = Point(seg.p1);
+ const Point3d & p2 = Point(seg.p2);
+ RestrictLocalH (Center (p1, p2), Dist (p1, p2));
+ }
- /*
+ /*
- int i, j;
- int np = GetNP();
- int nseg = GetNSeg();
- int nse = GetNSE();
+ int i, j;
+ int np = GetNP();
+ int nseg = GetNSeg();
+ int nse = GetNSE();
- ARRAY<Vec3d> normals(np);
- BitArray linepoint(np);
+ ARRAY<Vec3d> normals(np);
+ BitArray linepoint(np);
- linepoint.Clear();
- for (i = 1; i <= nseg; i++)
+ linepoint.Clear();
+ for (i = 1; i <= nseg; i++)
{
- linepoint.Set (LineSegment(i).p1);
- linepoint.Set (LineSegment(i).p2);
+ linepoint.Set (LineSegment(i).p1);
+ linepoint.Set (LineSegment(i).p2);
}
- for (i = 1; i <= np; i++)
+ for (i = 1; i <= np; i++)
normals.Elem(i) = Vec3d(0,0,0);
- for (i = 1; i <= nse; i++)
+ for (i = 1; i <= nse; i++)
{
- Element2d & el = SurfaceElement(i);
- Vec3d nf = Cross (Vec3d (Point (el.PNum(1)), Point(el.PNum(2))),
- Vec3d (Point (el.PNum(1)), Point(el.PNum(3))));
- for (j = 1; j <= 3; j++)
- normals.Elem(el.PNum(j)) += nf;
+ Element2d & el = SurfaceElement(i);
+ Vec3d nf = Cross (Vec3d (Point (el.PNum(1)), Point(el.PNum(2))),
+ Vec3d (Point (el.PNum(1)), Point(el.PNum(3))));
+ for (j = 1; j <= 3; j++)
+ normals.Elem(el.PNum(j)) += nf;
}
- for (i = 1; i <= np; i++)
+ for (i = 1; i <= np; i++)
normals.Elem(i) /= (1e-12 + normals.Elem(i).Length());
- for (i = 1; i <= nse; i++)
+ for (i = 1; i <= nse; i++)
{
- Element2d & el = SurfaceElement(i);
- Vec3d nf = Cross (Vec3d (Point (el.PNum(1)), Point(el.PNum(2))),
- Vec3d (Point (el.PNum(1)), Point(el.PNum(3))));
- nf /= nf.Length();
- Point3d c = Center (Point(el.PNum(1)),
- Point(el.PNum(2)),
- Point(el.PNum(3)));
+ Element2d & el = SurfaceElement(i);
+ Vec3d nf = Cross (Vec3d (Point (el.PNum(1)), Point(el.PNum(2))),
+ Vec3d (Point (el.PNum(1)), Point(el.PNum(3))));
+ nf /= nf.Length();
+ Point3d c = Center (Point(el.PNum(1)),
+ Point(el.PNum(2)),
+ Point(el.PNum(3)));
- for (j = 1; j <= 3; j++)
+ for (j = 1; j <= 3; j++)
+ {
+ if (!linepoint.Test (el.PNum(j)))
+ {
+ double dist = Dist (c, Point(el.PNum(j)));
+ double dn = (nf - normals.Get(el.PNum(j))).Length();
+
+ RestrictLocalH (Point(el.PNum(j)), dist / (dn+1e-12) /elperr);
+ }
+ }
+ }
+ */
+ }
+
+
+ void Mesh :: RestrictLocalH (resthtype rht, int nr, double loch)
+ {
+ int i;
+ switch (rht)
+ {
+ case RESTRICTH_FACE:
{
- if (!linepoint.Test (el.PNum(j)))
+ for (i = 1; i <= GetNSE(); i++)
{
- double dist = Dist (c, Point(el.PNum(j)));
- double dn = (nf - normals.Get(el.PNum(j))).Length();
-
- RestrictLocalH (Point(el.PNum(j)), dist / (dn+1e-12) /elperr);
+ const Element2d & sel = SurfaceElement(i);
+ if (sel.GetIndex() == nr)
+ RestrictLocalH (RESTRICTH_SURFACEELEMENT, i, loch);
}
+ break;
}
- }
- */
-}
+ case RESTRICTH_EDGE:
+ {
+ for (i = 1; i <= GetNSeg(); i++)
+ {
+ const Segment & seg = LineSegment(i);
+ if (seg.edgenr == nr)
+ RestrictLocalH (RESTRICTH_SEGMENT, i, loch);
+ }
+ break;
+ }
+ case RESTRICTH_POINT:
+ {
+ RestrictLocalH (Point (nr), loch);
+ break;
+ }
+
+ case RESTRICTH_SURFACEELEMENT:
+ {
+ const Element2d & sel = SurfaceElement(nr);
+ Point3d p = Center (Point(sel.PNum(1)),
+ Point(sel.PNum(2)),
+ Point(sel.PNum(3)));
+ RestrictLocalH (p, loch);
+ break;
+ }
+ case RESTRICTH_SEGMENT:
+ {
+ const Segment & seg = LineSegment(nr);
+ RestrictLocalHLine (Point (seg.p1), Point(seg.p2), loch);
+ break;
+ }
+ }
+ }
-void Mesh :: RestrictLocalH (resthtype rht, int nr, double loch)
-{
- int i;
- switch (rht)
- {
- case RESTRICTH_FACE:
+ void Mesh :: LoadLocalMeshSize (const char * meshsizefilename)
+ {
+ if (!meshsizefilename) return;
+
+ ifstream msf(meshsizefilename);
+
+ if (!msf) return;
+
+ PrintMessage (3, "Load local mesh-size");
+ int nmsp, nmsl;
+ msf >> nmsp;
+ for (int i = 0; i < nmsp; i++)
{
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & sel = SurfaceElement(i);
- if (sel.GetIndex() == nr)
- RestrictLocalH (RESTRICTH_SURFACEELEMENT, i, loch);
- }
- break;
+ Point3d pi;
+ double hi;
+ msf >> pi.X() >> pi.Y() >> pi.Z();
+ msf >> hi;
+ if (!msf.good())
+ throw NgException ("problem in mesh-size file\n");
+ RestrictLocalH (pi, hi);
}
- case RESTRICTH_EDGE:
+ msf >> nmsl;
+ for (int i = 0; i < nmsl; i++)
{
- for (i = 1; i <= GetNSeg(); i++)
- {
- const Segment & seg = LineSegment(i);
- if (seg.edgenr == nr)
- RestrictLocalH (RESTRICTH_SEGMENT, i, loch);
- }
- break;
- }
- case RESTRICTH_POINT:
+ Point3d p1, p2;
+ double hi;
+ msf >> p1.X() >> p1.Y() >> p1.Z();
+ msf >> p2.X() >> p2.Y() >> p2.Z();
+ msf >> hi;
+ if (!msf.good())
+ throw NgException ("problem in mesh-size file\n");
+ RestrictLocalHLine (p1, p2, hi);
+ }
+ }
+
+
+
+ void Mesh :: GetBox (Point3d & pmin, Point3d & pmax, int dom) const
+ {
+ if (points.Size() == 0)
{
- RestrictLocalH (Point (nr), loch);
- break;
+ pmin = pmax = Point3d(0,0,0);
+ return;
}
- case RESTRICTH_SURFACEELEMENT:
+ if (dom <= 0)
{
- const Element2d & sel = SurfaceElement(nr);
- Point3d p = Center (Point(sel.PNum(1)),
- Point(sel.PNum(2)),
- Point(sel.PNum(3)));
- RestrictLocalH (p, loch);
- break;
+ pmin = Point3d (1e10, 1e10, 1e10);
+ pmax = Point3d (-1e10, -1e10, -1e10);
+
+ for (PointIndex pi = PointIndex::BASE;
+ pi < GetNP()+PointIndex::BASE; pi++)
+ {
+ pmin.SetToMin ( (*this) [pi] );
+ pmax.SetToMax ( (*this) [pi] );
+ }
}
- case RESTRICTH_SEGMENT:
+ else
{
- const Segment & seg = LineSegment(nr);
- RestrictLocalHLine (Point (seg.p1), Point(seg.p2), loch);
- break;
- }
- }
-}
+ int j, nse = GetNSE();
+ SurfaceElementIndex sei;
+ pmin = Point3d (1e10, 1e10, 1e10);
+ pmax = Point3d (-1e10, -1e10, -1e10);
+ for (sei = 0; sei < nse; sei++)
+ {
+ const Element2d & el = (*this)[sei];
+ if (el.IsDeleted() ) continue;
-void Mesh :: LoadLocalMeshSize (istream & msf)
-{
- PrintMessage (3, "Load local mesh-size");
- int i, nmsp, nmsl;
- msf >> nmsp;
- for (i = 1; i <= nmsp; i++)
- {
- Point3d pi;
- double hi;
- msf >> pi.X() >> pi.Y() >> pi.Z();
- msf >> hi;
- RestrictLocalH (pi, hi);
- }
- msf >> nmsl;
- for (i = 1; i <= nmsl; i++)
- {
- Point3d p1, p2;
- double hi;
- msf >> p1.X() >> p1.Y() >> p1.Z();
- msf >> p2.X() >> p2.Y() >> p2.Z();
- msf >> hi;
- RestrictLocalHLine (p1, p2, hi);
- }
-}
+ if (dom == -1 || el.GetIndex() == dom)
+ {
+ for (j = 0; j < 3; j++)
+ {
+ pmin.SetToMin ( (*this) [el[j]] );
+ pmax.SetToMax ( (*this) [el[j]] );
+ }
+ }
+ }
+ }
+
+ if (pmin.X() > 0.5e10)
+ {
+ pmin = pmax = Point3d(0,0,0);
+ }
+ }
-void Mesh :: GetBox (Point3d & pmin, Point3d & pmax, int dom) const
-{
- if (points.Size() == 0)
- {
- pmin = pmax = Point3d(0,0,0);
- return;
- }
- if (dom <= 0)
- {
- pmin = Point3d (1e10, 1e10, 1e10);
- pmax = Point3d (-1e10, -1e10, -1e10);
+ void Mesh :: GetBox (Point3d & pmin, Point3d & pmax, POINTTYPE ptyp) const
+ {
+ if (points.Size() == 0)
+ {
+ pmin = pmax = Point3d(0,0,0);
+ return;
+ }
- for (PointIndex pi = PointIndex::BASE;
- pi < GetNP()+PointIndex::BASE; pi++)
+ pmin = Point3d (1e10, 1e10, 1e10);
+ pmax = Point3d (-1e10, -1e10, -1e10);
+
+ for (PointIndex pi = PointIndex::BASE;
+ pi < GetNP()+PointIndex::BASE; pi++)
+ if (points[pi].Type() <= ptyp)
{
pmin.SetToMin ( (*this) [pi] );
pmax.SetToMax ( (*this) [pi] );
}
- }
- else
- {
- int j, nse = GetNSE();
- SurfaceElementIndex sei;
-
- pmin = Point3d (1e10, 1e10, 1e10);
- pmax = Point3d (-1e10, -1e10, -1e10);
- for (sei = 0; sei < nse; sei++)
- {
- const Element2d & el = (*this)[sei];
- if (el.IsDeleted() ) continue;
-
- if (dom == -1 || el.GetIndex() == dom)
- {
- for (j = 0; j < 3; j++)
- {
- pmin.SetToMin ( (*this) [el[j]] );
- pmax.SetToMax ( (*this) [el[j]] );
- }
- }
- }
- }
-
- if (pmin.X() > 0.5e10)
- {
- pmin = pmax = Point3d(0,0,0);
- }
-}
-
-
+ }
-void Mesh :: GetBox (Point3d & pmin, Point3d & pmax, POINTTYPE ptyp) const
-{
- if (points.Size() == 0)
- {
- pmin = pmax = Point3d(0,0,0);
- return;
- }
- pmin = Point3d (1e10, 1e10, 1e10);
- pmax = Point3d (-1e10, -1e10, -1e10);
-
- for (PointIndex pi = PointIndex::BASE;
- pi < GetNP()+PointIndex::BASE; pi++)
- if (ptyps[pi] <= ptyp)
- {
- pmin.SetToMin ( (*this) [pi] );
- pmax.SetToMax ( (*this) [pi] );
- }
-}
+ double Mesh :: ElementError (int eli) const
+ {
+ const Element & el = volelements.Get(eli);
+ return CalcTetBadness (points.Get(el[0]), points.Get(el[1]),
+ points.Get(el[2]), points.Get(el[3]), -1);
+ }
+ void Mesh :: AddLockedPoint (PointIndex pi)
+ {
+ lockedpoints.Append (pi);
+ }
+ void Mesh :: ClearLockedPoints ()
+ {
+ lockedpoints.SetSize (0);
+ }
-double Mesh :: ElementError (int eli) const
-{
- const Element & el = volelements.Get(eli);
- return CalcTetBadness (points.Get(el[0]), points.Get(el[1]),
- points.Get(el[2]), points.Get(el[3]), -1);
-}
-void Mesh :: AddLockedPoint (PointIndex pi)
-{
- lockedpoints.Append (pi);
-}
-void Mesh :: ClearLockedPoints ()
-{
- lockedpoints.SetSize (0);
-}
+ void Mesh :: Compress ()
+ {
+ int i, j;
+ ARRAY<int,PointIndex::BASE> op2np(GetNP());
+ ARRAY<MeshPoint> hpoints;
+ BitArrayChar<PointIndex::BASE> pused(GetNP());
+
+ /*
+ (*testout) << "volels: " << endl;
+ for (i = 1; i <= volelements.Size(); i++)
+ {
+ for (j = 1; j <= volelements.Get(i).GetNP(); j++)
+ (*testout) << volelements.Get(i).PNum(j) << " ";
+ (*testout) << endl;
+ }
+ (*testout) << "np: " << GetNP() << endl;
+ */
+ for (i = 0; i < volelements.Size(); i++)
+ if (volelements[i][0] <= PointIndex::BASE-1 ||
+ volelements[i].IsDeleted())
+ {
+ volelements.Delete(i);
+ i--;
+ }
-void Mesh :: Compress ()
-{
- int i, j;
- ARRAY<int,PointIndex::BASE> op2np(GetNP());
- ARRAY<Point3d> hpoints;
- BitArrayChar<PointIndex::BASE> pused(GetNP());
+ for (i = 0; i < surfelements.Size(); i++)
+ if (surfelements[i].IsDeleted())
+ {
+ surfelements.Delete(i);
+ i--;
+ }
- /*
- (*testout) << "volels: " << endl;
- for (i = 1; i <= volelements.Size(); i++)
- {
- for (j = 1; j <= volelements.Get(i).GetNP(); j++)
- (*testout) << volelements.Get(i).PNum(j) << " ";
- (*testout) << endl;
- }
- (*testout) << "np: " << GetNP() << endl;
- */
+ for (i = 0; i < segments.Size(); i++)
+ if (segments[i].p1 <= PointIndex::BASE-1)
+ {
+ segments.Delete(i);
+ i--;
+ }
+ pused.Clear();
+ for (i = 0; i < volelements.Size(); i++)
+ {
+ const Element & el = volelements[i];
+ for (j = 0; j < el.GetNP(); j++)
+ pused.Set (el[j]);
+ }
- for (i = 0; i < volelements.Size(); i++)
- if (volelements[i][0] <= PointIndex::BASE-1 ||
- volelements[i].IsDeleted())
+ for (i = 0; i < surfelements.Size(); i++)
{
- volelements.Delete(i);
- i--;
+ const Element2d & el = surfelements[i];
+ for (j = 0; j < el.GetNP(); j++)
+ pused.Set (el[j]);
}
- for (i = 0; i < surfelements.Size(); i++)
- if (surfelements[i].IsDeleted())
+
+ for (i = 0; i < segments.Size(); i++)
{
- surfelements.Delete(i);
- i--;
+ const Segment & seg = segments[i];
+ pused.Set (seg.p1);
+ pused.Set (seg.p2);
}
- for (i = 0; i < segments.Size(); i++)
- if (segments[i].p1 == -1)
+
+ for (i = 0; i < openelements.Size(); i++)
{
- segments.Delete(i);
- i--;
+ const Element2d & el = openelements[i];
+ for (j = 0; j < el.GetNP(); j++)
+ pused.Set(el[j]);
}
-
- pused.Clear();
- for (i = 0; i < volelements.Size(); i++)
- {
- const Element & el = volelements[i];
- for (j = 0; j < el.GetNP(); j++)
- pused.Set (el[j]);
- }
+ for (i = 0; i < lockedpoints.Size(); i++)
+ pused.Set (lockedpoints[i]);
- for (i = 0; i < surfelements.Size(); i++)
- {
- const Element2d & el = surfelements[i];
- for (j = 0; j < el.GetNP(); j++)
- pused.Set (el[j]);
- }
- for (i = 0; i < segments.Size(); i++)
+ /*
+ // compress points doesn´t work for identified points !
+ if (identifiedpoints)
{
- const Segment & seg = segments[i];
- pused.Set (seg.p1);
- pused.Set (seg.p2);
- }
-
- for (i = 0; i < openelements.Size(); i++)
+ for (i = 1; i <= identifiedpoints->GetNBags(); i++)
+ if (identifiedpoints->GetBagSize(i))
{
- const Element2d & el = openelements[i];
- for (j = 0; j < el.GetNP(); j++)
- pused.Set(el[j]);
+ pused.Set ();
+ break;
}
-
- for (i = 0; i < lockedpoints.Size(); i++)
- pused.Set (lockedpoints[i]);
-
- /*
- // compress points doesn´t work for identified points !
- if (identifiedpoints)
- {
- for (i = 1; i <= identifiedpoints->GetNBags(); i++)
- if (identifiedpoints->GetBagSize(i))
- {
- pused.Set ();
- break;
- }
}
- */
- // pused.Set();
+ */
+ // pused.Set();
- int npi = PointIndex::BASE-1;
+ int npi = PointIndex::BASE-1;
- for (i = PointIndex::BASE;
- i < points.Size()+PointIndex::BASE; i++)
- if (pused.Test(i))
- {
- npi++;
- op2np[i] = npi;
- hpoints.Append (points[i]);
- }
- else
- op2np[i] = -1;
+ for (i = PointIndex::BASE;
+ i < points.Size()+PointIndex::BASE; i++)
+ if (pused.Test(i))
+ {
+ npi++;
+ op2np[i] = npi;
+ hpoints.Append (points[i]);
+ }
+ else
+ op2np[i] = -1;
- points.SetSize(0);
- for (i = 0; i < hpoints.Size(); i++)
- points.Append (hpoints[i]);
+ points.SetSize(0);
+ for (i = 0; i < hpoints.Size(); i++)
+ points.Append (hpoints[i]);
- for (i = 1; i <= volelements.Size(); i++)
- {
- Element & el = VolumeElement(i);
- for (j = 0; j < el.GetNP(); j++)
- el[j] = op2np[el[j]];
- }
- for (i = 1; i <= surfelements.Size(); i++)
- {
- Element2d & el = SurfaceElement(i);
- for (j = 0; j < el.GetNP(); j++)
- el[j] = op2np[el[j]];
- }
+ for (i = 1; i <= volelements.Size(); i++)
+ {
+ Element & el = VolumeElement(i);
+ for (j = 0; j < el.GetNP(); j++)
+ el[j] = op2np[el[j]];
+ }
+
+ for (i = 1; i <= surfelements.Size(); i++)
+ {
+ Element2d & el = SurfaceElement(i);
+ for (j = 0; j < el.GetNP(); j++)
+ el[j] = op2np[el[j]];
+ }
- for (i = 0; i < segments.Size(); i++)
- {
- Segment & seg = segments[i];
- seg.p1 = op2np[seg.p1];
- seg.p2 = op2np[seg.p2];
- }
+ for (i = 0; i < segments.Size(); i++)
+ {
+ Segment & seg = segments[i];
+ seg.p1 = op2np[seg.p1];
+ seg.p2 = op2np[seg.p2];
+ }
- for (i = 1; i <= openelements.Size(); i++)
- {
- Element2d & el = openelements.Elem(i);
- for (j = 0; j < el.GetNP(); j++)
- el[j] = op2np[el[j]];
- }
+ for (i = 1; i <= openelements.Size(); i++)
+ {
+ Element2d & el = openelements.Elem(i);
+ for (j = 0; j < el.GetNP(); j++)
+ el[j] = op2np[el[j]];
+ }
- for (i = 0; i < lockedpoints.Size(); i++)
- lockedpoints[i] = op2np[lockedpoints[i]];
+ for (i = 0; i < lockedpoints.Size(); i++)
+ lockedpoints[i] = op2np[lockedpoints[i]];
+ CalcSurfacesOfNode();
- CalcSurfacesOfNode();
- // FindOpenElements();
- timestamp = NextTimeStamp();
- (*testout) << "compress, done" << endl
- << "np = " << points.Size()
- << "ne = " << volelements.Size() << ", type.size = " << eltyps.Size()
- << "volelements = " << volelements << endl;
-}
+ // FindOpenElements();
+ timestamp = NextTimeStamp();
+
+ /*
+ (*testout) << "compress, done" << endl
+ << "np = " << points.Size()
+ << "ne = " << volelements.Size() << ", type.size = " << eltyps.Size()
+ << "volelements = " << volelements << endl;
+ */
+ }
-int Mesh :: CheckConsistentBoundary () const
-{
- int nf = GetNOpenElements();
- INDEX_2_HASHTABLE<int> edges(nf+2);
- int i, j;
- INDEX_2 i2;
- int err = 0;
+ int Mesh :: CheckConsistentBoundary () const
+ {
+ int nf = GetNOpenElements();
+ INDEX_2_HASHTABLE<int> edges(nf+2);
+ int i, j;
+ INDEX_2 i2;
+ int err = 0;
- for (i = 1; i <= nf; i++)
- {
- const Element2d & sel = OpenElement(i);
+ for (i = 1; i <= nf; i++)
+ {
+ const Element2d & sel = OpenElement(i);
- for (j = 1; j <= sel.GetNP(); j++)
- {
- i2.I1() = sel.PNumMod(j);
- i2.I2() = sel.PNumMod(j+1);
+ for (j = 1; j <= sel.GetNP(); j++)
+ {
+ i2.I1() = sel.PNumMod(j);
+ i2.I2() = sel.PNumMod(j+1);
- int sign = (i2.I2() > i2.I1()) ? 1 : -1;
- i2.Sort();
- if (!edges.Used (i2))
- edges.Set (i2, 0);
+ int sign = (i2.I2() > i2.I1()) ? 1 : -1;
+ i2.Sort();
+ if (!edges.Used (i2))
+ edges.Set (i2, 0);
- edges.Set (i2, edges.Get(i2) + sign);
- /*
+ edges.Set (i2, edges.Get(i2) + sign);
+ /*
if (edges.Used(i2))
{
@@ -2419,290 +2780,335 @@ int Mesh :: CheckConsistentBoundary () const
}
else
{
- Swap (i2.I1(), i2.I2());
+ swap (i2.I1(), i2.I2());
edges.Set(i2, 1);
cnt1++;
}
*/
- }
- }
+ }
+ }
- /*
- if (cnt1 != cnt2)
- err = 2;
+ /*
+ if (cnt1 != cnt2)
+ err = 2;
*/
- for (i = 1; i <= edges.GetNBags(); i++)
- for (j = 1; j <= edges.GetBagSize(i); j++)
+ for (i = 1; i <= edges.GetNBags(); i++)
+ for (j = 1; j <= edges.GetBagSize(i); j++)
+ {
+ int cnt = 0;
+ edges.GetData (i, j, i2, cnt);
+ if (cnt)
+ {
+ PrintError ("Edge ", i2.I1() , " - ", i2.I2(), " multiple times in surface mesh");
+ err = 2;
+ }
+ }
+
+ return err;
+ }
+
+
+
+ int Mesh :: CheckOverlappingBoundary ()
+ {
+ int i, j, k;
+
+ Point3d pmin, pmax;
+ GetBox (pmin, pmax);
+ Box3dTree setree(pmin, pmax);
+ ARRAY<int> inters;
+
+ bool overlap = 0;
+ bool incons_layers = 0;
+
+
+ for (i = 1; i <= GetNSE(); i++)
+ SurfaceElement(i).badel = 0;
+
+
+ for (i = 1; i <= GetNSE(); i++)
{
- int cnt = 0;
- edges.GetData (i, j, i2, cnt);
- if (cnt)
+ const Element2d & tri = SurfaceElement(i);
+
+ Point3d tpmin (Point(tri[0]));
+ Point3d tpmax (tpmin);
+
+ for (k = 1; k < tri.GetNP(); k++)
{
- PrintError ("Edge ", i2.I1() , " - ", i2.I2(), " multiple times in surface mesh");
- err = 2;
+ tpmin.SetToMin (Point (tri[k]));
+ tpmax.SetToMax (Point (tri[k]));
}
- }
+ Vec3d diag(tpmin, tpmax);
- return err;
-}
+ tpmax = tpmax + 0.1 * diag;
+ tpmin = tpmin - 0.1 * diag;
+ setree.Insert (tpmin, tpmax, i);
+ }
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ const Element2d & tri = SurfaceElement(i);
+
+ Point3d tpmin (Point(tri[0]));
+ Point3d tpmax (tpmin);
-int Mesh :: CheckOverlappingBoundary ()
-{
- int i, j, k;
+ for (k = 1; k < tri.GetNP(); k++)
+ {
+ tpmin.SetToMin (Point (tri[k]));
+ tpmax.SetToMax (Point (tri[k]));
+ }
- Point3d pmin, pmax;
- GetBox (pmin, pmax);
- Box3dTree setree(pmin, pmax);
- ARRAY<int> inters;
- int overlap = 0;
+ setree.GetIntersecting (tpmin, tpmax, inters);
- for (i = 1; i <= GetNSE(); i++)
- SurfaceElement(i).badel = 0;
+ for (j = 1; j <= inters.Size(); j++)
+ {
+ const Element2d & tri2 = SurfaceElement(inters.Get(j));
+ if ( (*this)[tri[0]].GetLayer() != (*this)[tri2[0]].GetLayer())
+ continue;
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & tri = SurfaceElement(i);
-
- Point3d tpmin (Point(tri[0]));
- Point3d tpmax (tpmin);
+ if ( (*this)[tri[0]].GetLayer() != (*this)[tri[1]].GetLayer() ||
+ (*this)[tri[0]].GetLayer() != (*this)[tri[2]].GetLayer())
+ {
+ incons_layers = 1;
+ cout << "inconsistent layers in triangle" << endl;
+ }
- for (k = 1; k < tri.GetNP(); k++)
- {
- tpmin.SetToMin (Point (tri[k]));
- tpmax.SetToMax (Point (tri[k]));
- }
- Vec3d diag(tpmin, tpmax);
- tpmax = tpmax + 0.1 * diag;
- tpmin = tpmin - 0.1 * diag;
+ const Point3d *trip1[3], *trip2[3];
+ for (k = 1; k <= 3; k++)
+ {
+ trip1[k-1] = &Point (tri.PNum(k));
+ trip2[k-1] = &Point (tri2.PNum(k));
+ }
- setree.Insert (tpmin, tpmax, i);
- }
+ if (IntersectTriangleTriangle (&trip1[0], &trip2[0]))
+ {
+ overlap = 1;
+ PrintWarning ("Intersecting elements"
+ ,i, " and ", inters.Get(j));
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & tri = SurfaceElement(i);
-
- Point3d tpmin (Point(tri[0]));
- Point3d tpmax (tpmin);
+ (*testout) << "Intersecting: " << endl;
+ (*testout) << "openelement " << i << " with open element " << inters.Get(j) << endl;
- for (k = 1; k < tri.GetNP(); k++)
- {
- tpmin.SetToMin (Point (tri[k]));
- tpmax.SetToMax (Point (tri[k]));
- }
+ cout << "el1 = " << tri << endl;
+ cout << "el2 = " << tri2 << endl;
+ cout << "layer1 = " << (*this)[tri[0]].GetLayer() << endl;
+ cout << "layer2 = " << (*this)[tri2[0]].GetLayer() << endl;
- setree.GetIntersecting (tpmin, tpmax, inters);
- for (j = 1; j <= inters.Size(); j++)
- {
- const Element2d & tri2 = SurfaceElement(inters.Get(j));
+ for (k = 1; k <= 3; k++)
+ (*testout) << tri.PNum(k) << " ";
+ (*testout) << endl;
+ for (k = 1; k <= 3; k++)
+ (*testout) << tri2.PNum(k) << " ";
+ (*testout) << endl;
- const Point3d *trip1[3], *trip2[3];
- for (k = 1; k <= 3; k++)
- {
- trip1[k-1] = &Point (tri.PNum(k));
- trip2[k-1] = &Point (tri2.PNum(k));
- }
+ for (k = 0; k <= 2; k++)
+ (*testout) << *trip1[k] << " ";
+ (*testout) << endl;
+ for (k = 0; k <= 2; k++)
+ (*testout) << *trip2[k] << " ";
+ (*testout) << endl;
- if (IntersectTriangleTriangle (&trip1[0], &trip2[0]))
- {
- overlap = 1;
- PrintWarning ("Intersecting elements"
- ,i, " and ", inters.Get(j));
-
- (*testout) << "Intersecting: " << endl;
- (*testout) << "openelement " << i << " with open element " << inters.Get(j) << endl;
-
- for (k = 1; k <= 3; k++)
- (*testout) << tri.PNum(k) << " ";
- (*testout) << endl;
- for (k = 1; k <= 3; k++)
- (*testout) << tri2.PNum(k) << " ";
- (*testout) << endl;
-
- for (k = 0; k <= 2; k++)
- (*testout) << *trip1[k] << " ";
- (*testout) << endl;
- for (k = 0; k <= 2; k++)
- (*testout) << *trip2[k] << " ";
- (*testout) << endl;
-
-
- /*
- INDEX_3 i3(tri.PNum(1), tri.PNum(2), tri.PNum(3));
- i3.Sort();
- for (k = 1; k <= GetNSE(); k++)
- {
+
+ /*
+ INDEX_3 i3(tri.PNum(1), tri.PNum(2), tri.PNum(3));
+ i3.Sort();
+ for (k = 1; k <= GetNSE(); k++)
+ {
const Element2d & el2 = SurfaceElement(k);
INDEX_3 i3b(el2.PNum(1), el2.PNum(2), el2.PNum(3));
i3b.Sort();
if (i3 == i3b)
- {
- SurfaceElement(k).badel = 1;
- }
- }
- */
- SurfaceElement(i).badel = 1;
- SurfaceElement(inters.Get(j)).badel = 1;
- }
- }
- }
+ {
+ SurfaceElement(k).badel = 1;
+ }
+ }
+ */
+ SurfaceElement(i).badel = 1;
+ SurfaceElement(inters.Get(j)).badel = 1;
+ }
+ }
+ }
- return overlap;
-}
+ // bug 'fix'
+ if (incons_layers) overlap = 0;
+
+ return overlap;
+ }
-int Mesh :: CheckVolumeMesh () const
-{
- PrintMessage (3, "Checking volume mesh");
+ int Mesh :: CheckVolumeMesh () const
+ {
+ PrintMessage (3, "Checking volume mesh");
- int ne = GetNE();
- DenseMatrix dtrans(3,3);
- int i, j;
+ int ne = GetNE();
+ DenseMatrix dtrans(3,3);
+ int i, j;
- PrintMessage (5, "elements: ", ne);
- for (i = 1; i <= ne; i++)
- {
- Element & el = (Element&) VolumeElement(i);
- el.flags.badel = 0;
- int nip = el.GetNIP();
- for (j = 1; j <= nip; j++)
- {
- el.GetTransformation (j, Points(), dtrans);
- double det = dtrans.Det();
- if (det > 0)
- {
- PrintError ("Element ", i , " has wrong orientation");
- el.flags.badel = 1;
- }
- }
- }
+ PrintMessage (5, "elements: ", ne);
+ for (i = 1; i <= ne; i++)
+ {
+ Element & el = (Element&) VolumeElement(i);
+ el.flags.badel = 0;
+ int nip = el.GetNIP();
+ for (j = 1; j <= nip; j++)
+ {
+ el.GetTransformation (j, Points(), dtrans);
+ double det = dtrans.Det();
+ if (det > 0)
+ {
+ PrintError ("Element ", i , " has wrong orientation");
+ el.flags.badel = 1;
+ }
+ }
+ }
- return 0;
-}
+ return 0;
+ }
-bool Mesh :: LegalTrig (const Element2d & el) const
-{
- return 1;
- if ( /* hp */ 1) // needed for old, simple hp-refinement
- {
- // trigs with 2 or more segments are illegal
- int i;
- int nseg = 0;
-
- if (!segmentht)
- {
- cerr << "no segmentht allocated" << endl;
- return 0;
- }
+ bool Mesh :: LegalTrig (const Element2d & el) const
+ {
+ return 1;
+ if ( /* hp */ 1) // needed for old, simple hp-refinement
+ {
+ // trigs with 2 or more segments are illegal
+ int i;
+ int nseg = 0;
+
+ if (!segmentht)
+ {
+ cerr << "no segmentht allocated" << endl;
+ return 0;
+ }
- // Point3d cp(0.5, 0.5, 0.5);
- for (i = 1; i <= 3; i++)
- {
- INDEX_2 i2(el.PNumMod (i), el.PNumMod (i+1));
- i2.Sort();
- if (segmentht -> Used (i2))
- nseg++;
- }
- if (nseg >= 2)
- return 0;
- }
- return 1;
-}
+ // Point3d cp(0.5, 0.5, 0.5);
+ for (i = 1; i <= 3; i++)
+ {
+ INDEX_2 i2(el.PNumMod (i), el.PNumMod (i+1));
+ i2.Sort();
+ if (segmentht -> Used (i2))
+ nseg++;
+ }
+ if (nseg >= 2)
+ return 0;
+ }
+ return 1;
+ }
-///
-bool Mesh :: LegalTet2 (Element & el) const
-{
- // return 1;
- // Test, whether 4 points have a common surface plus
- // at least 4 edges at the boundary
+ ///
+ bool Mesh :: LegalTet2 (Element & el) const
+ {
+ // return 1;
+ // Test, whether 4 points have a common surface plus
+ // at least 4 edges at the boundary
- int i, j, k;
+ int i, j, k;
- // non-tets are always legal
- if (el.GetType() != TET)
- {
- el.SetLegal (1);
- return 1;
- }
-
- // element has at least 2 inner points ---> legal
- int cnti = 0;
- for (j = 1; j <= 4; j++)
- if (PointType(el.PNum(j)) == INNERPOINT)
- cnti++;
- if (cnti >= 2)
- {
- el.SetLegal (1);
- return 1;
- }
+ // non-tets are always legal
+ if (el.GetType() != TET)
+ {
+ el.SetLegal (1);
+ return 1;
+ }
- // which faces are boundary faces ?
- Element2d face;
- int bface[4];
+ // element has at least 2 inner points ---> legal
+ int cnti = 0;
+ for (j = 0; j < 4; j++)
+ if (PointType(el[j]) == INNERPOINT)
+ cnti++;
+ if (cnti >= 2)
+ {
+ el.SetLegal (1);
+ return 1;
+ }
- for (i = 1; i <= 4; i++)
- {
- el.GetFace (i, face);
- INDEX_3 i3 (face.PNum(1), face.PNum(2), face.PNum(3));
- i3.Sort();
- bface[i-1] = surfelementht->Used (i3);
- }
+ // which faces are boundary faces ?
+ Element2d face;
+ int bface[4];
- int bedge[4][4];
- int segedge[4][4];
- for (i = 1; i <= 4; i++)
- for (j = 1; j < i; j++)
+ for (i = 1; i <= 4; i++)
{
- INDEX_2 i2(el.PNum(i), el.PNum(j));
- i2.Sort();
+ el.GetFace (i, face);
+ INDEX_3 i3 (face.PNum(1), face.PNum(2), face.PNum(3));
+ i3.Sort();
+ bface[i-1] = surfelementht->Used (i3);
+ }
+
+ int bedge[4][4];
+ int segedge[4][4];
+ for (i = 0; i < 4; i++)
+ for (j = 0; j < i; j++)
+ {
+ bool sege = 0, be = 0;
- int sege = 0, be = 0;
+ INDEX_2 i2(el[i], el[j]);
+ i2.Sort();
- if (boundaryedges -> Used(i2))
- {
- int val = boundaryedges -> Get(i2);
+ /*
+ if (boundaryedges -> Used(i2))
+ {
be = 1;
- if (val == 2)
- sege = 1;
- }
+ if (boundaryedges -> Get(i2) == 2)
+ sege = 1;
+ }
+ */
+ int pos = boundaryedges -> Position(i2);
+ if (pos)
+ {
+ be = 1;
+ if (boundaryedges -> GetData(pos) == 2)
+ sege = 1;
+ }
- segedge[j-1][i-1] =
- segedge[i-1][j-1] = sege;
+ segedge[j][i] = segedge[i][j] = sege;
+ bedge[j][i] = bedge[i][j] = be;
+ }
- bedge[j-1][i-1] =
- bedge[i-1][j-1] = be;
- }
+ // two boundary faces and no edge is illegal
+ for (i = 0; i < 3; i++)
+ for (j = i+1; j < 4; j++)
+ {
+ if (bface[i] && bface[j])
+ {
+ // common nodes:
+ int pi1 = 0, pi2;
+ while (pi1 == i || pi1 == j)
+ pi1++;
+ pi2 = 6 - i - j - pi1;
+ if (!segedge[pi1][pi2])
+ {
+ // 2 boundary faces withoud edge in between
+ el.SetLegal (0);
+ return 0;
+ }
+ }
+ }
- // two boundary faces and no edge is illegal
- for (i = 0; i < 3; i++)
- for (j = i+1; j < 4; j++)
+ // three boundary edges meeting in a Surface point
+ for (i = 0; i < 4; i++)
{
- if (bface[i] && bface[j])
+ bool alledges = 1;
+ if (PointType(el[i]) == SURFACEPOINT)
{
- // common nodes:
- int pi1 = 0, pi2;
- while (pi1 == i || pi1 == j)
- pi1++;
- pi2 = 6 - i - j - pi1;
- /*
- INDEX_2 i2(el.PNum(pi1+1), el.PNum(pi2+1));
- i2.Sort();
- if (!segmentht->Used (i2))
- */
- if (!segedge[pi1][pi2])
+ for (j = 0; j < 4; j++)
+ if (j != i)
+ {
+ if (!bedge[i][j])
+ {
+ alledges = 0;
+ break;
+ }
+ }
+ if (alledges)
{
- // 2 boundary faces withoud edge in between
- // cout << "p1, p2 = " << pi1 << "," << pi2 << endl;
- // cout << "tet illegal due to first case" << endl;
+ // cout << "tet illegal due to unmarked node" << endl;
el.SetLegal (0);
return 0;
}
@@ -2710,1456 +3116,1629 @@ bool Mesh :: LegalTet2 (Element & el) const
}
- // three boundary edges meeting in a Surface point
- for (i = 1; i <= 4; i++)
- {
- int alledges = 1;
- if (PointType(el.PNum(i)) == SURFACEPOINT)
+ /*
{
- for (j = 1; j <= 4; j++)
- if (j != i)
- {
- /*
- INDEX_2 i2(el.PNum(i), el.PNum(j));
- i2.Sort();
- if (!boundaryedges->Used(i2))
- */
- if (!bedge[i-1][j-1])
- {
- alledges = 0;
- break;
- }
- }
- if (alledges)
- {
- // cout << "tet illegal due to unmarked node" << endl;
- el.SetLegal (0);
- return 0;
- }
- }
- }
+ // having 3 boundary edges and 4 surface nodes ???
+ int nodehasedge[4];
+ int canbe = 1; // can be that illegal tet
-
- /*
- {
- // having 3 boundary edges and 4 surface nodes ???
- int nodehasedge[4];
- int canbe = 1; // can be that illegal tet
-
- for (i = 0; i < 4; i++)
- nodehasedge[i] = 0;
- for (i = 1; i <= 4; i++)
- {
+ for (i = 0; i < 4; i++)
+ nodehasedge[i] = 0;
+ for (i = 1; i <= 4; i++)
+ {
if (PointType(el.PNum(i)) != SURFACEPOINT)
- canbe = 0;
+ canbe = 0;
for (j = i+1; j <= 4; j++)
- {
- INDEX_2 i2(el.PNum(i), el.PNum(j));
- i2.Sort();
- if (boundaryedges->Used(i2))
- {
- nodehasedge[i-1] = 1;
- nodehasedge[j-1] = 1;
- }
+ {
+ INDEX_2 i2(el.PNum(i), el.PNum(j));
+ i2.Sort();
+ if (boundaryedges->Used(i2))
+ {
+ nodehasedge[i-1] = 1;
+ nodehasedge[j-1] = 1;
+ }
- }
- }
- for (i = 0; i < 4; i++)
- if (!nodehasedge[i])
+ }
+ }
+ for (i = 0; i < 4; i++)
+ if (!nodehasedge[i])
canbe = 0;
- if (canbe) return 0;
+ if (canbe) return 0;
- }
- */
+ }
+ */
- {
- // two connected edges on surface, but no face
+ {
+ // two connected edges on surface, but no face
- int ltestmode = 0; // (el.PNum(1) == 10516);
+ int ltestmode = 0; // (el.PNum(1) == 10516);
- if (ltestmode)
- {
- (*testout) << "pnums: " << endl;
- for (i = 1; i <= 4; i++)
- (*testout) << el.PNum(i) << " ";
- (*testout) << endl;
- }
+ if (ltestmode)
+ {
+ (*testout) << "pnums: " << endl;
+ for (i = 1; i <= 4; i++)
+ (*testout) << el.PNum(i) << " ";
+ (*testout) << endl;
+ }
- for (i = 1; i <= 4; i++)
- if (PointType(el.PNum(i)) == SURFACEPOINT)
- for (j = 1; j <= 4; j++)
- if (j != i)
- for (k = j+1; k <= 4; k++)
- if (k != i)
- {
- int fnr = 10 - i - j - k;
+ for (i = 1; i <= 4; i++)
+ if (PointType(el.PNum(i)) == SURFACEPOINT)
+ for (j = 1; j <= 4; j++)
+ if (j != i)
+ for (k = j+1; k <= 4; k++)
+ if (k != i)
+ {
+ int fnr = 10 - i - j - k;
- if (!bface[fnr-1] &&
- bedge[i-1][j-1] &&
- bedge[i-1][k-1])
- {
- el.SetLegal (0);
- return 0;
- }
- /*
- INDEX_2 e1(el.PNum(i), el.PNum(j));
- e1.Sort();
- INDEX_2 e2(el.PNum(i), el.PNum(k));
- e2.Sort();
- INDEX_3 face(el.PNum(i), el.PNum(j), el.PNum(k));
- face.Sort();
+ if (!bface[fnr-1] &&
+ bedge[i-1][j-1] &&
+ bedge[i-1][k-1])
+ {
+ el.SetLegal (0);
+ return 0;
+ }
+ /*
+ INDEX_2 e1(el.PNum(i), el.PNum(j));
+ e1.Sort();
+ INDEX_2 e2(el.PNum(i), el.PNum(k));
+ e2.Sort();
+ INDEX_3 face(el.PNum(i), el.PNum(j), el.PNum(k));
+ face.Sort();
- if (ltestmode)
- {
+ if (ltestmode)
+ {
(*testout) << "i, j, k = " << i << ", " << j << ", " << k << endl;
(*testout) << "eij = " << boundaryedges->Used(e1)
- << " eik = " << boundaryedges->Used(e2)
- << " face = " << surfelementht->Used (face) << endl;
+ << " eik = " << boundaryedges->Used(e2)
+ << " face = " << surfelementht->Used (face) << endl;
- }
+ }
- if (boundaryedges->Used(e1) &&
+ if (boundaryedges->Used(e1) &&
boundaryedges->Used(e2) &&
!surfelementht->Used (face))
- {
+ {
// cout << "tet illegal due to last case" << endl;
el.SetLegal (0);
return 0;
- }
- */
- }
+ }
+ */
+ }
- }
+ }
- {
- // connected surface edge and edge edge, but no face
+ {
+ // connected surface edge and edge edge, but no face
- for (i = 1; i <= 4; i++)
- if (PointType(el.PNum(i)) == EDGEPOINT)
- for (j = 1; j <= 4; j++)
- if (j != i)
- for (k = j+1; k <= 4; k++)
- if (k != i)
- {
- int fnr = 10 - i - j - k;
+ for (i = 1; i <= 4; i++)
+ if (PointType(el.PNum(i)) == EDGEPOINT)
+ for (j = 1; j <= 4; j++)
+ if (j != i)
+ for (k = j+1; k <= 4; k++)
+ if (k != i)
+ {
+ int fnr = 10 - i - j - k;
- if (!bface[fnr-1] &&
- (bedge[i-1][j-1] && segedge[i-1][k-1] ||
- segedge[i-1][j-1] && bedge[i-1][k-1]))
- {
- el.SetLegal (0);
- return 0;
- }
- }
+ if (!bface[fnr-1] &&
+ (bedge[i-1][j-1] && segedge[i-1][k-1] ||
+ segedge[i-1][j-1] && bedge[i-1][k-1]))
+ {
+ el.SetLegal (0);
+ return 0;
+ }
+ }
- }
+ }
- el.SetLegal (1);
- return 1;
+ el.SetLegal (1);
+ return 1;
- /*
- int i1, i2, i3, i4, j;
- if (PointType(el.PNum(1)) != INNERPOINT &&
+ /*
+ int i1, i2, i3, i4, j;
+ if (PointType(el.PNum(1)) != INNERPOINT &&
PointType(el.PNum(2)) != INNERPOINT &&
PointType(el.PNum(3)) != INNERPOINT &&
PointType(el.PNum(4)) != INNERPOINT)
- {
+ {
for (i1 = 1; i1 <= surfacesonnode.EntrySize(el.PNum(1)); i1++)
- for (i2 = 1; i2 <= surfacesonnode.EntrySize(el.PNum(2)); i2++)
- if (surfacesonnode.Get(el.PNum(1), i1) ==
- surfacesonnode.Get(el.PNum(2), i2))
- for (i3 = 1; i3 <= surfacesonnode.EntrySize(el.PNum(3)); i3++)
- if (surfacesonnode.Get(el.PNum(1), i1) ==
- surfacesonnode.Get(el.PNum(3), i3))
- for (i4 = 1; i4 <= surfacesonnode.EntrySize(el.PNum(4)); i4++)
- if (surfacesonnode.Get(el.PNum(1), i1) ==
- surfacesonnode.Get(el.PNum(4), i4))
- {
- int j, numbe = 0;
- INDEX_2 i2;
+ for (i2 = 1; i2 <= surfacesonnode.EntrySize(el.PNum(2)); i2++)
+ if (surfacesonnode.Get(el.PNum(1), i1) ==
+ surfacesonnode.Get(el.PNum(2), i2))
+ for (i3 = 1; i3 <= surfacesonnode.EntrySize(el.PNum(3)); i3++)
+ if (surfacesonnode.Get(el.PNum(1), i1) ==
+ surfacesonnode.Get(el.PNum(3), i3))
+ for (i4 = 1; i4 <= surfacesonnode.EntrySize(el.PNum(4)); i4++)
+ if (surfacesonnode.Get(el.PNum(1), i1) ==
+ surfacesonnode.Get(el.PNum(4), i4))
+ {
+ int j, numbe = 0;
+ INDEX_2 i2;
- for (j = 1; j <= 6; j++)
- {
- switch (j)
- {
- case 1:
- i2.I1() = el.PNum(1);
- i2.I2() = el.PNum(2); break;
- case 2:
- i2.I1() = el.PNum(1);
- i2.I2() = el.PNum(3); break;
- case 3:
- i2.I1() = el.PNum(1);
- i2.I2() = el.PNum(4); break;
- case 4:
- i2.I1() = el.PNum(2);
- i2.I2() = el.PNum(3); break;
- case 5:
- i2.I1() = el.PNum(2);
- i2.I2() = el.PNum(4); break;
- case 6:
- i2.I1() = el.PNum(3);
- i2.I2() = el.PNum(4); break;
- }
+ for (j = 1; j <= 6; j++)
+ {
+ switch (j)
+ {
+ case 1:
+ i2.I1() = el.PNum(1);
+ i2.I2() = el.PNum(2); break;
+ case 2:
+ i2.I1() = el.PNum(1);
+ i2.I2() = el.PNum(3); break;
+ case 3:
+ i2.I1() = el.PNum(1);
+ i2.I2() = el.PNum(4); break;
+ case 4:
+ i2.I1() = el.PNum(2);
+ i2.I2() = el.PNum(3); break;
+ case 5:
+ i2.I1() = el.PNum(2);
+ i2.I2() = el.PNum(4); break;
+ case 6:
+ i2.I1() = el.PNum(3);
+ i2.I2() = el.PNum(4); break;
+ }
- i2.Sort();
- if (boundaryedges->Used (i2)) numbe++;
- }
+ i2.Sort();
+ if (boundaryedges->Used (i2)) numbe++;
+ }
- if (numbe >= 4)
- {
-// (*testout)
-// << "Tet illegal: "
-// << "mat = " << el.GetIndex() << " "
-// << "surf = " << surfacesonnode.Get(el.PNum(1), i1)
-// << " "
-// << el.PNum(1) << " "
-// << el.PNum(2) << " "
-// << el.PNum(3) << " "
-// << el.PNum(4) << endl;
-
- return 0;
- }
- }
- }
- return 1;
-*/
-}
+ if (numbe >= 4)
+ {
+ // (*testout)
+ // << "Tet illegal: "
+ // << "mat = " << el.GetIndex() << " "
+ // << "surf = " << surfacesonnode.Get(el.PNum(1), i1)
+ // << " "
+ // << el.PNum(1) << " "
+ // << el.PNum(2) << " "
+ // << el.PNum(3) << " "
+ // << el.PNum(4) << endl;
+ return 0;
+ }
+ }
+ }
+ return 1;
+ */
+ }
-int Mesh :: GetNDomains() const
-{
- int ndom = 0;
- for (int k = 0; k < facedecoding.Size(); k++)
- {
- if (facedecoding[k].DomainIn() > ndom)
- ndom = facedecoding[k].DomainIn();
- if (facedecoding[k].DomainOut() > ndom)
- ndom = facedecoding[k].DomainOut();
- }
+ int Mesh :: GetNDomains() const
+ {
+ int ndom = 0;
- return ndom;
-}
+ for (int k = 0; k < facedecoding.Size(); k++)
+ {
+ if (facedecoding[k].DomainIn() > ndom)
+ ndom = facedecoding[k].DomainIn();
+ if (facedecoding[k].DomainOut() > ndom)
+ ndom = facedecoding[k].DomainOut();
+ }
+ return ndom;
+ }
-void Mesh :: SurfaceMeshOrientation ()
-{
- int i, j;
- int nse = GetNSE();
+
+ void Mesh :: SurfaceMeshOrientation ()
+ {
+ int i, j;
+ int nse = GetNSE();
- BitArray used(nse);
- used.Clear();
- INDEX_2_HASHTABLE<int> edges(nse+1);
+ BitArray used(nse);
+ used.Clear();
+ INDEX_2_HASHTABLE<int> edges(nse+1);
- bool haschanged = 0;
+ bool haschanged = 0;
- const Element2d & tri = SurfaceElement(1);
- for (j = 1; j <= 3; j++)
- {
- INDEX_2 i2(tri.PNumMod(j), tri.PNumMod(j+1));
- edges.Set (i2, 1);
- }
- used.Set(1);
+ const Element2d & tri = SurfaceElement(1);
+ for (j = 1; j <= 3; j++)
+ {
+ INDEX_2 i2(tri.PNumMod(j), tri.PNumMod(j+1));
+ edges.Set (i2, 1);
+ }
+ used.Set(1);
- bool unused;
- do
- {
- bool changed;
- do
- {
- changed = 0;
- for (i = 1; i <= nse; i++)
- if (!used.Test(i))
- {
- Element2d & el = surfelements.Elem(i);
- int found = 0, foundrev = 0;
- for (j = 1; j <= 3; j++)
- {
- INDEX_2 i2(el.PNumMod(j), el.PNumMod(j+1));
- if (edges.Used(i2))
- foundrev = 1;
- Swap (i2.I1(), i2.I2());
- if (edges.Used(i2))
- found = 1;
- }
+ bool unused;
+ do
+ {
+ bool changed;
+ do
+ {
+ changed = 0;
+ for (i = 1; i <= nse; i++)
+ if (!used.Test(i))
+ {
+ Element2d & el = surfelements.Elem(i);
+ int found = 0, foundrev = 0;
+ for (j = 1; j <= 3; j++)
+ {
+ INDEX_2 i2(el.PNumMod(j), el.PNumMod(j+1));
+ if (edges.Used(i2))
+ foundrev = 1;
+ swap (i2.I1(), i2.I2());
+ if (edges.Used(i2))
+ found = 1;
+ }
- if (found || foundrev)
- {
- if (foundrev)
- Swap (el.PNum(2), el.PNum(3));
+ if (found || foundrev)
+ {
+ if (foundrev)
+ swap (el.PNum(2), el.PNum(3));
- changed = 1;
- for (j = 1; j <= 3; j++)
- {
- INDEX_2 i2(el.PNumMod(j), el.PNumMod(j+1));
- edges.Set (i2, 1);
- }
- used.Set (i);
- }
- }
- if (changed)
- haschanged = 1;
- }
- while (changed);
+ changed = 1;
+ for (j = 1; j <= 3; j++)
+ {
+ INDEX_2 i2(el.PNumMod(j), el.PNumMod(j+1));
+ edges.Set (i2, 1);
+ }
+ used.Set (i);
+ }
+ }
+ if (changed)
+ haschanged = 1;
+ }
+ while (changed);
- unused = 0;
- for (i = 1; i <= nse; i++)
- if (!used.Test(i))
- {
- unused = 1;
- const Element2d & tri = SurfaceElement(i);
- for (j = 1; j <= 3; j++)
- {
- INDEX_2 i2(tri.PNumMod(j), tri.PNumMod(j+1));
- edges.Set (i2, 1);
- }
- used.Set(i);
- break;
- }
- }
- while (unused);
+ unused = 0;
+ for (i = 1; i <= nse; i++)
+ if (!used.Test(i))
+ {
+ unused = 1;
+ const Element2d & tri = SurfaceElement(i);
+ for (j = 1; j <= 3; j++)
+ {
+ INDEX_2 i2(tri.PNumMod(j), tri.PNumMod(j+1));
+ edges.Set (i2, 1);
+ }
+ used.Set(i);
+ break;
+ }
+ }
+ while (unused);
- if (haschanged)
- timestamp = NextTimeStamp();
-}
+ if (haschanged)
+ timestamp = NextTimeStamp();
+ }
-void Mesh :: Split2Tets()
-{
- int oldne, oldnse;
- int i, j, k, l;
+ void Mesh :: Split2Tets()
+ {
+ // int oldne, oldnse;
+ // int i, j, k, l;
- oldne = GetNE();
- for (i = 1; i <= oldne; i++)
- {
- Element el = VolumeElement(i);
- if (el.GetType() == PRISM)
- {
- // (*testout) << "split el: " << el << " to ";
+ bool has_prisms = 0;
- // prism, to 3 tets
-
- // make minimal node to node 1
- int minpi=0;
- PointIndex minpnum;
- minpnum = GetNP() + 1;
+ int oldne = GetNE();
+ for (int i = 1; i <= oldne; i++)
+ {
+ Element el = VolumeElement(i);
- for (j = 1; j <= 6; j++)
- {
- if (el.PNum(j) < minpnum)
- {
- minpnum = el.PNum(j);
- minpi = j;
- }
- }
+ if (el.GetType() == PRISM)
+ {
+ // prism, to 3 tets
- if (minpi >= 4)
- {
- for (j = 1; j <= 3; j++)
- Swap (el.PNum(j), el.PNum(j+3));
- minpi -= 3;
- }
+ // make minimal node to node 1
+ int minpi=0;
+ PointIndex minpnum;
+ minpnum = GetNP() + 1;
- while (minpi > 1)
- {
- int hi = 0;
- for (j = 0; j <= 3; j+= 3)
- {
- hi = el.PNum(1+j);
- el.PNum(1+j) = el.PNum(2+j);
- el.PNum(2+j) = el.PNum(3+j);
- el.PNum(3+j) = hi;
- }
- minpi--;
- }
+ for (int j = 1; j <= 6; j++)
+ {
+ if (el.PNum(j) < minpnum)
+ {
+ minpnum = el.PNum(j);
+ minpi = j;
+ }
+ }
+
+ if (minpi >= 4)
+ {
+ for (int j = 1; j <= 3; j++)
+ swap (el.PNum(j), el.PNum(j+3));
+ minpi -= 3;
+ }
- /*
- version 1: edge from pi2 to pi6,
- version 2: edge from pi3 to pi5,
- */
+ while (minpi > 1)
+ {
+ int hi = 0;
+ for (int j = 0; j <= 3; j+= 3)
+ {
+ hi = el.PNum(1+j);
+ el.PNum(1+j) = el.PNum(2+j);
+ el.PNum(2+j) = el.PNum(3+j);
+ el.PNum(3+j) = hi;
+ }
+ minpi--;
+ }
- (*testout) << " rot el = " << el << " ";
+ /*
+ version 1: edge from pi2 to pi6,
+ version 2: edge from pi3 to pi5,
+ */
- static const int ntets[2][12] =
- { { 1, 4, 5, 6, 1, 2, 3, 6, 1, 2, 5, 6 },
- { 1, 4, 5, 6, 1, 2, 3, 5, 3, 1, 5, 6 } };
+ static const int ntets[2][12] =
+ { { 1, 4, 5, 6, 1, 2, 3, 6, 1, 2, 5, 6 },
+ { 1, 4, 5, 6, 1, 2, 3, 5, 3, 1, 5, 6 } };
- const int * min2pi;
+ const int * min2pi;
- if (min2 (el.PNum(2), el.PNum(6)) <
- min2 (el.PNum(3), el.PNum(5)))
- {
- min2pi = &ntets[0][0];
- (*testout) << "version 1 ";
- }
- else
- {
- min2pi = &ntets[1][0];
- (*testout) << "version 2 ";
- }
+ if (min2 (el.PNum(2), el.PNum(6)) <
+ min2 (el.PNum(3), el.PNum(5)))
+ {
+ min2pi = &ntets[0][0];
+ // (*testout) << "version 1 ";
+ }
+ else
+ {
+ min2pi = &ntets[1][0];
+ // (*testout) << "version 2 ";
+ }
- int firsttet = 1;
- for (j = 1; j <= 3; j++)
- {
- Element nel(4);
- for (k = 1; k <= 4; k++)
- nel.PNum(k) = el.PNum(min2pi[4 * j + k - 5]);
- nel.SetIndex (el.GetIndex());
+ int firsttet = 1;
+ for (int j = 1; j <= 3; j++)
+ {
+ Element nel(4);
+ for (int k = 1; k <= 4; k++)
+ nel.PNum(k) = el.PNum(min2pi[4 * j + k - 5]);
+ nel.SetIndex (el.GetIndex());
+
+ int legal = 1;
+ for (int k = 1; k <= 3; k++)
+ for (int l = k+1; l <= 4; l++)
+ if (nel.PNum(k) == nel.PNum(l))
+ legal = 0;
+
+ // (*testout) << nel << " ";
+ if (legal)
+ {
+ if (firsttet)
+ {
+ VolumeElement(i) = nel;
+ firsttet = 0;
+ }
+ else
+ {
+ AddVolumeElement(nel);
+ }
+ }
+ }
+ if (firsttet) (*testout) << "no legal";
+ (*testout) << endl;
+ }
+
- int legal = 1;
- for (k = 1; k <= 3; k++)
- for (l = k+1; l <= 4; l++)
- if (nel.PNum(k) == nel.PNum(l))
- legal = 0;
- (*testout) << nel << " ";
+ else if (el.GetType() == HEX)
+ {
+ // hex to A) 2 prisms or B) to 5 tets
- if (legal)
- {
- if (firsttet)
- {
+ // make minimal node to node 1
+ int minpi=0;
+ PointIndex minpnum;
+ minpnum = GetNP() + 1;
+
+ for (int j = 1; j <= 8; j++)
+ {
+ if (el.PNum(j) < minpnum)
+ {
+ minpnum = el.PNum(j);
+ minpi = j;
+ }
+ }
+
+ if (minpi >= 5)
+ {
+ for (int j = 1; j <= 4; j++)
+ swap (el.PNum(j), el.PNum(j+4));
+ minpi -= 4;
+ }
+
+ while (minpi > 1)
+ {
+ int hi = 0;
+ for (int j = 0; j <= 4; j+= 4)
+ {
+ hi = el.PNum(1+j);
+ el.PNum(1+j) = el.PNum(2+j);
+ el.PNum(2+j) = el.PNum(3+j);
+ el.PNum(3+j) = el.PNum(4+j);
+ el.PNum(4+j) = hi;
+ }
+ minpi--;
+ }
+
+
+
+ static const int to_prisms[3][12] =
+ { { 0, 1, 2, 4, 5, 6, 0, 2, 3, 4, 6, 7 },
+ { 0, 1, 5, 3, 2, 6, 0, 5, 4, 3, 5, 7 },
+ { 0, 7, 4, 1, 6, 5, 0, 3, 7, 1, 2, 6 },
+ };
+
+ const int * min2pi = 0;
+ if (min2 (el[4], el[6]) < min2 (el[5], el[7]))
+ min2pi = &to_prisms[0][0];
+ else if (min2 (el[3], el[6]) < min2 (el[2], el[7]))
+ min2pi = &to_prisms[1][0];
+ else if (min2 (el[1], el[6]) < min2 (el[2], el[5]))
+ min2pi = &to_prisms[2][0];
+
+ if (min2pi)
+ {
+ has_prisms = 1;
+ for (int j = 0; j < 2; j++)
+ {
+ Element nel(PRISM);
+ for (int k = 0; k < 6; k++)
+ nel[k] = el[min2pi[6*j + k]];
+ nel.SetIndex (el.GetIndex());
+
+ if (j == 0)
VolumeElement(i) = nel;
- firsttet = 0;
- }
- else
- {
+ else
AddVolumeElement(nel);
- }
- }
- }
- if (firsttet) (*testout) << "no legal";
- (*testout) << endl;
- }
-
+ }
+ }
+ else
+ {
+ // split to 5 tets
+
+ static const int to_tets[20] =
+ {
+ 1, 2, 0, 5,
+ 3, 0, 2, 7,
+ 4, 5, 7, 0,
+ 6, 7, 5, 2,
+ 0, 2, 7, 5
+ };
+
+ for (int j = 0; j < 5; j++)
+ {
+ Element nel(TET);
+ for (int k = 0; k < 4; k++)
+ nel[k] = el[to_tets[4*j + k]];
+ nel.SetIndex (el.GetIndex());
+
+ if (j == 0)
+ VolumeElement(i) = nel;
+ else
+ AddVolumeElement(nel);
+ }
+
+ }
+ }
- if (el.GetType() == PYRAMID)
- {
- // pyramid, to 2 tets
-
- static const int ntets[2][8] =
- { { 1, 2, 3, 5, 1, 3, 4, 5 },
- { 1, 2, 4, 5, 4, 2, 3, 5 }};
- const int * min2pi;
-
- if (min2 (el.PNum(1), el.PNum(3)) <
- min2 (el.PNum(2), el.PNum(4)))
- min2pi = &ntets[0][0];
- else
- min2pi = &ntets[1][0];
+
+ else if (el.GetType() == PYRAMID)
+ {
+ // pyramid, to 2 tets
+
+ static const int ntets[2][8] =
+ { { 1, 2, 3, 5, 1, 3, 4, 5 },
+ { 1, 2, 4, 5, 4, 2, 3, 5 }};
+ const int * min2pi;
- int firsttet = 1;
- for (j = 1; j <= 2; j++)
- {
- Element nel(4);
- for (k = 1; k <= 4; k++)
- nel.PNum(k) = el.PNum(min2pi[4 * j + k - 5]);
- nel.SetIndex (el.GetIndex());
+ if (min2 (el.PNum(1), el.PNum(3)) <
+ min2 (el.PNum(2), el.PNum(4)))
+ min2pi = &ntets[0][0];
+ else
+ min2pi = &ntets[1][0];
- int legal = 1;
- for (k = 1; k <= 3; k++)
- for (l = k+1; l <= 4; l++)
- if (nel.PNum(k) == nel.PNum(l))
- legal = 0;
+ int firsttet = 1;
+ for (int j = 1; j <= 2; j++)
+ {
+ Element nel(4);
+ for (int k = 1; k <= 4; k++)
+ nel.PNum(k) = el.PNum(min2pi[4 * j + k - 5]);
+ nel.SetIndex (el.GetIndex());
- if (legal)
- {
- (*testout) << nel << " ";
- if (firsttet)
- {
- VolumeElement(i) = nel;
- firsttet = 0;
- }
- else
- {
- AddVolumeElement(nel);
- }
- }
- }
- (*testout) << endl;
+ int legal = 1;
+ for (int k = 1; k <= 3; k++)
+ for (int l = k+1; l <= 4; l++)
+ if (nel.PNum(k) == nel.PNum(l))
+ legal = 0;
-
-
- }
- }
+ if (legal)
+ {
+ (*testout) << nel << " ";
+ if (firsttet)
+ {
+ VolumeElement(i) = nel;
+ firsttet = 0;
+ }
+ else
+ {
+ AddVolumeElement(nel);
+ }
+ }
+ }
+ (*testout) << endl;
+ }
+ }
- oldnse = GetNSE();
- for (i = 1; i <= oldnse; i++)
- {
- Element2d el = SurfaceElement(i);
- if (el.GetNP() == 4)
- {
- (*testout) << "split el: " << el << " to ";
+ int oldnse = GetNSE();
+ for (int i = 1; i <= oldnse; i++)
+ {
+ Element2d el = SurfaceElement(i);
+ if (el.GetNP() == 4)
+ {
+ (*testout) << "split el: " << el << " to ";
- static const int ntris[2][6] =
- { { 1, 2, 3, 1, 3, 4 },
- { 1, 2, 4, 4, 2, 3 }};
+ static const int ntris[2][6] =
+ { { 1, 2, 3, 1, 3, 4 },
+ { 1, 2, 4, 4, 2, 3 }};
- const int * min2pi;
+ const int * min2pi;
- if (min2 (el.PNum(1), el.PNum(3)) <
- min2 (el.PNum(2), el.PNum(4)))
- min2pi = &ntris[0][0];
- else
- min2pi = &ntris[1][0];
+ if (min2 (el.PNum(1), el.PNum(3)) <
+ min2 (el.PNum(2), el.PNum(4)))
+ min2pi = &ntris[0][0];
+ else
+ min2pi = &ntris[1][0];
- for (j = 0; j <6; j++)
- (*testout) << min2pi[j] << " ";
+ for (int j = 0; j <6; j++)
+ (*testout) << min2pi[j] << " ";
- int firsttri = 1;
- for (j = 1; j <= 2; j++)
- {
- Element2d nel(3);
- for (k = 1; k <= 3; k++)
- nel.PNum(k) = el.PNum(min2pi[3 * j + k - 4]);
- nel.SetIndex (el.GetIndex());
-
- int legal = 1;
- for (k = 1; k <= 2; k++)
- for (l = k+1; l <= 3; l++)
- if (nel.PNum(k) == nel.PNum(l))
- legal = 0;
-
- if (legal)
- {
- (*testout) << nel << " ";
- if (firsttri)
- {
- SurfaceElement(i) = nel;
- firsttri = 0;
- }
- else
- {
- AddSurfaceElement(nel);
- }
- }
- }
- (*testout) << endl;
+ int firsttri = 1;
+ for (int j = 1; j <= 2; j++)
+ {
+ Element2d nel(3);
+ for (int k = 1; k <= 3; k++)
+ nel.PNum(k) = el.PNum(min2pi[3 * j + k - 4]);
+ nel.SetIndex (el.GetIndex());
+
+ int legal = 1;
+ for (int k = 1; k <= 2; k++)
+ for (int l = k+1; l <= 3; l++)
+ if (nel.PNum(k) == nel.PNum(l))
+ legal = 0;
+
+ if (legal)
+ {
+ (*testout) << nel << " ";
+ if (firsttri)
+ {
+ SurfaceElement(i) = nel;
+ firsttri = 0;
+ }
+ else
+ {
+ AddSurfaceElement(nel);
+ }
+ }
+ }
+ (*testout) << endl;
- }
- }
+ }
+ }
- for (i = 1; i <= GetNE(); i++)
- {
- Element & el = VolumeElement(i);
- const Point3d & p1 = Point (el.PNum(1));
- const Point3d & p2 = Point (el.PNum(2));
- const Point3d & p3 = Point (el.PNum(3));
- const Point3d & p4 = Point (el.PNum(4));
-
- double vol = (Vec3d (p1, p2) *
- Cross (Vec3d (p1, p3), Vec3d(p1, p4)));
- if (vol > 0)
- Swap (el.PNum(3), el.PNum(4));
- }
- timestamp = NextTimeStamp();
-}
+ if (has_prisms)
-void Mesh :: BuildElementSearchTree ()
-{
- if (elementsearchtreets == GetTimeStamp())
- return;
+ Split2Tets();
+
+ else
+ {
+ for (int i = 1; i <= GetNE(); i++)
+ {
+ Element & el = VolumeElement(i);
+ const Point3d & p1 = Point (el.PNum(1));
+ const Point3d & p2 = Point (el.PNum(2));
+ const Point3d & p3 = Point (el.PNum(3));
+ const Point3d & p4 = Point (el.PNum(4));
+
+ double vol = (Vec3d (p1, p2) *
+ Cross (Vec3d (p1, p3), Vec3d(p1, p4)));
+ if (vol > 0)
+ swap (el.PNum(3), el.PNum(4));
+ }
- NgLock lock(mutex);
- lock.Lock();
+ timestamp = NextTimeStamp();
+ }
+ }
- PrintMessage (4, "Rebuild element searchtree");
+ void Mesh :: BuildElementSearchTree ()
+ {
+ if (elementsearchtreets == GetTimeStamp())
+ return;
- if (elementsearchtree)
- delete elementsearchtree;
- elementsearchtree = NULL;
+ NgLock lock(mutex);
+ lock.Lock();
- Box3d box;
- int i, j;
- int ne = GetNE();
- if (!ne)
- {
- lock.UnLock();
- return;
- }
+ PrintMessage (4, "Rebuild element searchtree");
- box.SetPoint (Point (VolumeElement(1).PNum(1)));
- for (i = 1; i <= ne; i++)
- {
- const Element & el = VolumeElement(i);
- for (j = 1; j <= el.GetNP(); j++)
- box.AddPoint (Point (el.PNum(j)));
- }
+ if (elementsearchtree)
+ delete elementsearchtree;
+ elementsearchtree = NULL;
+
+ Box3d box;
+ int i, j;
+ int ne = GetNE();
+ if (!ne)
+ {
+ lock.UnLock();
+ return;
+ }
+
+ box.SetPoint (Point (VolumeElement(1).PNum(1)));
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = VolumeElement(i);
+ for (j = 1; j <= el.GetNP(); j++)
+ box.AddPoint (Point (el.PNum(j)));
+ }
- box.Increase (1.01 * box.CalcDiam());
- elementsearchtree = new Box3dTree (box.PMin(), box.PMax());
+ box.Increase (1.01 * box.CalcDiam());
+ elementsearchtree = new Box3dTree (box.PMin(), box.PMax());
- for (i = 1; i <= ne; i++)
- {
- const Element & el = VolumeElement(i);
- box.SetPoint (Point (el.PNum(1)));
- for (j = 1; j <= el.GetNP(); j++)
- box.AddPoint (Point (el.PNum(j)));
+ for (i = 1; i <= ne; i++)
+ {
+ const Element & el = VolumeElement(i);
+ box.SetPoint (Point (el.PNum(1)));
+ for (j = 1; j <= el.GetNP(); j++)
+ box.AddPoint (Point (el.PNum(j)));
- elementsearchtree -> Insert (box.PMin(), box.PMax(), i);
- }
+ elementsearchtree -> Insert (box.PMin(), box.PMax(), i);
+ }
- elementsearchtreets = GetTimeStamp();
+ elementsearchtreets = GetTimeStamp();
- lock.UnLock();
-}
+ lock.UnLock();
+ }
-int Mesh :: GetElementOfPoint (const Point3d & p,
- double lami[3]) const
-{
- if (dimension == 2)
- {
- int i, j;
- Vec3d col1, col2, col3;
- Vec3d rhs, sol;
- double eps = 1e-6;
- int ne;
-
- ARRAY<int> locels;
- if (0)
- {
- elementsearchtree->GetIntersecting (p, p, locels);
- ne = locels.Size();
- }
- else
- ne = GetNSE();
+ int Mesh :: GetElementOfPoint (const Point3d & p,
+ double lami[3],
+ bool build_searchtree,
+ const int index) const
+ {
+ if (dimension == 2)
+ {
+ int i, j;
+ Vec3d col1, col2, col3;
+ Vec3d rhs, sol;
+ double eps = 1e-6;
+ int ne;
- ARRAY<Element2d> loctrigs;
- Vec3d nv(0, 0, 1);
+ ARRAY<int> locels;
+ if (0)
+ {
+ elementsearchtree->GetIntersecting (p, p, locels);
+ ne = locels.Size();
+ }
+ else
+ ne = GetNSE();
+ ARRAY<Element2d> loctrigs;
+ Vec3d nv(0, 0, 1);
+ for (i = 1; i <= ne; i++)
+ {
+ int ii;
+ if (0)
+ ii = locels.Get(i);
+ else
+ ii = i;
- for (i = 1; i <= ne; i++)
- {
- int ii;
- if (0)
- ii = locels.Get(i);
- else
- ii = i;
-
- // SurfaceElement(ii).GetTets (loctets);
- loctrigs.SetSize(1);
- loctrigs.Elem(1) = SurfaceElement(ii);
+ if((index >= 0) && (index != SurfaceElement(ii).GetIndex())) continue;
- for (j = 1; j <= loctrigs.Size(); j++)
- {
- const Element2d & el = loctrigs.Get(j);
+ //SZ
+ if(SurfaceElement(ii).GetType()==QUAD)
+ {
+
+ const Element2d & el = SurfaceElement(ii);
+
+ const Point3d & p1 = Point(el.PNum(1));
+ const Point3d & p2 = Point(el.PNum(2));
+ const Point3d & p3 = Point(el.PNum(3));
+ const Point3d & p4 = Point(el.PNum(4));
- const Point3d & p1 = Point(el.PNum(1));
- const Point3d & p2 = Point(el.PNum(2));
- const Point3d & p3 = Point(el.PNum(3));
+ // Coefficients of Bilinear Mapping from Ref-Elem to global Elem
+ // X = a + b x + c y + d x y
+ Vec3d a = p1;
+ Vec3d b = p2 - a;
+ Vec3d c = p4 - a;
+ Vec3d d = p3 - a - b - c;
- /*
- Box3d box;
- box.SetPoint (p1);
- box.AddPoint (p2);
- box.AddPoint (p3);
- box.AddPoint (p4);
- if (!box.IsIn (p))
- continue;
- */
- col1 = p2-p1;
- col2 = p3-p1;
- col3 = nv;
- rhs = p - p1;
+ double dxb = d.X()*b.Y()-d.Y()*b.X();
+ double dxc = d.X()*c.Y()-d.Y()*c.X();
+ double dxa = d.X()*a.Y()-d.Y()*a.X();
+ double dxp = d.X()*p.Y()-d.Y()*p.X();
+
+ double c0,c1,c2,rt;
+ lami[2]=0.;
+ double eps = 1.E-12;
+
+ if(fabs(d.X()) <= eps && fabs(d.Y())<= eps)
+ {
+ //Solve Linear System
+ lami[0]=(c.Y()*(p.X()-a.X())-b.Y()*(p.Y()-a.Y()))/
+ (b.X()*c.Y() -b.Y()*c.X());
+ lami[1]=(-c.X()*(p.X()-a.X())+b.X()*(p.Y()-a.Y()))/
+ (b.X()*c.Y() -b.Y()*c.X());
+ }
+ else
+ if(fabs(dxb) <= eps)
+ {
+ lami[1] = (dxp-dxa)/dxc;
+ if(fabs(b.X()-d.X()*lami[1])>=eps)
+ lami[0] = (p.X()-a.X() - c.X()*lami[1])/(b.X()+d.X()*lami[1]);
+ else
+ lami[0] = (p.Y()-a.Y() - c.Y()*lami[1])/(b.Y()+d.Y()*lami[1]);
+ }
+ else
+ if(fabs(dxc) <= eps)
+ {
+ lami[0] = (dxp-dxa)/dxb;
+ if(fabs(c.X()-d.X()*lami[0])>=eps)
+ lami[1] = (p.X()-a.X() - b.X()*lami[0])/(c.X()+d.X()*lami[0]);
+ else
+ lami[1] = (p.Y()-a.Y() - b.Y()*lami[0])/(c.Y()+d.Y()*lami[0]);
+ }
+ else //Solve quadratic equation
+ {
+ if(fabs(d.X()) >= eps)
+ {
+ c2 = d.X()*dxc;
+ c1 = d.X()*dxc - c.X()*dxb - d.X()*(dxp-dxa);
+ c0 = -b.X()*(dxp -dxa) - (a.X()-p.X())*dxb;
+ }
+ else
+ {
+ c2 = d.Y()*dxc;
+ c1 = d.Y()*dxc - c.Y()*dxb - d.Y()*(dxp-dxa);
+ c0 = -b.Y()*(dxp -dxa) - (a.Y()-p.Y())*dxb;
+ }
+
+ double rt = c1*c1 - 4*c2*c0;
+ if (rt < 0.) continue;
+ lami[1] = (-c1 + sqrt(rt))/2/c2;
+ if(lami[1]<=1. && lami[1]>=0.)
+ {
+ lami[0] = (dxp - dxa -dxc*lami[1])/dxb;
+ if(lami[0]<=1. && lami[0]>=0.)
+ return(ii);
+ }
+
+ lami[1] = (-c1 - sqrt(rt))/2/c2;
+ lami[0] = (dxp - dxa -dxc*lami[1])/dxb;
+ }
- SolveLinearSystem (col1, col2, col3, rhs, sol);
+ if( lami[0] <= 1.+eps && lami[0] >= -eps && lami[1]<=1.+eps && lami[1]>=-eps)
+ return(ii);
+
+ continue;
- if (sol.X() >= -eps && sol.Y() >= -eps &&
- sol.X() + sol.Y() <= 1+eps)
- {
- lami[0] = sol.X();
- lami[1] = sol.Y();
- lami[2] = sol.Z();
- return ii;
- }
- }
- }
-
- return 0;
- }
-
- else
+ }
+ else
+ {
+ // SurfaceElement(ii).GetTets (loctets);
+ loctrigs.SetSize(1);
+ loctrigs.Elem(1) = SurfaceElement(ii);
+
+
+
+ for (j = 1; j <= loctrigs.Size(); j++)
+ {
+ const Element2d & el = loctrigs.Get(j);
+
+
+ const Point3d & p1 = Point(el.PNum(1));
+ const Point3d & p2 = Point(el.PNum(2));
+ const Point3d & p3 = Point(el.PNum(3));
+ /*
+ Box3d box;
+ box.SetPoint (p1);
+ box.AddPoint (p2);
+ box.AddPoint (p3);
+ box.AddPoint (p4);
+ if (!box.IsIn (p))
+ continue;
+ */
+ col1 = p2-p1;
+ col2 = p3-p1;
+ col3 = nv;
+ rhs = p - p1;
+
+ SolveLinearSystem (col1, col2, col3, rhs, sol);
+
+ if (sol.X() >= -eps && sol.Y() >= -eps &&
+ sol.X() + sol.Y() <= 1+eps)
+ {
+ lami[0] = sol.X();
+ lami[1] = sol.Y();
+ lami[2] = sol.Z();
+
+ return ii;
+ }
+ }
+ }
+ }
+
+ return 0;
+ }
+ else
- {
- int i, j;
- Vec3d col1, col2, col3;
- Vec3d rhs, sol;
- double eps = 1e-4;
- int ne;
+ {
+ int i, j;
+ Vec3d col1, col2, col3;
+ Vec3d rhs, sol;
+ double eps = 1e-4;
+ int ne;
- ARRAY<int> locels;
- if (elementsearchtree)
- {
- // update if necessary:
- const_cast<Mesh&>(*this).BuildElementSearchTree ();
- elementsearchtree->GetIntersecting (p, p, locels);
- ne = locels.Size();
- }
- else
- ne = GetNE();
+ ARRAY<int> locels;
+ if (elementsearchtree || build_searchtree)
+ {
+ // update if necessary:
+ const_cast<Mesh&>(*this).BuildElementSearchTree ();
+ elementsearchtree->GetIntersecting (p, p, locels);
+ ne = locels.Size();
+ }
+ else
+ ne = GetNE();
- ARRAY<Element> loctets;
- for (i = 1; i <= ne; i++)
- {
- int ii;
- if (elementsearchtree)
- ii = locels.Get(i);
- else
- ii = i;
+ ARRAY<Element> loctets;
+ for (i = 1; i <= ne; i++)
+ {
+ int ii;
+ if (elementsearchtree)
+ ii = locels.Get(i);
+ else
+ ii = i;
- VolumeElement(ii).GetTets (loctets);
+ VolumeElement(ii).GetTets (loctets);
- for (j = 1; j <= loctets.Size(); j++)
- {
- const Element & el = loctets.Get(j);
+ for (j = 1; j <= loctets.Size(); j++)
+ {
+ const Element & el = loctets.Get(j);
- const Point3d & p1 = Point(el.PNum(1));
- const Point3d & p2 = Point(el.PNum(2));
- const Point3d & p3 = Point(el.PNum(3));
- const Point3d & p4 = Point(el.PNum(4));
+ const Point3d & p1 = Point(el.PNum(1));
+ const Point3d & p2 = Point(el.PNum(2));
+ const Point3d & p3 = Point(el.PNum(3));
+ const Point3d & p4 = Point(el.PNum(4));
- Box3d box;
- box.SetPoint (p1);
- box.AddPoint (p2);
- box.AddPoint (p3);
- box.AddPoint (p4);
- if (!box.IsIn (p))
- continue;
+ Box3d box;
+ box.SetPoint (p1);
+ box.AddPoint (p2);
+ box.AddPoint (p3);
+ box.AddPoint (p4);
+ if (!box.IsIn (p))
+ continue;
- col1 = p2-p1;
- col2 = p3-p1;
- col3 = p4-p1;
- rhs = p - p1;
+ col1 = p2-p1;
+ col2 = p3-p1;
+ col3 = p4-p1;
+ rhs = p - p1;
- SolveLinearSystem (col1, col2, col3, rhs, sol);
+ SolveLinearSystem (col1, col2, col3, rhs, sol);
- if (sol.X() >= -eps && sol.Y() >= -eps && sol.Z() >= -eps &&
- sol.X() + sol.Y() + sol.Z() <= 1+eps)
- {
- ARRAY<Element> loctetsloc;
- ARRAY<Point3d> pointsloc;
+ if (sol.X() >= -eps && sol.Y() >= -eps && sol.Z() >= -eps &&
+ sol.X() + sol.Y() + sol.Z() <= 1+eps)
+ {
+ ARRAY<Element> loctetsloc;
+ ARRAY<Point3d> pointsloc;
- VolumeElement(ii).GetTetsLocal (loctetsloc);
- VolumeElement(ii).GetNodesLocalNew (pointsloc);
+ VolumeElement(ii).GetTetsLocal (loctetsloc);
+ VolumeElement(ii).GetNodesLocalNew (pointsloc);
- const Element & le = loctetsloc.Get(j);
+ const Element & le = loctetsloc.Get(j);
- Point3d p =
- pointsloc.Get(le.PNum(1))
- + sol.X() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(2)))
- + sol.Y() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(3)))
- + sol.Z() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(4))) ;
+ Point3d p =
+ pointsloc.Get(le.PNum(1))
+ + sol.X() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(2)))
+ + sol.Y() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(3)))
+ + sol.Z() * Vec3d (pointsloc.Get(le.PNum(1)), pointsloc.Get(le.PNum(4))) ;
- lami[0] = p.X();
- lami[1] = p.Y();
- lami[2] = p.Z();
- return ii;
- }
- }
- }
+ lami[0] = p.X();
+ lami[1] = p.Y();
+ lami[2] = p.Z();
+ return ii;
+ }
+ }
+ }
- return 0;
- }
-}
+ return 0;
+ }
+ }
-void Mesh::GetIntersectingVolEls(const Point3d& p1, const Point3d& p2,
- ARRAY<int> & locels) const
-{
- elementsearchtree->GetIntersecting (p1, p2, locels);
-}
+ void Mesh::GetIntersectingVolEls(const Point3d& p1, const Point3d& p2,
+ ARRAY<int> & locels) const
+ {
+ elementsearchtree->GetIntersecting (p1, p2, locels);
+ }
-void Mesh :: SplitIntoParts()
-{
- int i, j, dom;
- int ne = GetNE();
- int np = GetNP();
- int nse = GetNSE();
+ void Mesh :: SplitIntoParts()
+ {
+ int i, j, dom;
+ int ne = GetNE();
+ int np = GetNP();
+ int nse = GetNSE();
- BitArray surfused(nse);
- BitArray pused (np);
+ BitArray surfused(nse);
+ BitArray pused (np);
- surfused.Clear();
+ surfused.Clear();
- dom = 0;
+ dom = 0;
- while (1)
- {
- int cntd = 1;
+ while (1)
+ {
+ int cntd = 1;
- dom++;
+ dom++;
- pused.Clear();
-
- int found = 0;
- for (i = 1; i <= nse; i++)
- if (!surfused.Test(i))
- {
- SurfaceElement(i).SetIndex (dom);
- for (j = 1; j <= 3; j++)
- pused.Set (SurfaceElement(i).PNum(j));
- found = 1;
- cntd = 1;
- surfused.Set(i);
- break;
- }
-
- if (!found)
- break;
+ pused.Clear();
- int change;
- do
- {
- change = 0;
- for (i = 1; i <= nse; i++)
+ int found = 0;
+ for (i = 1; i <= nse; i++)
+ if (!surfused.Test(i))
{
- int is = 0, isnot = 0;
+ SurfaceElement(i).SetIndex (dom);
for (j = 1; j <= 3; j++)
- if (pused.Test(SurfaceElement(i).PNum(j)))
- is = 1;
- else
- isnot = 1;
+ pused.Set (SurfaceElement(i).PNum(j));
+ found = 1;
+ cntd = 1;
+ surfused.Set(i);
+ break;
+ }
+
+ if (!found)
+ break;
+
+ int change;
+ do
+ {
+ change = 0;
+ for (i = 1; i <= nse; i++)
+ {
+ int is = 0, isnot = 0;
+ for (j = 1; j <= 3; j++)
+ if (pused.Test(SurfaceElement(i).PNum(j)))
+ is = 1;
+ else
+ isnot = 1;
- if (is && isnot)
- {
- change = 1;
- for (j = 1; j <= 3; j++)
- pused.Set (SurfaceElement(i).PNum(j));
- }
+ if (is && isnot)
+ {
+ change = 1;
+ for (j = 1; j <= 3; j++)
+ pused.Set (SurfaceElement(i).PNum(j));
+ }
- if (is)
- {
- if (!surfused.Test(i))
- {
- surfused.Set(i);
- SurfaceElement(i).SetIndex (dom);
- cntd++;
- }
- }
- }
+ if (is)
+ {
+ if (!surfused.Test(i))
+ {
+ surfused.Set(i);
+ SurfaceElement(i).SetIndex (dom);
+ cntd++;
+ }
+ }
+ }
- for (i = 1; i <= ne; i++)
- {
- int is = 0, isnot = 0;
- for (j = 1; j <= 4; j++)
- if (pused.Test(VolumeElement(i).PNum(j)))
- is = 1;
- else
- isnot = 1;
+ for (i = 1; i <= ne; i++)
+ {
+ int is = 0, isnot = 0;
+ for (j = 1; j <= 4; j++)
+ if (pused.Test(VolumeElement(i).PNum(j)))
+ is = 1;
+ else
+ isnot = 1;
- if (is && isnot)
- {
- change = 1;
- for (j = 1; j <= 4; j++)
- pused.Set (VolumeElement(i).PNum(j));
- }
+ if (is && isnot)
+ {
+ change = 1;
+ for (j = 1; j <= 4; j++)
+ pused.Set (VolumeElement(i).PNum(j));
+ }
- if (is)
- {
- VolumeElement(i).SetIndex (dom);
- }
- }
- }
- while (change);
+ if (is)
+ {
+ VolumeElement(i).SetIndex (dom);
+ }
+ }
+ }
+ while (change);
- PrintMessage (3, "domain ", dom, " has ", cntd, " surfaceelements");
- }
+ PrintMessage (3, "domain ", dom, " has ", cntd, " surfaceelements");
+ }
- /*
- facedecoding.SetSize (dom);
- for (i = 1; i <= dom; i++)
- {
+ /*
+ facedecoding.SetSize (dom);
+ for (i = 1; i <= dom; i++)
+ {
facedecoding.Elem(i).surfnr = 0;
facedecoding.Elem(i).domin = i;
facedecoding.Elem(i).domout = 0;
- }
+ }
*/
- ClearFaceDescriptors();
- for (i = 1; i <= dom; i++)
- AddFaceDescriptor (FaceDescriptor (0, i, 0, 0));
- CalcSurfacesOfNode();
- timestamp = NextTimeStamp();
-}
+ ClearFaceDescriptors();
+ for (i = 1; i <= dom; i++)
+ AddFaceDescriptor (FaceDescriptor (0, i, 0, 0));
+ CalcSurfacesOfNode();
+ timestamp = NextTimeStamp();
+ }
-void Mesh :: SplitSeparatedFaces ()
-{
- int fdi;
- int i, j;
- int np = GetNP();
+ void Mesh :: SplitSeparatedFaces ()
+ {
+ int fdi;
+ int i, j;
+ int np = GetNP();
- BitArray usedp(np);
+ BitArray usedp(np);
- fdi = 1;
- while (fdi <= GetNFD())
- {
- int firstel = 0;
- for (i = 1; i <= GetNSE(); i++)
- if (SurfaceElement(i).GetIndex() == fdi)
- {
- firstel = i;
- break;
- }
- if (!firstel) continue;
+ fdi = 1;
+ while (fdi <= GetNFD())
+ {
+ int firstel = 0;
+ for (i = 1; i <= GetNSE(); i++)
+ if (SurfaceElement(i).GetIndex() == fdi)
+ {
+ firstel = i;
+ break;
+ }
+ if (!firstel) continue;
- usedp.Clear();
- for (j = 1; j <= SurfaceElement(firstel).GetNP(); j++)
- usedp.Set (SurfaceElement(firstel).PNum(j));
+ usedp.Clear();
+ for (j = 1; j <= SurfaceElement(firstel).GetNP(); j++)
+ usedp.Set (SurfaceElement(firstel).PNum(j));
- int changed;
- do
- {
- changed = 0;
- for (i = 1; i <= GetNSE(); i++)
- {
- const Element2d & el = SurfaceElement(i);
- if (el.GetIndex() != fdi)
- continue;
+ int changed;
+ do
+ {
+ changed = 0;
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ const Element2d & el = SurfaceElement(i);
+ if (el.GetIndex() != fdi)
+ continue;
- int has = 0;
- int hasno = 0;
- for (j = 1; j <= el.GetNP(); j++)
- {
- if (usedp.Test(el.PNum(j)))
- has = 1;
- else
- hasno = 1;
- }
- if (has && hasno)
- changed = 1;
+ int has = 0;
+ int hasno = 0;
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ if (usedp.Test(el.PNum(j)))
+ has = 1;
+ else
+ hasno = 1;
+ }
+ if (has && hasno)
+ changed = 1;
- if (has)
- for (j = 1; j <= el.GetNP(); j++)
- usedp.Set (el.PNum(j));
- }
- }
- while (changed);
+ if (has)
+ for (j = 1; j <= el.GetNP(); j++)
+ usedp.Set (el.PNum(j));
+ }
+ }
+ while (changed);
- int nface = 0;
- for (i = 1; i <= GetNSE(); i++)
- {
- Element2d & el = SurfaceElement(i);
- if (el.GetIndex() != fdi)
- continue;
+ int nface = 0;
+ for (i = 1; i <= GetNSE(); i++)
+ {
+ Element2d & el = SurfaceElement(i);
+ if (el.GetIndex() != fdi)
+ continue;
- int hasno = 0;
- for (j = 1; j <= el.GetNP(); j++)
- {
- if (!usedp.Test(el.PNum(j)))
- hasno = 1;
- }
+ int hasno = 0;
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ if (!usedp.Test(el.PNum(j)))
+ hasno = 1;
+ }
- if (hasno)
- {
- if (!nface)
- {
- FaceDescriptor nfd = GetFaceDescriptor(fdi);
- nface = AddFaceDescriptor (nfd);
- }
+ if (hasno)
+ {
+ if (!nface)
+ {
+ FaceDescriptor nfd = GetFaceDescriptor(fdi);
+ nface = AddFaceDescriptor (nfd);
+ }
- el.SetIndex (nface);
- }
- }
- fdi++;
- }
-}
+ el.SetIndex (nface);
+ }
+ }
+ fdi++;
+ }
+ }
-void Mesh :: GetSurfaceElementsOfFace (int facenr, ARRAY<SurfaceElementIndex> & sei) const
-{
- sei.SetSize (0);
- for (SurfaceElementIndex i = 0; i < GetNSE(); i++)
- if ( (*this)[i].GetIndex () == facenr && (*this)[i][0] >= PointIndex::BASE )
- sei.Append (i);
-}
+ void Mesh :: GetSurfaceElementsOfFace (int facenr, ARRAY<SurfaceElementIndex> & sei) const
+ {
+ sei.SetSize (0);
+ for (SurfaceElementIndex i = 0; i < GetNSE(); i++)
+ if ( (*this)[i].GetIndex () == facenr && (*this)[i][0] >= PointIndex::BASE &&
+ !(*this)[i].IsDeleted() )
+ sei.Append (i);
+ }
-void Mesh :: CalcMinMaxAngle (double badellimit, double * retvalues)
-{
- int i, j;
- int lpi1, lpi2, lpi3, lpi4;
- double phimax = 0, phimin = 10;
- double facephimax = 0, facephimin = 10;
- int illegaltets = 0, negativetets = 0, badtets = 0;
+ void Mesh :: CalcMinMaxAngle (double badellimit, double * retvalues)
+ {
+ int i, j;
+ int lpi1, lpi2, lpi3, lpi4;
+ double phimax = 0, phimin = 10;
+ double facephimax = 0, facephimin = 10;
+ int illegaltets = 0, negativetets = 0, badtets = 0;
- for (i = 1; i <= GetNE(); i++)
- {
- int badel = 0;
+ for (i = 1; i <= GetNE(); i++)
+ {
+ int badel = 0;
- Element & el = VolumeElement(i);
+ Element & el = VolumeElement(i);
- if (el.GetType() != TET)
- {
- VolumeElement(i).flags.badel = 0;
- continue;
- }
+ if (el.GetType() != TET)
+ {
+ VolumeElement(i).flags.badel = 0;
+ continue;
+ }
- if (el.Volume(Points()) < 0)
- {
- badel = 1;
- negativetets++;
- }
+ if (el.Volume(Points()) < 0)
+ {
+ badel = 1;
+ negativetets++;
+ }
- if (!LegalTet (el))
- {
- badel = 1;
- illegaltets++;
- (*testout) << "illegal tet: " << i << " ";
- for (j = 1; j <= el.GetNP(); j++)
- (*testout) << el.PNum(j) << " ";
- (*testout) << endl;
- }
-
-
- // angles between faces
- for (lpi1 = 1; lpi1 <= 3; lpi1++)
- for (lpi2 = lpi1+1; lpi2 <= 4; lpi2++)
+ if (!LegalTet (el))
{
- lpi3 = 1;
- while (lpi3 == lpi1 || lpi3 == lpi2)
- lpi3++;
- lpi4 = 10 - lpi1 - lpi2 - lpi3;
-
- const Point3d & p1 = Point (el.PNum(lpi1));
- const Point3d & p2 = Point (el.PNum(lpi2));
- const Point3d & p3 = Point (el.PNum(lpi3));
- const Point3d & p4 = Point (el.PNum(lpi4));
-
- Vec3d n(p1, p2);
- n /= n.Length();
- Vec3d v1(p1, p3);
- Vec3d v2(p1, p4);
-
- v1 -= (n * v1) * n;
- v2 -= (n * v2) * n;
-
- double cosphi = (v1 * v2) / (v1.Length() * v2.Length());
- double phi = acos (cosphi);
- if (phi > phimax) phimax = phi;
- if (phi < phimin) phimin = phi;
-
- if ((180/M_PI) * phi > badellimit)
- badel = 1;
+ badel = 1;
+ illegaltets++;
+ (*testout) << "illegal tet: " << i << " ";
+ for (j = 1; j <= el.GetNP(); j++)
+ (*testout) << el.PNum(j) << " ";
+ (*testout) << endl;
}
-
-
- // angles in faces
- for (j = 1; j <= 4; j++)
- {
- Element2d face;
- el.GetFace (j, face);
- for (lpi1 = 1; lpi1 <= 3; lpi1++)
+
+
+ // angles between faces
+ for (lpi1 = 1; lpi1 <= 3; lpi1++)
+ for (lpi2 = lpi1+1; lpi2 <= 4; lpi2++)
{
- lpi2 = lpi1 % 3 + 1;
- lpi3 = lpi2 % 3 + 1;
+ lpi3 = 1;
+ while (lpi3 == lpi1 || lpi3 == lpi2)
+ lpi3++;
+ lpi4 = 10 - lpi1 - lpi2 - lpi3;
const Point3d & p1 = Point (el.PNum(lpi1));
const Point3d & p2 = Point (el.PNum(lpi2));
const Point3d & p3 = Point (el.PNum(lpi3));
+ const Point3d & p4 = Point (el.PNum(lpi4));
+
+ Vec3d n(p1, p2);
+ n /= n.Length();
+ Vec3d v1(p1, p3);
+ Vec3d v2(p1, p4);
+
+ v1 -= (n * v1) * n;
+ v2 -= (n * v2) * n;
- Vec3d v1(p1, p2);
- Vec3d v2(p1, p3);
double cosphi = (v1 * v2) / (v1.Length() * v2.Length());
double phi = acos (cosphi);
- if (phi > facephimax) facephimax = phi;
- if (phi < facephimin) facephimin = phi;
+ if (phi > phimax) phimax = phi;
+ if (phi < phimin) phimin = phi;
if ((180/M_PI) * phi > badellimit)
badel = 1;
-
}
- }
+
+
+ // angles in faces
+ for (j = 1; j <= 4; j++)
+ {
+ Element2d face;
+ el.GetFace (j, face);
+ for (lpi1 = 1; lpi1 <= 3; lpi1++)
+ {
+ lpi2 = lpi1 % 3 + 1;
+ lpi3 = lpi2 % 3 + 1;
+
+ const Point3d & p1 = Point (el.PNum(lpi1));
+ const Point3d & p2 = Point (el.PNum(lpi2));
+ const Point3d & p3 = Point (el.PNum(lpi3));
+
+ Vec3d v1(p1, p2);
+ Vec3d v2(p1, p3);
+ double cosphi = (v1 * v2) / (v1.Length() * v2.Length());
+ double phi = acos (cosphi);
+ if (phi > facephimax) facephimax = phi;
+ if (phi < facephimin) facephimin = phi;
+
+ if ((180/M_PI) * phi > badellimit)
+ badel = 1;
+
+ }
+ }
- VolumeElement(i).flags.badel = badel;
- if (badel) badtets++;
- }
+ VolumeElement(i).flags.badel = badel;
+ if (badel) badtets++;
+ }
- if (!GetNE())
- {
- phimin = phimax = facephimin = facephimax = 0;
- }
+ if (!GetNE())
+ {
+ phimin = phimax = facephimin = facephimax = 0;
+ }
- if (!retvalues)
- {
- PrintMessage (1, "");
- PrintMessage (1, "between planes: phimin = ", (180/M_PI) * phimin,
- " phimax = ", (180/M_PI) *phimax);
- PrintMessage (1, "inside planes: phimin = ", (180/M_PI) * facephimin,
- " phimax = ", (180/M_PI) * facephimax);
- PrintMessage (1, "");
- }
- else
- {
- retvalues[0] = (180/M_PI) * facephimin;
- retvalues[1] = (180/M_PI) * facephimax;
- retvalues[2] = (180/M_PI) * phimin;
- retvalues[3] = (180/M_PI) * phimax;
- }
- PrintMessage (3, "negative tets: ", negativetets);
- PrintMessage (3, "illegal tets: ", illegaltets);
- PrintMessage (3, "bad tets: ", badtets);
-}
+ if (!retvalues)
+ {
+ PrintMessage (1, "");
+ PrintMessage (1, "between planes: phimin = ", (180/M_PI) * phimin,
+ " phimax = ", (180/M_PI) *phimax);
+ PrintMessage (1, "inside planes: phimin = ", (180/M_PI) * facephimin,
+ " phimax = ", (180/M_PI) * facephimax);
+ PrintMessage (1, "");
+ }
+ else
+ {
+ retvalues[0] = (180/M_PI) * facephimin;
+ retvalues[1] = (180/M_PI) * facephimax;
+ retvalues[2] = (180/M_PI) * phimin;
+ retvalues[3] = (180/M_PI) * phimax;
+ }
+ PrintMessage (3, "negative tets: ", negativetets);
+ PrintMessage (3, "illegal tets: ", illegaltets);
+ PrintMessage (3, "bad tets: ", badtets);
+ }
-int Mesh :: MarkIllegalElements ()
-{
- int cnt = 0;
- int i;
+ int Mesh :: MarkIllegalElements ()
+ {
+ int cnt = 0;
+ int i;
- for (i = 1; i <= GetNE(); i++)
- {
- LegalTet (VolumeElement(i));
+ for (i = 1; i <= GetNE(); i++)
+ {
+ LegalTet (VolumeElement(i));
- /*
- Element & el = VolumeElement(i);
- int leg1 = LegalTet (el);
- el.flags.illegal_valid = 0;
- int leg2 = LegalTet (el);
+ /*
+ Element & el = VolumeElement(i);
+ int leg1 = LegalTet (el);
+ el.flags.illegal_valid = 0;
+ int leg2 = LegalTet (el);
- if (leg1 != leg2)
- {
+ if (leg1 != leg2)
+ {
cerr << "legal differs!!" << endl;
(*testout) << "legal differs" << endl;
(*testout) << "elnr = " << i << ", el = " << el
- << " leg1 = " << leg1 << ", leg2 = " << leg2 << endl;
- }
+ << " leg1 = " << leg1 << ", leg2 = " << leg2 << endl;
+ }
- // el.flags.illegal = !LegalTet (el);
- */
- cnt += VolumeElement(i).Illegal();
- }
- return cnt;
-}
+ // el.flags.illegal = !LegalTet (el);
+ */
+ cnt += VolumeElement(i).Illegal();
+ }
+ return cnt;
+ }
#ifdef NONE
-void Mesh :: AddIdentification (int pi1, int pi2, int identnr)
-{
- INDEX_2 pair(pi1, pi2);
- // pair.Sort();
- identifiedpoints->Set (pair, identnr);
- if (identnr > maxidentnr)
- maxidentnr = identnr;
- timestamp = NextTimeStamp();
-}
+ void Mesh :: AddIdentification (int pi1, int pi2, int identnr)
+ {
+ INDEX_2 pair(pi1, pi2);
+ // pair.Sort();
+ identifiedpoints->Set (pair, identnr);
+ if (identnr > maxidentnr)
+ maxidentnr = identnr;
+ timestamp = NextTimeStamp();
+ }
-int Mesh :: GetIdentification (int pi1, int pi2) const
-{
- INDEX_2 pair(pi1, pi2);
- if (identifiedpoints->Used (pair))
- return identifiedpoints->Get(pair);
- else
- return 0;
-}
+ int Mesh :: GetIdentification (int pi1, int pi2) const
+ {
+ INDEX_2 pair(pi1, pi2);
+ if (identifiedpoints->Used (pair))
+ return identifiedpoints->Get(pair);
+ else
+ return 0;
+ }
-int Mesh :: GetIdentificationSym (int pi1, int pi2) const
-{
- INDEX_2 pair(pi1, pi2);
- if (identifiedpoints->Used (pair))
- return identifiedpoints->Get(pair);
+ int Mesh :: GetIdentificationSym (int pi1, int pi2) const
+ {
+ INDEX_2 pair(pi1, pi2);
+ if (identifiedpoints->Used (pair))
+ return identifiedpoints->Get(pair);
- pair = INDEX_2 (pi2, pi1);
- if (identifiedpoints->Used (pair))
- return identifiedpoints->Get(pair);
+ pair = INDEX_2 (pi2, pi1);
+ if (identifiedpoints->Used (pair))
+ return identifiedpoints->Get(pair);
- return 0;
-}
+ return 0;
+ }
-void Mesh :: GetIdentificationMap (int identnr, ARRAY<int> & identmap) const
-{
- int i, j;
+ void Mesh :: GetIdentificationMap (int identnr, ARRAY<int> & identmap) const
+ {
+ int i, j;
- identmap.SetSize (GetNP());
- for (i = 1; i <= identmap.Size(); i++)
- identmap.Elem(i) = 0;
+ identmap.SetSize (GetNP());
+ for (i = 1; i <= identmap.Size(); i++)
+ identmap.Elem(i) = 0;
- for (i = 1; i <= identifiedpoints->GetNBags(); i++)
- for (j = 1; j <= identifiedpoints->GetBagSize(i); j++)
- {
- INDEX_2 i2;
- int nr;
- identifiedpoints->GetData (i, j, i2, nr);
+ for (i = 1; i <= identifiedpoints->GetNBags(); i++)
+ for (j = 1; j <= identifiedpoints->GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int nr;
+ identifiedpoints->GetData (i, j, i2, nr);
- if (nr == identnr)
- {
- identmap.Elem(i2.I1()) = i2.I2();
- }
- }
-}
+ if (nr == identnr)
+ {
+ identmap.Elem(i2.I1()) = i2.I2();
+ }
+ }
+ }
-void Mesh :: GetIdentificationPairs (int identnr, ARRAY<INDEX_2> & identpairs) const
-{
- int i, j;
+ void Mesh :: GetIdentificationPairs (int identnr, ARRAY<INDEX_2> & identpairs) const
+ {
+ int i, j;
- identpairs.SetSize(0);
+ identpairs.SetSize(0);
- for (i = 1; i <= identifiedpoints->GetNBags(); i++)
- for (j = 1; j <= identifiedpoints->GetBagSize(i); j++)
- {
- INDEX_2 i2;
- int nr;
- identifiedpoints->GetData (i, j, i2, nr);
+ for (i = 1; i <= identifiedpoints->GetNBags(); i++)
+ for (j = 1; j <= identifiedpoints->GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int nr;
+ identifiedpoints->GetData (i, j, i2, nr);
- if (identnr == 0 || nr == identnr)
- identpairs.Append (i2);
- }
-}
+ if (identnr == 0 || nr == identnr)
+ identpairs.Append (i2);
+ }
+ }
#endif
-void Mesh :: ComputeNVertices ()
-{
- int i, j, nv;
- int ne = GetNE();
- int nse = GetNSE();
-
- numvertices = 0;
- for (i = 1; i <= ne; i++)
- {
- const Element & el = VolumeElement(i);
- nv = el.GetNV();
- for (j = 0; j < nv; j++)
- if (el[j] > numvertices)
- numvertices = el[j];
- }
- for (i = 1; i <= nse; i++)
- {
- const Element2d & el = SurfaceElement(i);
- nv = el.GetNV();
- for (j = 1; j <= nv; j++)
- if (el.PNum(j) > numvertices)
- numvertices = el.PNum(j);
- }
-
- numvertices += 1- PointIndex::BASE;
-}
-
-int Mesh :: GetNV () const
-{
- if (numvertices < 0)
- return GetNP();
- else
- return numvertices;
-}
+ void Mesh :: ComputeNVertices ()
+ {
+ int i, j, nv;
+ int ne = GetNE();
+ int nse = GetNSE();
-void Mesh :: SetNP (int np)
-{
- points.SetSize(np);
- ptyps.SetSize(np);
-
- int mlold = mlbetweennodes.Size();
- mlbetweennodes.SetSize(np);
- if (np > mlold)
- for (int i = mlold+PointIndex::BASE;
- i < np+PointIndex::BASE; i++)
+ numvertices = 0;
+ for (i = 1; i <= ne; i++)
{
- mlbetweennodes[i].I1() = PointIndex::BASE-1;
- mlbetweennodes[i].I2() = PointIndex::BASE-1;
+ const Element & el = VolumeElement(i);
+ nv = el.GetNV();
+ for (j = 0; j < nv; j++)
+ if (el[j] > numvertices)
+ numvertices = el[j];
}
-}
+ for (i = 1; i <= nse; i++)
+ {
+ const Element2d & el = SurfaceElement(i);
+ nv = el.GetNV();
+ for (j = 1; j <= nv; j++)
+ if (el.PNum(j) > numvertices)
+ numvertices = el.PNum(j);
+ }
+
+ numvertices += 1- PointIndex::BASE;
+ }
+
+ int Mesh :: GetNV () const
+ {
+ if (numvertices < 0)
+ return GetNP();
+ else
+ return numvertices;
+ }
+
+ void Mesh :: SetNP (int np)
+ {
+ points.SetSize(np);
+ // ptyps.SetSize(np);
+
+ int mlold = mlbetweennodes.Size();
+ mlbetweennodes.SetSize(np);
+ if (np > mlold)
+ for (int i = mlold+PointIndex::BASE;
+ i < np+PointIndex::BASE; i++)
+ {
+ mlbetweennodes[i].I1() = PointIndex::BASE-1;
+ mlbetweennodes[i].I2() = PointIndex::BASE-1;
+ }
+ GetIdentifications().SetMaxPointNr (np + PointIndex::BASE-1);
+ }
-/*
-void Mesh :: BuildConnectedNodes ()
-{
- if (PureTetMesh())
+
+ /*
+ void Mesh :: BuildConnectedNodes ()
{
- connectedtonode.SetSize(0);
- return;
+ if (PureTetMesh())
+ {
+ connectedtonode.SetSize(0);
+ return;
}
- int i, j, k;
- int np = GetNP();
- int ne = GetNE();
- TABLE<int> conto(np);
- for (i = 1; i <= ne; i++)
+ int i, j, k;
+ int np = GetNP();
+ int ne = GetNE();
+ TABLE<int> conto(np);
+ for (i = 1; i <= ne; i++)
{
- const Element & el = VolumeElement(i);
+ const Element & el = VolumeElement(i);
- if (el.GetType() == PRISM)
- {
- for (j = 1; j <= 6; j++)
- {
- int n1 = el.PNum (j);
- int n2 = el.PNum ((j+2)%6+1);
- // if (n1 != n2)
- {
- int found = 0;
- for (k = 1; k <= conto.EntrySize(n1); k++)
- if (conto.Get(n1, k) == n2)
- {
- found = 1;
- break;
- }
- if (!found)
- conto.Add (n1, n2);
- }
- }
- }
- else if (el.GetType() == PYRAMID)
- {
- for (j = 1; j <= 4; j++)
- {
- int n1, n2;
- switch (j)
- {
- case 1: n1 = 1; n2 = 4; break;
- case 2: n1 = 4; n2 = 1; break;
- case 3: n1 = 2; n2 = 3; break;
- case 4: n1 = 3; n2 = 2; break;
- }
+ if (el.GetType() == PRISM)
+ {
+ for (j = 1; j <= 6; j++)
+ {
+ int n1 = el.PNum (j);
+ int n2 = el.PNum ((j+2)%6+1);
+ // if (n1 != n2)
+ {
+ int found = 0;
+ for (k = 1; k <= conto.EntrySize(n1); k++)
+ if (conto.Get(n1, k) == n2)
+ {
+ found = 1;
+ break;
+ }
+ if (!found)
+ conto.Add (n1, n2);
+ }
+ }
+ }
+ else if (el.GetType() == PYRAMID)
+ {
+ for (j = 1; j <= 4; j++)
+ {
+ int n1, n2;
+ switch (j)
+ {
+ case 1: n1 = 1; n2 = 4; break;
+ case 2: n1 = 4; n2 = 1; break;
+ case 3: n1 = 2; n2 = 3; break;
+ case 4: n1 = 3; n2 = 2; break;
+ }
- int found = 0;
- for (k = 1; k <= conto.EntrySize(n1); k++)
- if (conto.Get(n1, k) == n2)
- {
- found = 1;
- break;
- }
- if (!found)
- conto.Add (n1, n2);
- }
- }
+ int found = 0;
+ for (k = 1; k <= conto.EntrySize(n1); k++)
+ if (conto.Get(n1, k) == n2)
+ {
+ found = 1;
+ break;
+ }
+ if (!found)
+ conto.Add (n1, n2);
+ }
+ }
}
- connectedtonode.SetSize(np);
- for (i = 1; i <= np; i++)
+ connectedtonode.SetSize(np);
+ for (i = 1; i <= np; i++)
connectedtonode.Elem(i) = 0;
- for (i = 1; i <= np; i++)
+ for (i = 1; i <= np; i++)
if (connectedtonode.Elem(i) == 0)
- {
- connectedtonode.Elem(i) = i;
- ConnectToNodeRec (i, i, conto);
- }
+ {
+ connectedtonode.Elem(i) = i;
+ ConnectToNodeRec (i, i, conto);
+ }
-}
+ }
-void Mesh :: ConnectToNodeRec (int node, int tonode,
- const TABLE<int> & conto)
-{
- int i, n2;
- // (*testout) << "connect " << node << " to " << tonode << endl;
- for (i = 1; i <= conto.EntrySize(node); i++)
+ void Mesh :: ConnectToNodeRec (int node, int tonode,
+ const TABLE<int> & conto)
{
- n2 = conto.Get(node, i);
- if (!connectedtonode.Get(n2))
- {
- connectedtonode.Elem(n2) = tonode;
- ConnectToNodeRec (n2, tonode, conto);
- }
+ int i, n2;
+ // (*testout) << "connect " << node << " to " << tonode << endl;
+ for (i = 1; i <= conto.EntrySize(node); i++)
+ {
+ n2 = conto.Get(node, i);
+ if (!connectedtonode.Get(n2))
+ {
+ connectedtonode.Elem(n2) = tonode;
+ ConnectToNodeRec (n2, tonode, conto);
}
-}
-*/
+ }
+ }
+ */
-bool Mesh :: PureTrigMesh (int faceindex) const
-{
- if (!faceindex)
- return !mparam.quad;
+ bool Mesh :: PureTrigMesh (int faceindex) const
+ {
+ if (!faceindex)
+ return !mparam.quad;
- int i;
- for (i = 1; i <= GetNSE(); i++)
- if (SurfaceElement(i).GetIndex() == faceindex &&
- SurfaceElement(i).GetNP() != 3)
- return 0;
- return 1;
-}
+ int i;
+ for (i = 1; i <= GetNSE(); i++)
+ if (SurfaceElement(i).GetIndex() == faceindex &&
+ SurfaceElement(i).GetNP() != 3)
+ return 0;
+ return 1;
+ }
-bool Mesh :: PureTetMesh () const
-{
- for (ElementIndex ei = 0; ei < GetNE(); ei++)
- if (VolumeElement(ei).GetNP() != 4)
- return 0;
- return 1;
-}
+ bool Mesh :: PureTetMesh () const
+ {
+ for (ElementIndex ei = 0; ei < GetNE(); ei++)
+ if (VolumeElement(ei).GetNP() != 4)
+ return 0;
+ return 1;
+ }
-void Mesh :: UpdateTopology()
-{
- topology->Update();
- clusters->Update();
-}
+ void Mesh :: UpdateTopology()
+ {
+ topology->Update();
+ clusters->Update();
+ }
-void Mesh :: SetMaterial (int domnr, const char * mat)
-{
- if (domnr > materials.Size())
- {
- int olds = materials.Size();
- materials.SetSize (domnr);
- for (int i = olds; i < domnr; i++)
- materials[i] = 0;
- }
- materials.Elem(domnr) = new char[strlen(mat+1)];
- strcpy (materials.Elem(domnr), mat);
-}
+ void Mesh :: SetMaterial (int domnr, const char * mat)
+ {
+ if (domnr > materials.Size())
+ {
+ int olds = materials.Size();
+ materials.SetSize (domnr);
+ for (int i = olds; i < domnr; i++)
+ materials[i] = 0;
+ }
+ materials.Elem(domnr) = new char[strlen(mat)+1];
+ strcpy (materials.Elem(domnr), mat);
+ }
-const char * Mesh :: GetMaterial (int domnr) const
-{
- if (domnr <= materials.Size())
- return materials.Get(domnr);
- return 0;
-}
+ const char * Mesh :: GetMaterial (int domnr) const
+ {
+ if (domnr <= materials.Size())
+ return materials.Get(domnr);
+ return 0;
+ }
-void Mesh :: PrintMemInfo (ostream & ost) const
-{
- ost << "Mesh Mem:" << endl;
+ void Mesh :: PrintMemInfo (ostream & ost) const
+ {
+ ost << "Mesh Mem:" << endl;
- ost << GetNP() << " Points, of size "
- << sizeof (Point3d) << " + " << sizeof(POINTTYPE) << " = "
- << GetNP() * (sizeof (Point3d) + sizeof(POINTTYPE)) << endl;
+ ost << GetNP() << " Points, of size "
+ << sizeof (Point3d) << " + " << sizeof(POINTTYPE) << " = "
+ << GetNP() * (sizeof (Point3d) + sizeof(POINTTYPE)) << endl;
- ost << GetNSE() << " Surface elements, of size "
- << sizeof (Element2d) << " = "
- << GetNSE() * sizeof(Element2d) << endl;
+ ost << GetNSE() << " Surface elements, of size "
+ << sizeof (Element2d) << " = "
+ << GetNSE() * sizeof(Element2d) << endl;
- ost << GetNE() << " Volume elements, of size "
- << sizeof (Element) << " = "
- << GetNE() * sizeof(Element) << endl;
+ ost << GetNE() << " Volume elements, of size "
+ << sizeof (Element) << " = "
+ << GetNE() * sizeof(Element) << endl;
- ost << "surfs on node:";
- surfacesonnode.PrintMemInfo (cout);
+ ost << "surfs on node:";
+ surfacesonnode.PrintMemInfo (cout);
- ost << "boundaryedges: ";
- if (boundaryedges)
- boundaryedges->PrintMemInfo (cout);
+ ost << "boundaryedges: ";
+ if (boundaryedges)
+ boundaryedges->PrintMemInfo (cout);
- ost << "surfelementht: ";
- if (surfelementht)
- surfelementht->PrintMemInfo (cout);
-}
+ ost << "surfelementht: ";
+ if (surfelementht)
+ surfelementht->PrintMemInfo (cout);
+ }
}
diff --git a/Netgen/libsrc/meshing/meshclass.hpp b/Netgen/libsrc/meshing/meshclass.hpp
index 4c03a36e14..4ad0edbb9b 100644
--- a/Netgen/libsrc/meshing/meshclass.hpp
+++ b/Netgen/libsrc/meshing/meshclass.hpp
@@ -16,6 +16,9 @@
enum resthtype { RESTRICTH_FACE, RESTRICTH_EDGE,
RESTRICTH_SURFACEELEMENT, RESTRICTH_POINT, RESTRICTH_SEGMENT };
+class HPRefElement;
+
+
/// 2d/3d mesh
class Mesh
{
@@ -33,7 +36,7 @@ private:
/// point coordinates
T_POINTS points;
/// type of point, is set in calcsurfacesofnode
- ARRAY<POINTTYPE,PointIndex::BASE> ptyps;
+ // ARRAY<POINTTYPE,PointIndex::BASE> ptyps;
/// type of element, set in calcsurfacesofnode
ARRAY<ELEMENTTYPE> eltyps;
@@ -52,9 +55,10 @@ private:
/// boundary edges (1..normal bedge, 2..segment)
INDEX_2_CLOSED_HASHTABLE<int> * boundaryedges;
///
- INDEX_2_HASHTABLE<int> * segmentht;
+ INDEX_2_CLOSED_HASHTABLE<int> * segmentht;
///
- INDEX_3_HASHTABLE<int> * surfelementht;
+ INDEX_3_CLOSED_HASHTABLE<int> * surfelementht;
+
/// faces of rest-solid
ARRAY<Element2d> openelements;
/// open segmenets for surface meshing
@@ -81,7 +85,7 @@ private:
ARRAY<char*> materials;
/// Periodic surface, close surface, etc. identifications
- Identifications ident;
+ Identifications * ident;
/// number of vertices (if < 0, use np)
@@ -112,6 +116,10 @@ private:
public:
+
+ // store coarse mesh before hp-refinement
+ ARRAY<HPRefElement> * hpelements;
+ Mesh * coarsemesh;
/// number of refinement levels
@@ -130,6 +138,8 @@ public:
///
~Mesh();
+ Mesh & operator= (const Mesh & mesh2);
+
///
void DeleteMesh();
@@ -170,12 +180,17 @@ public:
const MeshPoint & operator[] (PointIndex pi) const { return points[pi]; }
MeshPoint & operator[] (PointIndex pi) { return points[pi]; }
+ /*
POINTTYPE PointType (int i) const { return ptyps.Get(i); }
POINTTYPE PointType (PointIndex pi) const { return ptyps[pi]; }
+ */
+ POINTTYPE PointType (int i) const { return points.Get(i).Type(); }
+ POINTTYPE PointType (PointIndex pi) const { return points[pi].Type(); }
+
const T_POINTS & Points() const { return points; }
T_POINTS & Points() { return points; }
- ARRAY<POINTTYPE,PointIndex::BASE> & PointTypes() { return ptyps; }
+ // ARRAY<POINTTYPE,PointIndex::BASE> & PointTypes() { return ptyps; }
@@ -192,11 +207,11 @@ public:
int GetNSeg () const { return segments.Size(); }
Segment & LineSegment(int i) { return segments.Elem(i); }
const Segment & LineSegment(int i) const { return segments.Get(i); }
-
- const Segment & operator[] (SegmentIndex si) const
- { return segments[si]; }
- Segment & operator[] (SegmentIndex si)
- { return segments[si]; }
+
+ Segment & LineSegment(SegmentIndex si) { return segments[si]; }
+ const Segment & LineSegment(SegmentIndex si) const { return segments[si]; }
+ const Segment & operator[] (SegmentIndex si) const { return segments[si]; }
+ Segment & operator[] (SegmentIndex si) { return segments[si]; }
@@ -344,9 +359,11 @@ public:
/// number of elements per radius
void CalcLocalHFromSurfaceCurvature(double elperr);
///
+ void CalcLocalHFromPointDistances(void);
+ ///
void RestrictLocalH (resthtype rht, int nr, double loch);
///
- void LoadLocalMeshSize (istream & ist);
+ void LoadLocalMeshSize (const char * meshsizefilename);
///
void SetGlobalH (double h);
///
@@ -401,15 +418,25 @@ public:
return segmentht->Used (i2);
}
+ SegmentIndex SegmentNr (PointIndex pi1, PointIndex pi2) const
+ {
+ INDEX_2 i2 (pi1, pi2);
+ i2.Sort();
+ return segmentht->Get (i2);
+ }
+
+
/**
Remove unused points. etc.
*/
void Compress ();
///
- void Save (const char * filename) const;
+ void Save (const string & filename) const;
+ ///
+ void Load (const string & filename);
///
- void Load (const char * filename);
+ void Merge (const string & filename);
///
@@ -470,7 +497,9 @@ public:
void BuildElementSearchTree ();
/// gives element of point, barycentric coordinates
int GetElementOfPoint (const Point3d & p,
- double * lami) const;
+ double * lami,
+ bool build_searchtree = 0,
+ const int index = -1) const;
/// give list of vol elements which are int the box(p1,p2)
void GetIntersectingVolEls(const Point3d& p1, const Point3d& p2,
@@ -529,9 +558,9 @@ public:
#endif
/// return periodic, close surface etc. identifications
- Identifications & GetIdentifications () { return ident; }
+ Identifications & GetIdentifications () { return *ident; }
/// return periodic, close surface etc. identifications
- const Identifications & GetIdentifications () const { return ident; }
+ const Identifications & GetIdentifications () const { return *ident; }
diff --git a/Netgen/libsrc/meshing/meshfunc.cpp b/Netgen/libsrc/meshing/meshfunc.cpp
index a3459ae71f..90fe9e68c5 100644
--- a/Netgen/libsrc/meshing/meshfunc.cpp
+++ b/Netgen/libsrc/meshing/meshfunc.cpp
@@ -3,7 +3,8 @@
namespace netgen
{
- extern const char * tetrules2[];
+ extern const char * tetrules[];
+ // extern const char * tetrules2[];
extern const char * prismrules2[];
extern const char * pyramidrules[];
extern const char * pyramidrules2[];
@@ -12,38 +13,42 @@ namespace netgen
extern double teterrpow;
MESHING3_RESULT MeshVolume (MeshingParameters & mp, Mesh& mesh3d)
{
- int i, k, oldne;
+ int i, oldne;
PointIndex pi;
int meshed;
int cntsteps;
- // PlotStatistics3d * pstat;
- // pstat = new TerminalPlotStatistics3d;
-
-
ARRAY<INDEX_2> connectednodes;
mesh3d.Compress();
// mesh3d.PrintMemInfo (cout);
+
+
+ if (mesh3d.CheckOverlappingBoundary())
+ throw NgException ("Stop meshing since boundary mesh is overlapping");
+
+
int nonconsist = 0;
- for (k = 1; k <= mesh3d.GetNDomains(); k++)
+ for (int k = 1; k <= mesh3d.GetNDomains(); k++)
{
PrintMessage (3, "Check subdomain ", k, " / ", mesh3d.GetNDomains());
mesh3d.FindOpenElements(k);
- int res = 0; // mesh3d.CheckOverlappingBoundary();
+ /*
+ bool res = mesh3d.CheckOverlappingBoundary();
if (res)
{
PrintError ("Surface is overlapping !!");
nonconsist = 1;
}
+ */
- res = mesh3d.CheckConsistentBoundary();
+ bool res = mesh3d.CheckConsistentBoundary();
if (res)
{
PrintError ("Surface mesh not consistent");
@@ -59,7 +64,7 @@ namespace netgen
double globmaxh = mp.maxh;
- for (k = 1; k <= mesh3d.GetNDomains(); k++)
+ for (int k = 1; k <= mesh3d.GetNDomains(); k++)
{
if (multithread.terminate)
break;
@@ -72,21 +77,6 @@ namespace netgen
mesh3d.CalcSurfacesOfNode();
mesh3d.FindOpenElements(k);
- /*
- if (mesh3d.CheckOverlappingBoundary())
- {
- (*mycout) << "overlapping" << endl;
- (*testout) << "overlapping !!!" << endl;
- continue;
- }
- if (mesh3d.CheckConsistentBoundary())
- {
- (*mycout) << "boundary not consistent" << endl;
- (*testout) << "boundary not consistent !!!" << endl;
- continue;
- }
- */
-
if (!mesh3d.GetNOpenElements())
continue;
@@ -96,32 +86,26 @@ namespace netgen
if (mesh3d.HasOpenQuads())
{
string rulefile = ngdir;
- /*
- char rulefile[255];
- strcpy (rulefile, ngdir);
- */
+
const char ** rulep = NULL;
switch (qstep)
{
case 1:
- // strcat (rulefile, "/rules/prisms2.rls");
rulefile += "/rules/prisms2.rls";
rulep = prismrules2;
break;
case 2: // connect pyramid to triangle
- // strcat (rulefile, "/rules/pyramids2.rls");
rulefile += "/rules/pyramids2.rls";
rulep = pyramidrules2;
break;
case 3: // connect to vis-a-vis point
- // strcat (rulefile, "/rules/pyramids.rls");
rulefile += "/rules/pyramids.rls";
rulep = pyramidrules;
break;
}
- // Meshing3 meshing(rulefile.c_str(), pstat);
- Meshing3 meshing(NULL, rulep);
+ // Meshing3 meshing(rulefile);
+ Meshing3 meshing(rulep);
MeshingParameters mpquad = mp;
@@ -168,7 +152,7 @@ namespace netgen
if (mp.delaunay && mesh3d.GetNOpenElements())
{
- Meshing3 meshing(NULL);
+ Meshing3 meshing((const char**)NULL);
mesh3d.FindOpenElements(k);
@@ -182,21 +166,8 @@ namespace netgen
meshing.AddBoundaryElement (mesh3d.OpenElement(i));
oldne = mesh3d.GetNE();
- /*
- if (globflags.GetDefineFlag ("blockfill"))
- {
- if (!globflags.GetDefineFlag ("localh"))
- meshing.BlockFill
- (mesh3d, mp.h * globflags.GetNumFlag ("relblockfillh", 1));
- else
- meshing.BlockFillLocalH (mesh3d);
- }
- */
-
- // mp.blockfill = globflags.GetDefineFlag ("blockfill");
meshing.Delaunay (mesh3d, mp);
- // return MESHING3_OK;
for (i = oldne + 1; i <= mesh3d.GetNE(); i++)
mesh3d.VolumeElement(i).SetIndex (k);
@@ -212,49 +183,23 @@ namespace netgen
if (multithread.terminate)
break;
- // mesh3d.CalcSurfacesOfNode();
mesh3d.FindOpenElements(k);
PrintMessage (5, mesh3d.GetNOpenElements(), " open faces");
cntsteps++;
+
if (cntsteps > mp.maxoutersteps)
throw NgException ("Stop meshing since too many attempts");
- // return MESHING3_OUTERSTEPSEXCEEDED;
- /*
- if (mesh3d.CheckOverlappingBoundary())
- {
- (*mycout) << "overlapping" << endl;
- (*testout) << "overlapping !!!!" << endl;
- break;
- }
- if (mesh3d.CheckConsistentBoundary())
- {
- (*mycout) << "boundary not consistent" << endl;
- (*testout) << "boundary not consistent !!!" << endl;
- // break;
- }
- */
-
-
- /*
- char rulefile[255];
- strcpy (rulefile, ngdir);
- strcat (rulefile, "/tetra.rls");
- */
string rulefile = ngdir + "/tetra.rls";
PrintMessage (1, "start tetmeshing");
- // Meshing3 meshing(rulefile, pstat);
- Meshing3 meshing(NULL);
+ // Meshing3 meshing(rulefile);
+ Meshing3 meshing(tetrules);
-#ifdef MYGRAPH
- Point3d pmin, pmax;
- mesh3d.GetBox (pmin, pmax, k);
- rot.SetCenter (Center (pmin, pmax));
-#endif
- for (i = 1; i <= mesh3d.GetNP(); i++)
- meshing.AddPoint (mesh3d.Point(i), i);
+ for (PointIndex pi = PointIndex::BASE;
+ pi < mesh3d.GetNP()+PointIndex::BASE; pi++)
+ meshing.AddPoint (mesh3d[pi], pi);
for (i = 1; i <= mesh3d.GetNOpenElements(); i++)
meshing.AddBoundaryElement (mesh3d.OpenElement(i));
@@ -262,12 +207,12 @@ namespace netgen
oldne = mesh3d.GetNE();
- mp.giveuptol = 15; // int(globflags.GetNumFlag ("giveuptol", 15));
+ mp.giveuptol = 15;
mp.sloppy = 5;
meshing.GenerateMesh (mesh3d, mp);
- for (i = oldne + 1; i <= mesh3d.GetNE(); i++)
- mesh3d.VolumeElement(i).SetIndex (k);
+ for (ElementIndex ei = oldne; ei < mesh3d.GetNE(); ei++)
+ mesh3d[ei].SetIndex (k);
mesh3d.CalcSurfacesOfNode();
@@ -323,8 +268,6 @@ namespace netgen
MeshQuality3d (mesh3d);
- // delete pstat;
-
return MESHING3_OK;
}
@@ -646,8 +589,8 @@ namespace netgen
MESHING3_RESULT OptimizeVolume (MeshingParameters & mp,
- Mesh & mesh3d,
- const CSGeometry * geometry)
+ Mesh & mesh3d)
+ // const CSGeometry * geometry)
{
int i, j;
diff --git a/Netgen/libsrc/meshing/meshfunc.hpp b/Netgen/libsrc/meshing/meshfunc.hpp
index 0e530ed2f0..ab2d661050 100644
--- a/Netgen/libsrc/meshing/meshfunc.hpp
+++ b/Netgen/libsrc/meshing/meshfunc.hpp
@@ -13,8 +13,7 @@
*/
class Mesh;
-class MeshingParameters3;
-class CSGeometry;
+// class CSGeometry;
/// Build tet-mesh
MESHING3_RESULT MeshVolume(MeshingParameters & mp, Mesh& mesh3d);
@@ -23,8 +22,8 @@ MESHING3_RESULT MeshVolume(MeshingParameters & mp, Mesh& mesh3d);
MESHING3_RESULT MeshMixedVolume(MeshingParameters & mp, Mesh& mesh3d);
/// Optimize tet-mesh
-MESHING3_RESULT OptimizeVolume(MeshingParameters & mp, Mesh& mesh3d,
- const CSGeometry * geometry = NULL);
+MESHING3_RESULT OptimizeVolume(MeshingParameters & mp, Mesh& mesh3d);
+// const CSGeometry * geometry = NULL);
void RemoveIllegalElements (Mesh & mesh3d);
diff --git a/Netgen/libsrc/meshing/meshing.hpp b/Netgen/libsrc/meshing/meshing.hpp
index 3a60f1f7c1..a4442867b3 100644
--- a/Netgen/libsrc/meshing/meshing.hpp
+++ b/Netgen/libsrc/meshing/meshing.hpp
@@ -10,8 +10,8 @@ namespace netgen
{
class CSGeometry;
-
-
+
+
#include "msghandler.hpp"
#include "meshtype.hpp"
@@ -30,15 +30,27 @@ namespace netgen
#include "geomsearch.hpp"
#include "adfront3.hpp"
#include "ruler3.hpp"
+
+#ifndef SMALLLIB
+#define _INCLUDE_MORE
+#endif
+#ifdef LINUX
+#define _INCLUDE_MORE
+#endif
+
+#ifdef _INCLUDE_MORE
#include "meshing3.hpp"
#include "improve3.hpp"
+#endif
#include "findip.hpp"
#include "topology.hpp"
#include "curvedelems.hpp"
#include "clusters.hpp"
+#ifdef _INCLUDE_MORE
#include "meshfunc.hpp"
+#endif
#include "bisect.hpp"
#include "hprefinement.hpp"
#include "boundarylayer.hpp"
diff --git a/Netgen/libsrc/meshing/meshing2.cpp b/Netgen/libsrc/meshing/meshing2.cpp
index efcb51346e..e7643194c4 100644
--- a/Netgen/libsrc/meshing/meshing2.cpp
+++ b/Netgen/libsrc/meshing/meshing2.cpp
@@ -18,8 +18,6 @@ namespace netgen
static int cntelem, trials, nfaces;
static int oldnl;
static int qualclass;
- // static const Meshing2 * meshthis;
-
Meshing2 :: Meshing2 (const Box3d & aboundingbox)
@@ -27,8 +25,8 @@ namespace netgen
boundingbox = aboundingbox;
LoadRules (NULL);
- // LoadRules ("quad.rls");
- // LoadRules ("triangle.rls");
+ // LoadRules ("rules/quad.rls");
+ // LoadRules ("rules/triangle.rls");
adfront = new AdFront2(boundingbox);
starttime = GetTime();
@@ -115,9 +113,9 @@ namespace netgen
const MultiPointGeomInfo & geominf,
Point2d & plainpoint, double h, int & zone)
{
- Vec3d p1p;
+ Vec3d p1p (globp1, locpoint);
- p1p = locpoint - globp1;
+ // p1p = locpoint - globp1;
p1p /= h;
plainpoint.X() = p1p * ex;
plainpoint.Y() = p1p * ey;
@@ -227,7 +225,6 @@ namespace netgen
testmode = 0;
- // meshthis = this;
StartMesh();
@@ -293,7 +290,7 @@ namespace netgen
adfront ->SetStartFront ();
- int plotnexttrial = 0;
+ int plotnexttrial = 999;
// starttime = GetTime();
while (!adfront ->Empty()) // && !multithread.terminate)
{
@@ -327,7 +324,7 @@ namespace netgen
" trials = ", trials,
" elements = ", mesh.GetNSE(),
" els/sec = ",
- (mesh.GetNSE() / (GetTime() - starttime + 1)));
+ (mesh.GetNSE() / (GetTime() - starttime + 0.0001)));
plotnexttrial += 1000;
}
@@ -354,7 +351,7 @@ namespace netgen
}
- baselineindex = adfront -> SelectBaseLine (p1, p2, blgeominfo1, blgeominfo2);
+ baselineindex = adfront -> SelectBaseLine (p1, p2, blgeominfo1, blgeominfo2, qualclass);
// cout << "baseline = " << baselineindex << ", p1, p2 = " << p1 << ", " << p2 << endl;
@@ -372,24 +369,26 @@ namespace netgen
h = hshould;
-
- qualclass =
- adfront ->GetLocals (baselineindex, locpoints, mpgeominfo, loclines,
- pindex, lindex, 5 * max2(his, hshould));
+ double hinner = (3 + qualclass) * max2 (his, hshould);
+ adfront ->GetLocals (baselineindex, locpoints, mpgeominfo, loclines,
+ pindex, lindex, 2*hinner);
+
if (qualclass > 200)
{
PrintMessage (3, "give up with qualclass ", qualclass);
PrintMessage (3, "number of frontlines = ", adfront->GetNFL());
+ // throw NgException ("Give up 2d meshing");
break;
}
+ /*
if (found && qualclass > 60)
{
found = 0;
}
-
+ */
// morerisc = ((qualclass > 20) && (qualclass % 2 == 1));
// morerisc = 1;
morerisc = 0;
@@ -416,6 +415,9 @@ namespace netgen
cout << "set debugflag" << endl;
}
+ if (debugparam.haltlargequalclass && qualclass > 50)
+ debugflag = 1;
+
// problem recognition !
if (found &&
@@ -434,6 +436,9 @@ namespace netgen
oldnp = locpoints.Size();
oldnl = loclines.Size();
+ if (debugflag)
+ (*testout) << "define new transformation" << endl;
+
DefineTransformation (p1, p2, blgeominfo1, blgeominfo2);
plainpoints.SetSize (locpoints.Size());
@@ -441,13 +446,18 @@ namespace netgen
// (*testout) << endl;
+ // (*testout) << "3d->2d transformation" << endl;
+
for (i = 1; i <= locpoints.Size(); i++)
{
// (*testout) << "pindex(i) = " << pindex[i-1] << endl;
TransformToPlain (locpoints.Get(i),
mpgeominfo.Get(i),
plainpoints.Elem(i), h, plainzones.Elem(i));
+ // (*testout) << mpgeominfo.Get(i).GetPGI(1).u << " " << mpgeominfo.Get(i).GetPGI(1).v << " ";
+ // (*testout) << plainpoints.Get(i).X() << " " << plainpoints.Get(i).Y() << endl;
}
+ // (*testout) << endl << endl << endl;
p12d = plainpoints.Get(1);
p22d = plainpoints.Get(2);
@@ -581,6 +591,9 @@ namespace netgen
}
if (pindex.Elem(i) == 0)
legalpoints.Elem(i) = 0;
+
+ if (plainpoints.Elem(i).Y() < 0)
+ legalpoints.Elem(i) = 0;
}
/*
for (i = 3; i <= plainpoints.Size(); i++)
@@ -666,12 +679,12 @@ namespace netgen
}
*/
-
if (found)
{
rulenr = ApplyRules (plainpoints, legalpoints, maxlegalpoint,
loclines, maxlegalline, locelements,
dellines, qualclass);
+ // (*testout) << "Rule Nr = " << rulenr << endl;
if (!rulenr)
{
found = 0;
@@ -683,6 +696,7 @@ namespace netgen
for (i = 1; i <= locelements.Size() && found; i++)
{
const Element2d & el = locelements.Get(i);
+
for (j = 1; j <= el.GetNP(); j++)
if (el.PNum(j) <= oldnp && !pindex.Get(el.PNum(j)))
{
@@ -781,6 +795,11 @@ namespace netgen
minh = eh;
}
+ for (i = 1; i <= locelements.Size(); i++)
+ for (j = 1; j <= locelements.Get(i).GetNP(); j++)
+ if (Dist2 (locpoints.Get(locelements.Get(i).PNum(j)), pmid) > hinner*hinner)
+ found = 0;
+
// cout << "violate = " << newedgemaxh / minh << endl;
static double maxviolate = 0;
if (newedgemaxh / minh > maxviolate)
@@ -877,6 +896,7 @@ namespace netgen
if (found && mparam.checkoverlap)
{
+ // cout << "checkoverlap" << endl;
// test for overlaps
Point3d hullmin(1e10, 1e10, 1e10);
@@ -1265,7 +1285,7 @@ namespace netgen
for (i = 1; i <= dellines.Size(); i++)
adfront -> DeleteLine (lindex.Get(dellines.Get(i)));
- // rname = rules[found]->Name();
+ // rname = rules.Get(rulenr)->Name();
#ifdef MYGRAPH
if (silentflag<3)
{
@@ -1286,7 +1306,7 @@ namespace netgen
if ( debugparam.haltsuccess || debugflag )
{
- cout << "success" << endl;
+ cout << "success of rule" << rules.Get(rulenr)->Name() << endl;
multithread.drawing = 1;
multithread.testmode = 1;
multithread.pause = 1;
@@ -1302,6 +1322,31 @@ namespace netgen
}
*/
+ (*testout) << "success of rule" << rules.Get(rulenr)->Name() << endl;
+ (*testout) << "trials = " << trials << endl;
+
+ (*testout) << "old number of lines = " << oldnl << endl;
+ for (i = 1; i <= loclines.Size(); i++)
+ {
+ (*testout) << "line ";
+ for (j = 1; j <= 2; j++)
+ {
+ int hi = 0;
+ if (loclines.Get(i).I(j) >= 1 &&
+ loclines.Get(i).I(j) <= pindex.Size())
+ hi = adfront->GetGlobalIndex (pindex.Get(loclines.Get(i).I(j)));
+
+ (*testout) << hi << " ";
+ }
+ (*testout) << " : "
+ << plainpoints.Get(loclines.Get(i).I1()) << " - "
+ << plainpoints.Get(loclines.Get(i).I2()) << " 3d: "
+ << locpoints.Get(loclines.Get(i).I1()) << " - "
+ << locpoints.Get(loclines.Get(i).I2())
+ << endl;
+ }
+
+
glrender(1);
}
@@ -1314,6 +1359,10 @@ namespace netgen
{
cout << "Problem with seg " << gpi1 << " - " << gpi2
<< ", class = " << qualclass << endl;
+
+ (*testout) << "Problem with seg " << gpi1 << " - " << gpi2
+ << ", class = " << qualclass << endl;
+
multithread.drawing = 1;
multithread.testmode = 1;
multithread.pause = 1;
@@ -1456,12 +1505,177 @@ namespace netgen
{
int i, j, k;
+ if (loclines.Size() != changeval)
+ {
+ center = Point<3>(0,0,-5);
+ rad = 0.1;
+
+ CalcTransformationMatrices();
+ changeval = loclines.Size();
+ }
+
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ SetLight();
+
+ // glEnable (GL_COLOR_MATERIAL);
+
+ // glDisable (GL_SHADING);
+ // glColor3f (0.0f, 1.0f, 1.0f);
+ // glLineWidth (1.0f);
+ // glShadeModel (GL_SMOOTH);
+
+ // glCallList (linelists.Get(1));
+
+ // SetLight();
+
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
+
+ glShadeModel (GL_SMOOTH);
+ glDisable (GL_COLOR_MATERIAL);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+ glEnable (GL_BLEND);
+ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ // glEnable (GL_LIGHTING);
+
+ double shine = vispar.shininess;
+ double transp = vispar.transp;
+
+ glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
+ glLogicOp (GL_COPY);
+
+
+
+ /*
+
+ float mat_col[] = { 0.2, 0.2, 0.8, 1 };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+
+ glPolygonOffset (1, 1);
+ glEnable (GL_POLYGON_OFFSET_FILL);
+
+ float mat_colbl[] = { 0.8, 0.2, 0.2, 1 };
+ float mat_cololdl[] = { 0.2, 0.8, 0.2, 1 };
+ float mat_colnewl[] = { 0.8, 0.8, 0.2, 1 };
+
+
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+ glPolygonOffset (1, -1);
+ glLineWidth (3);
+
+ for (i = 1; i <= loclines.Size(); i++)
+ {
+ if (i == 1)
+ {
+ glEnable (GL_POLYGON_OFFSET_FILL);
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colbl);
+ }
+ else if (i <= oldnl)
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_cololdl);
+ else
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colnewl);
+
+ int pi1 = loclines.Get(i).I1();
+ int pi2 = loclines.Get(i).I2();
+
+ if (pi1 >= 1 && pi2 >= 1)
+ {
+ Point3d p1 = locpoints.Get(pi1);
+ Point3d p2 = locpoints.Get(pi2);
+
+ glBegin (GL_LINES);
+ glVertex3f (p1.X(), p1.Y(), p1.Z());
+ glVertex3f (p2.X(), p2.Y(), p2.Z());
+ glEnd();
+ }
+
+ glDisable (GL_POLYGON_OFFSET_FILL);
+ }
+
+
+ glLineWidth (1);
+
+
+ glPointSize (5);
+ float mat_colp[] = { 1, 0, 0, 1 };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colp);
+ glBegin (GL_POINTS);
+ for (i = 1; i <= locpoints.Size(); i++)
+ {
+ Point3d p = locpoints.Get(i);
+ glVertex3f (p.X(), p.Y(), p.Z());
+ }
+ glEnd();
+
+
+ glPopMatrix();
+ */
+
+ float mat_colp[] = { 1, 0, 0, 1 };
+
+ float mat_col2d1[] = { 1, 0.5, 0.5, 1 };
+ float mat_col2d[] = { 1, 1, 1, 1 };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col2d);
+
+ double scalex = 0.1, scaley = 0.1;
+
+ glBegin (GL_LINES);
+ for (i = 1; i <= loclines.Size(); i++)
+ {
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col2d);
+ if (i == 1)
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col2d1);
+
+ int pi1 = loclines.Get(i).I1();
+ int pi2 = loclines.Get(i).I2();
+
+ if (pi1 >= 1 && pi2 >= 1)
+ {
+ Point2d p1 = plainpoints.Get(pi1);
+ Point2d p2 = plainpoints.Get(pi2);
+
+ glBegin (GL_LINES);
+ glVertex3f (scalex * p1.X(), scaley * p1.Y(), -5);
+ glVertex3f (scalex * p2.X(), scaley * p2.Y(), -5);
+ glEnd();
+ }
+ }
+ glEnd ();
+
+
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colp);
+ glBegin (GL_POINTS);
+ for (i = 1; i <= plainpoints.Size(); i++)
+ {
+ Point2d p = plainpoints.Get(i);
+ glVertex3f (scalex * p.X(), scaley * p.Y(), -5);
+ }
+ glEnd();
+
+
+
+
+
+
+ glDisable (GL_POLYGON_OFFSET_FILL);
+
+ glPopMatrix();
+ DrawCoordinateCross ();
+ DrawNetgenLogo ();
+ glFinish();
+
+ /*
+ glDisable (GL_POLYGON_OFFSET_FILL);
+
// cout << "draw surfacemeshing" << endl;
- /*
- if (changeval != stlgeometry->GetNT())
- BuildScene();
- changeval = stlgeometry->GetNT();
- */
+ //
+ // if (changeval != stlgeometry->GetNT())
+ // BuildScene();
+ // changeval = stlgeometry->GetNT();
+
glClearColor(backcolor, backcolor, backcolor, 1.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -1472,7 +1686,6 @@ namespace netgen
glLoadMatrixf (transmat);
glMultMatrixf (rotmat);
-
glShadeModel (GL_SMOOTH);
glDisable (GL_COLOR_MATERIAL);
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
@@ -1500,29 +1713,29 @@ namespace netgen
glColor3f (1.0f, 1.0f, 1.0f);
glEnable (GL_NORMALIZE);
- /*
- glBegin (GL_TRIANGLES);
- for (j = 1; j <= stlgeometry -> GetNT(); j++)
- {
- glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
- if (j == geomtrig)
- glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colrt);
+
+ // glBegin (GL_TRIANGLES);
+ // for (j = 1; j <= stlgeometry -> GetNT(); j++)
+ // {
+ // glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+ // if (j == geomtrig)
+ // glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colrt);
- const STLReadTriangle & tria = stlgeometry -> GetReadTriangle(j);
- glNormal3f (tria.normal.X(),
- tria.normal.Y(),
- tria.normal.Z());
+ // const STLReadTriangle & tria = stlgeometry -> GetReadTriangle(j);
+ // glNormal3f (tria.normal.X(),
+ // tria.normal.Y(),
+ // tria.normal.Z());
- for (k = 0; k < 3; k++)
- {
- glVertex3f (tria.pts[k].X(),
- tria.pts[k].Y(),
- tria.pts[k].Z());
- }
- }
- glEnd ();
- */
+ // for (k = 0; k < 3; k++)
+ // {
+ // glVertex3f (tria.pts[k].X(),
+ // tria.pts[k].Y(),
+ // tria.pts[k].Z());
+ // }
+ // }
+ // glEnd ();
+
glDisable (GL_POLYGON_OFFSET_FILL);
@@ -1624,6 +1837,7 @@ namespace netgen
glEnd();
glFinish();
+*/
}
diff --git a/Netgen/libsrc/meshing/meshing3.cpp b/Netgen/libsrc/meshing/meshing3.cpp
index 46b89b28cd..c349b85e79 100644
--- a/Netgen/libsrc/meshing/meshing3.cpp
+++ b/Netgen/libsrc/meshing/meshing3.cpp
@@ -11,27 +11,6 @@ double minwithoutother;
-
-
-/*
-MeshingParameters3 :: MeshingParameters3()
-{
- h = 1;
- giveuptol = 10;
- maxoutersteps = 5;
- baseelnp = 0;
- starshapeclass = 5;
- blockfill = 0;
- sloppy = 1;
- optsteps = 2;
- optstr = "cmsmdm";
-}
-*/
-
-
-
-
-
MeshingStat3d :: MeshingStat3d ()
{
cntsucc = cnttrials = cntelem = qualclass = 0;
@@ -40,16 +19,11 @@ MeshingStat3d :: MeshingStat3d ()
}
-
-
-
-Meshing3 :: Meshing3 (const char * rulefilename) //, const PlotStatistics3d * aplotstat)
- // : plotstat(aplotstat)
+Meshing3 :: Meshing3 (const string & rulefilename)
{
- int i;
tolfak = 1;
- LoadRules (rulefilename, NULL);
+ LoadRules (rulefilename.c_str(), NULL);
adfront = new AdFront3;
problems.SetSize (rules.Size());
@@ -57,7 +31,7 @@ Meshing3 :: Meshing3 (const char * rulefilename) //, const PlotStatistics3d * ap
canuse.SetSize (rules.Size());
ruleused.SetSize (rules.Size());
- for (i = 1; i <= rules.Size(); i++)
+ for (int i = 1; i <= rules.Size(); i++)
{
problems.Elem(i) = new char[255];
foundmap.Elem(i) = 0;
@@ -66,9 +40,8 @@ Meshing3 :: Meshing3 (const char * rulefilename) //, const PlotStatistics3d * ap
}
}
-Meshing3 :: Meshing3 (const char * rulefilename, const char ** rulep)
- // const PlotStatistics3d * aplotstat)
- // : plotstat(aplotstat)
+
+Meshing3 :: Meshing3 (const char ** rulep)
{
tolfak = 1;
@@ -94,35 +67,12 @@ Meshing3 :: ~Meshing3 ()
delete adfront;
for (int i = 0; i < rules.Size(); i++)
{
- delete problems[i];
+ delete [] problems[i];
delete rules[i];
}
}
-#ifdef ABC
-TerminalPlotStatistics3d :: TerminalPlotStatistics3d()
-{
- oldne = -1;
-}
-
-void TerminalPlotStatistics3d :: Plot (const MeshingStat3d & stat) const
-{
- if (stat.cntelem == oldne)
- return;
-
- ((int&)oldne) = stat.cntelem;
-
- PrintMessageCR (5, "El: ", stat.cntelem,
- // << " trials: " << stat.cnttrials
- " faces: ", stat.nff,
- " vol = ", float(100 * stat.vol / stat.vol0));
-
- multithread.percent = 100 - 100.0 * stat.vol / stat.vol0;
-}
-
-#endif
-
static double CalcLocH (const ARRAY<Point3d> & locpoints,
const ARRAY<Element2d> & locfaces,
@@ -190,7 +140,7 @@ static double CalcLocH (const ARRAY<Point3d> & locpoints,
}
-int Meshing3 :: AddPoint (const Point3d & p, INDEX globind)
+PointIndex Meshing3 :: AddPoint (const Point3d & p, PointIndex globind)
{
return adfront -> AddPoint (p, globind);
}
@@ -209,8 +159,8 @@ MESHING3_RESULT Meshing3 ::
GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
{
ARRAY<Point3d> locpoints; // local points
- ARRAY<Element2d> locfaces; // local faces
- ARRAY<PointIndex> pindex; // mapping from local to front point numbering
+ ARRAY<Element2d> locfaces; // local faces
+ ARRAY<PointIndex> pindex; // mapping from local to front point numbering
ARRAY<int> allowpoint; // point is allowd ?
ARRAY<INDEX> findex; // mapping from local to front face numbering
INDEX_2_HASHTABLE<int> connectedpairs(100); // connecgted pairs for prism meshing
@@ -272,10 +222,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
{
if (multithread.terminate)
throw NgException ("Meshing stopped");
- /*
- if (multithread.terminate)
- break;
- */
+
if (giveup)
break;
@@ -295,7 +242,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
pindex.SetSize(0);
findex.SetSize(0);
- INDEX_2_HASHTABLE<int> connectedpairs(100); // connecgted pairs for prism meshing
+ INDEX_2_HASHTABLE<int> connectedpairs(100); // connected pairs for prism meshing
// select base-element (will be locface[1])
// and get local environment of radius (safety * h)
@@ -313,6 +260,9 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
const Point3d & p2 = adfront->GetPoint (bel.PNum(2));
const Point3d & p3 = adfront->GetPoint (bel.PNum(3));
+ (*testout) << endl << "base = " << bel << endl;
+
+
Point3d pmid = Center (p1, p2, p3);
double his = (Dist (p1, p2) + Dist(p1, p3) + Dist(p2, p3)) / 3;
@@ -336,9 +286,9 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
locfacesplit);
- int pi1 = pindex.Get(locfaces.Elem(1).PNum(1));
- int pi2 = pindex.Get(locfaces.Elem(1).PNum(2));
- int pi3 = pindex.Get(locfaces.Elem(1).PNum(3));
+ int pi1 = pindex.Get(locfaces[0].PNum(1));
+ int pi2 = pindex.Get(locfaces[0].PNum(2));
+ int pi3 = pindex.Get(locfaces[0].PNum(3));
/*
(*testout) << "baseel = " << baseelem << ", ind = " << findex.Get(1) << endl;
@@ -346,23 +296,17 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
*/
loktestmode = 0;
- /*
- // 1085, 1084, 1491
- if ( (pi1 == 1085 || pi1 == 1084 || pi1 == 1491) &&
- (pi2 == 1085 || pi2 == 1084 || pi2 == 1491) &&
- (pi3 == 1085 || pi3 == 1084 || pi3 == 1491) )
- // if (findex.Get(1) == 7551)
+ // testmode = loktestmode;
+ // loktestmode = testmode = (adfront->GetFace (baseelem).GetNP() == 4) && (rules.Size() == 5);
+
+ if (testmode)
{
- (*testout) << "baseel = " << findex.Get(1) << ", points: ";
- for (i = 1; i <= pindex.Size(); i++)
- (*testout) << pindex.Get(i) << " ";
- (*testout) << endl;
- loktestmode = 1;
+ (*testout) << "baseelem = " << baseelem << " qualclass = " << stat.qualclass << endl;
+ (*testout) << "locpoints = " << endl << locpoints << endl;
+ (*testout) << "connected = " << endl << connectedpairs << endl;
}
- */
- // testmode = loktestmode;
- // cout << "baseelem = " << baseelem << " qualclass = " << stat.qualclass << endl;
+
// loch = CalcLocH (locpoints, locfaces, h);
@@ -385,6 +329,8 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
for (i = 1; i <= allowpoint.Size(); i++)
allowpoint.Elem(i) = 1;
+
+
if (stat.qualclass >= mp.starshapeclass)
@@ -488,7 +434,18 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
}
trans.ToPlain (locpoints, plainpoints);
+
+
+ for (i = 1; i <= allowpoint.Size(); i++)
+ {
+ if (plainpoints.Get(i).Z() > 0)
+ allowpoint.Elem(i) = 0;
+ }
+
+ if (loktestmode)
+ (*testout) << "plainpoints = " << endl << plainpoints << endl;
+
stat.cnttrials++;
diff --git a/Netgen/libsrc/meshing/meshing3.hpp b/Netgen/libsrc/meshing/meshing3.hpp
index e6829554fa..45f44751e3 100644
--- a/Netgen/libsrc/meshing/meshing3.hpp
+++ b/Netgen/libsrc/meshing/meshing3.hpp
@@ -4,47 +4,6 @@
-// class PlotStatistics3d;
-
-
-/*
-///
-class MeshingParameters3
-{
-public:
- /// global h
- double h;
-
- /// give up quality class
- int giveuptol;
-
- /// maximal outer steps
- int maxoutersteps;
-
- /// if non-zero, baseelement must have baseelnp points
- int baseelnp;
-
- /// class starting star-shape filling
- int starshapeclass;
-
- /// call blockfill function
- int blockfill;
-
- /// quality tolerances are handled less careful
- double sloppy;
-
- /// number of optimizationsteps
- int optsteps;
-
- ///
- char * optstr;
-
- ///
- MeshingParameters3();
-};
-*/
-
-
enum MESHING3_RESULT
{
MESHING3_OK = 0,
@@ -71,9 +30,9 @@ class Meshing3
double tolfak;
public:
///
- Meshing3 (const char * rulefilename);
+ Meshing3 (const string & rulefilename);
///
- Meshing3 (const char * rulefilename, const char ** rulep);
+ Meshing3 (const char ** rulep);
///
virtual ~Meshing3 ();
@@ -92,7 +51,7 @@ public:
float & retminerr);
///
- int AddPoint (const Point3d & p, INDEX globind);
+ PointIndex AddPoint (const Point3d & p, PointIndex globind);
///
void AddBoundaryElement (const Element2d & elem);
///
@@ -141,29 +100,6 @@ public:
};
-/*
-///
-class PlotStatistics3d
-{
-public:
- ///
- PlotStatistics3d () { }
- ///
- virtual void Plot (const MeshingStat3d & stat) const = 0;
-};
-
-
-///
-class TerminalPlotStatistics3d : public PlotStatistics3d
-{
- int oldne;
-public:
- ///
- TerminalPlotStatistics3d ();
- ///
- virtual void Plot (const MeshingStat3d & stat) const;
-};
-*/
diff --git a/Netgen/libsrc/meshing/meshtool.cpp b/Netgen/libsrc/meshing/meshtool.cpp
index 127d047820..89bb2b16dd 100644
--- a/Netgen/libsrc/meshing/meshtool.cpp
+++ b/Netgen/libsrc/meshing/meshtool.cpp
@@ -7,113 +7,113 @@
namespace netgen
{
-int CheckSurfaceMesh (const Mesh & mesh)
-{
- PrintMessage (3, "Check Surface mesh");
+ int CheckSurfaceMesh (const Mesh & mesh)
+ {
+ PrintMessage (3, "Check Surface mesh");
- int nf = mesh.GetNSE();
- INDEX_2_HASHTABLE<int> edges(nf+2);
- int i, j;
- INDEX_2 i2;
- int cnt1 = 0, cnt2 = 0;
+ int nf = mesh.GetNSE();
+ INDEX_2_HASHTABLE<int> edges(nf+2);
+ int i, j;
+ INDEX_2 i2;
+ int cnt1 = 0, cnt2 = 0;
+
+ for (i = 1; i <= nf; i++)
+ for (j = 1; j <= 3; j++)
+ {
+ i2.I1() = mesh.SurfaceElement(i).PNumMod(j);
+ i2.I2() = mesh.SurfaceElement(i).PNumMod(j+1);
+ if (edges.Used(i2))
+ {
+ int hi;
+ hi = edges.Get(i2);
+ if (hi != 1)
+ PrintSysError ("CheckSurfaceMesh, hi = ", hi);
+ edges.Set(i2, 2);
+ cnt2++;
+ }
+ else
+ {
+ Swap (i2.I1(), i2.I2());
+ edges.Set(i2, 1);
+ cnt1++;
+ }
+ }
- std::cout<<"MeshTool"<<std::endl;
- for (i = 1; i <= nf; i++)
- for (j = 1; j <= 3; j++)
+ if (cnt1 != cnt2)
{
- i2.I1() = mesh.SurfaceElement(i).PNumMod(j);
- i2.I2() = mesh.SurfaceElement(i).PNumMod(j+1);
- if (edges.Used(i2))
- {
- int hi;
- hi = edges.Get(i2);
- if (hi != 1)
- PrintSysError ("CheckSurfaceMesh, hi = ", hi);
- edges.Set(i2, 2);
- cnt2++;
- }
- else
- {
- Swap (i2.I1(), i2.I2());
- edges.Set(i2, 1);
- cnt1++;
- }
+ PrintUserError ("Surface mesh not consistent");
+ // MyBeep(2);
+ // (*mycout) << "cnt1 = " << cnt1 << " cnt2 = " << cnt2 << endl;
+ return 0;
}
-
+ return 1;
+ }
- if (cnt1 != cnt2)
- {
- PrintUserError ("Surface mesh not consistent");
- // MyBeep(2);
- // (*mycout) << "cnt1 = " << cnt1 << " cnt2 = " << cnt2 << endl;
- return 0;
- }
- return 1;
-}
+ int CheckSurfaceMesh2 (const Mesh & mesh)
+ {
+ int i, j, k;
+ const Point3d *tri1[3], *tri2[3];
-int CheckSurfaceMesh2 (const Mesh & mesh)
-{
- int i, j, k;
- const Point3d *tri1[3], *tri2[3];
+ for (i = 1; i <= mesh.GetNOpenElements(); i++)
+ {
+ PrintDot ();
+ for (j = 1; j < i; j++)
+ {
+ for (k = 1; k <= 3; k++)
+ {
+ tri1[k-1] = &mesh.Point (mesh.OpenElement(i).PNum(k));
+ tri2[k-1] = &mesh.Point (mesh.OpenElement(j).PNum(k));
+ }
+ if (IntersectTriangleTriangle (&tri1[0], &tri2[0]))
+ {
+ PrintSysError ("Surface elements are intersecting");
+ (*testout) << "Intersecting: " << endl;
+ for (k = 0; k <= 2; k++)
+ (*testout) << *tri1[k] << " ";
+ (*testout) << endl;
+ for (k = 0; k <= 2; k++)
+ (*testout) << *tri2[k] << " ";
+ (*testout) << endl;
+ }
+
+ }
+ }
+ return 0;
+ }
- for (i = 1; i <= mesh.GetNOpenElements(); i++)
- {
- PrintDot ();
- for (j = 1; j < i; j++)
- {
- for (k = 1; k <= 3; k++)
- {
- tri1[k-1] = &mesh.Point (mesh.OpenElement(i).PNum(k));
- tri2[k-1] = &mesh.Point (mesh.OpenElement(j).PNum(k));
- }
- if (IntersectTriangleTriangle (&tri1[0], &tri2[0]))
- {
- PrintSysError ("Surface elements are intersecting");
- (*testout) << "Intersecting: " << endl;
- for (k = 0; k <= 2; k++)
- (*testout) << *tri1[k] << " ";
- (*testout) << endl;
- for (k = 0; k <= 2; k++)
- (*testout) << *tri2[k] << " ";
- (*testout) << endl;
- }
- }
- }
- return 0;
-}
+ static double TriangleQualityInst (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3)
+ {
+ // quality 0 (worst) .. 1 (optimal)
+ Vec3d v1, v2, v3;
+ double s1, s2, s3;
+ double an1, an2, an3;
-static double TriangleQualityInst (const Point3d & p1, const Point3d & p2,
- const Point3d & p3)
-{
- // quality 0 (worst) .. 1 (optimal)
+ v1 = p2 - p1;
+ v2 = p3 - p1;
+ v3 = p3 - p2;
- Vec3d v1, v2, v3;
- double s1, s2, s3;
- double an1, an2, an3;
+ an1 = Angle (v1, v2);
+ v1 *= -1;
+ an2 = Angle (v1, v3);
+ an3 = Angle (v2, v3);
- v1 = p2 - p1;
- v2 = p3 - p1;
- v3 = p3 - p2;
+ s1 = sin (an1/2);
+ s2 = sin (an2/2);
+ s3 = sin (an3/2);
- an1 = Angle (v1, v2);
- v1 *= -1;
- an2 = Angle (v1, v3);
- an3 = Angle (v2, v3);
+ return 8 * s1 * s2 * s3;
+ }
- s1 = sin (an1/2);
- s2 = sin (an2/2);
- s3 = sin (an3/2);
- return 8 * s1 * s2 * s3;
-}
@@ -126,118 +126,227 @@ static double TriangleQualityInst (const Point3d & p1, const Point3d & p2,
+ void MeshQuality2d (const Mesh & mesh)
+ {
+ int ncl = 20, cl;
+ ARRAY<INDEX> incl(ncl);
+ INDEX i;
+ SurfaceElementIndex sei;
+ double qual;
+ incl = 0;
-void MeshQuality2d (const Mesh & mesh)
-{
- int ncl = 20, cl;
- ARRAY<INDEX> incl(ncl);
- INDEX i;
- SurfaceElementIndex sei;
- double qual;
+ for (sei = 0; sei < mesh.GetNSE(); sei++)
+ {
+ qual = TriangleQualityInst (mesh[mesh[sei][0]],
+ mesh[mesh[sei][1]],
+ mesh[mesh[sei][2]]);
- incl = 0;
+ cl = int ( (ncl-1e-3) * qual ) + 1;
+ incl.Elem(cl)++;
+ }
- for (sei = 0; sei < mesh.GetNSE(); sei++)
- {
- qual = TriangleQualityInst (mesh[mesh[sei][0]],
- mesh[mesh[sei][1]],
- mesh[mesh[sei][2]]);
+ (*testout) << endl << endl;
- cl = int ( (ncl-1e-3) * qual ) + 1;
- incl.Elem(cl)++;
- }
+ (*testout) << "Points: " << mesh.GetNP() << endl;
+ (*testout) << "Surface Elements: " << mesh.GetNSE() << endl;
+ (*testout) << endl;
+ (*testout) << "Elements in qualityclasses:" << endl;
+ (*testout).precision(2);
+ for (i = 1; i <= ncl; i++)
+ {
+ (*testout) << setw(4) << double (i-1)/ncl << " - "
+ << setw(4) << double (i) / ncl << ": "
+ << incl.Get(i) << endl;
+ }
+ }
- (*testout) << endl << endl;
- (*testout) << "Points: " << mesh.GetNP() << endl;
- (*testout) << "Surface Elements: " << mesh.GetNSE() << endl;
+ static double TetElementQuality (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4)
+ {
+ double vol, l, l4, l5, l6;
- (*testout) << endl;
- (*testout) << "Elements in qualityclasses:" << endl;
- (*testout).precision(2);
- for (i = 1; i <= ncl; i++)
- {
- (*testout) << setw(4) << double (i-1)/ncl << " - "
- << setw(4) << double (i) / ncl << ": "
- << incl.Get(i) << endl;
- }
-}
+ Vec3d v1 = p2 - p1;
+ Vec3d v2 = p3 - p1;
+ Vec3d v3 = p4 - p1;
-static double TetElementQuality (const Point3d & p1, const Point3d & p2,
- const Point3d & p3, const Point3d & p4)
-{
- double vol, l, l4, l5, l6;
+ vol = fabs ((Cross (v1, v2) * v3)) / 6;
+ l4 = Dist (p2, p3);
+ l5 = Dist (p2, p4);
+ l6 = Dist (p3, p4);
+ l = v1.Length() + v2.Length() + v3.Length() + l4 + l5 + l6;
- Vec3d v1 = p2 - p1;
- Vec3d v2 = p3 - p1;
- Vec3d v3 = p4 - p1;
+ if (vol <= 1e-8 * l * l * l) return 1e-10;
- vol = fabs ((Cross (v1, v2) * v3)) / 6;
- l4 = Dist (p2, p3);
- l5 = Dist (p2, p4);
- l6 = Dist (p3, p4);
+ return vol/(l*l*l) * 1832.82; // 6^4 * sqrt(2)
+ }
- l = v1.Length() + v2.Length() + v3.Length() + l4 + l5 + l6;
- if (vol <= 1e-8 * l * l * l) return 1e-10;
- return vol/(l*l*l) * 1832.82; // 6^4 * sqrt(2)
-}
+ double teterrpow = 2;
+ double CalcTetBadness (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4, double h)
+ {
+ double vol, l, ll, lll, ll1, ll2, ll3, ll4, ll5, ll6;
+ double err;
+ Vec3d v1 (p1, p2);
+ Vec3d v2 (p1, p3);
+ Vec3d v3 (p1, p4);
-double teterrpow = 2;
+ vol = -Determinant (v1, v2, v3) / 6;
+ ll1 = v1.Length2();
+ ll2 = v2.Length2();
+ ll3 = v3.Length2();
+ ll4 = Dist2 (p2, p3);
+ ll5 = Dist2 (p2, p4);
+ ll6 = Dist2 (p3, p4);
-double CalcTetBadnessNew (const Point3d & p1, const Point3d & p2,
- const Point3d & p3, const Point3d & p4, double h)
-{
- double vol, l, ll, lll, ll1, ll2, ll3, ll4, ll5, ll6;
- double err;
+ ll = ll1 + ll2 + ll3 + ll4 + ll5 + ll6;
+ l = sqrt (ll);
+ lll = l * ll;
- Vec3d v1 (p1, p2);
- Vec3d v2 (p1, p3);
- Vec3d v3 (p1, p4);
+ if (vol <= 1e-24 * lll)
+ return 1e24;
- vol = Determinant (v1, v2, v3) / 6;
+ err = 0.0080187537 * lll / vol; // sqrt(216) / (6^4 * sqrt(2))
- ll1 = v1.Length2();
- ll2 = v2.Length2();
- ll3 = v3.Length2();
- ll4 = Dist2 (p2, p3);
- ll5 = Dist2 (p2, p4);
- ll6 = Dist2 (p3, p4);
+ if (h > 0)
+ err += ll / (h * h) +
+ h * h * ( 1 / ll1 + 1 / ll2 + 1 / ll3 +
+ 1 / ll4 + 1 / ll5 + 1 / ll6 ) - 12;
- ll = ll1 + ll2 + ll3 + ll4 + ll5 + ll6;
- l = sqrt (ll);
- lll = l * ll;
+ return pow (err, teterrpow);
+ }
- if (vol <= 1e-24 * lll)
- return 1e24;
- err = (lll) / (1832.82 * vol); // 6^4 * sqrt(2)
+ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4, double h,
+ int pi, Vec3d & grad)
+ {
+ double vol, l, ll, lll;
+ double err;
- if (h > 0)
- err += ll / (h * h) +
- h * h * ( 1 / ll1 + 1 / ll2 + 1 / ll3 +
- 1 / ll4 + 1 / ll5 + 1 / ll6 ) - 12;
+ const Point3d *pp1, *pp2, *pp3, *pp4;
- return pow (err, teterrpow);
-}
+ pp1 = &p1;
+ pp2 = &p2;
+ pp3 = &p3;
+ pp4 = &p4;
+
+ switch (pi)
+ {
+ case 2:
+ {
+ swap (pp1, pp2);
+ swap (pp3, pp4);
+ break;
+ }
+ case 3:
+ {
+ swap (pp1, pp3);
+ swap (pp2, pp4);
+ break;
+ }
+ case 4:
+ {
+ swap (pp1, pp4);
+ swap (pp3, pp2);
+ break;
+ }
+ }
+
+ Vec3d v1 (*pp1, *pp2);
+ Vec3d v2 (*pp1, *pp3);
+ Vec3d v3 (*pp1, *pp4);
+ Vec3d v4 (*pp2, *pp3);
+ Vec3d v5 (*pp2, *pp4);
+ Vec3d v6 (*pp3, *pp4);
+ vol = -Determinant (v1, v2, v3) / 6;
+ Vec3d gradvol;
+ Cross (v5, v4, gradvol);
+ gradvol *= (-1.0/6.0);
-double CalcTetBadness (const Point3d & p1, const Point3d & p2,
- const Point3d & p3, const Point3d & p4, double h)
-{
+
+ double ll1 = v1.Length2();
+ double ll2 = v2.Length2();
+ double ll3 = v3.Length2();
+ double ll4 = v4.Length2();
+ double ll5 = v5.Length2();
+ double ll6 = v6.Length2();
+
+ ll = ll1 + ll2 + ll3 + ll4 + ll5 + ll6;
+ l = sqrt (ll);
+ lll = l * ll;
+
+ if (vol <= 1e-24 * lll)
+ {
+ grad = Vec3d (0, 0, 0);
+ return 1e24;
+ }
+
+
+
+ Vec3d gradll1 (*pp2, *pp1);
+ Vec3d gradll2 (*pp3, *pp1);
+ Vec3d gradll3 (*pp4, *pp1);
+ gradll1 *= 2;
+ gradll2 *= 2;
+ gradll3 *= 2;
+
+ Vec3d gradll (gradll1);
+ gradll += gradll2;
+ gradll += gradll3;
+
+
+
+ err = 0.0080187537 * lll / vol;
+
+
+ gradll *= (0.0080187537 * 1.5 * l / vol);
+ Vec3d graderr(gradll);
+ gradvol *= ( -0.0080187537 * lll / (vol * vol) );
+ graderr += gradvol;
+
+ if (h > 0)
+ {
+ err += ll / (h*h) +
+ h*h * ( 1 / ll1 + 1 / ll2 + 1 / ll3 +
+ 1 / ll4 + 1 / ll5 + 1 / ll6 ) - 12;
+
+ graderr += (1/(h*h) - h*h/(ll1*ll1)) * gradll1;
+ graderr += (1/(h*h) - h*h/(ll2*ll2)) * gradll2;
+ graderr += (1/(h*h) - h*h/(ll3*ll3)) * gradll3;
+ cout << "?";
+ }
+
+ double errpow = pow (err, teterrpow);
+ grad = (teterrpow * errpow / err) * graderr;
+
+ return errpow;
+ }
+
+
+
+
+
+ /*
+
+ double CalcTetBadness (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4, double h)
+ {
double vol, l;
double err;
@@ -257,26 +366,29 @@ double CalcTetBadness (const Point3d & p1, const Point3d & p2,
l = l1 + l2 + l3 + l4 + l5 + l6;
+ // just for timing
+ // l += 1e-40 * CalcTetBadnessNew (p1, p2, p3, p4, h);
+
if (vol <= 1e-24 * l * l * l)
- {
- return 1e24;
- }
+ {
+ return 1e24;
+ }
err = (l*l*l) / (1832.82 * vol); // 6^4 * sqrt(2)
if (h > 0)
- err += l / h +
- h * (1 / l1 + 1/l2 + 1/l3 + 1/l4 + 1/l5 + 1/l6) - 12;
+ err += l / h +
+ h * (1 / l1 + 1/l2 + 1/l3 + 1/l4 + 1/l5 + 1/l6) - 12;
return pow (err, teterrpow);
-}
+ }
-double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
- const Point3d & p3, const Point3d & p4, double h,
- int pi, Vec3d & grad)
-{
+ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4, double h,
+ int pi, Vec3d & grad)
+ {
double vol, l;
double err;
@@ -288,26 +400,26 @@ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
pp4 = &p4;
switch (pi)
- {
- case 2:
- {
- Swap (pp1, pp2);
- Swap (pp3, pp4);
- break;
- }
- case 3:
- {
- Swap (pp1, pp3);
- Swap (pp2, pp4);
- break;
- }
- case 4:
- {
- Swap (pp1, pp4);
- Swap (pp3, pp2);
- break;
- }
- }
+ {
+ case 2:
+ {
+ swap (pp1, pp2);
+ swap (pp3, pp4);
+ break;
+ }
+ case 3:
+ {
+ swap (pp1, pp3);
+ swap (pp2, pp4);
+ break;
+ }
+ case 4:
+ {
+ swap (pp1, pp4);
+ swap (pp3, pp2);
+ break;
+ }
+ }
Vec3d v1 (*pp1, *pp2);
@@ -318,11 +430,11 @@ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
Vec3d v5 (*pp2, *pp4);
Vec3d v6 (*pp3, *pp4);
- /*
- Vec3d n;
- Cross (v1, v2, n);
- vol = - (n * v3) / 6;
- */
+
+ // Vec3d n;
+ // Cross (v1, v2, n);
+ // vol = - (n * v3) / 6;
+
vol = -Determinant (v1, v2, v3) / 6;
@@ -353,10 +465,10 @@ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
if (vol <= 1e-24 * l * l * l)
- {
- grad = Vec3d (0, 0, 0);
- return 1e24;
- }
+ {
+ grad = Vec3d (0, 0, 0);
+ return 1e24;
+ }
double c1 = 1.0 / 1832.82; // 6^4 * sqrt(2)
@@ -369,228 +481,229 @@ double CalcTetBadnessGrad (const Point3d & p1, const Point3d & p2,
graderr+= gradvol;
if (h > 0)
- {
- err += l / h +
- h * ( 1 / l1 + 1 / l2 + 1 / l3 +
- 1 / l4 + 1 / l5 + 1 / l6 ) - 12;
+ {
+ err += l / h +
+ h * ( 1 / l1 + 1 / l2 + 1 / l3 +
+ 1 / l4 + 1 / l5 + 1 / l6 ) - 12;
- graderr += (1/h - h/(l1*l1)) * gradl1;
- graderr += (1/h - h/(l2*l2)) * gradl2;
- graderr += (1/h - h/(l3*l3)) * gradl3;
- cout << "?";
- }
+ graderr += (1/h - h/(l1*l1)) * gradl1;
+ graderr += (1/h - h/(l2*l2)) * gradl2;
+ graderr += (1/h - h/(l3*l3)) * gradl3;
+ cout << "?";
+ }
double errpow = pow (err, teterrpow);
grad = (teterrpow * errpow / err) * graderr;
return errpow;
-}
+ }
+ */
-/*
-double CalcVolume (const ARRAY<Point3d> & points,
- const Element & el)
- {
- Vec3d v1 = points.Get(el.PNum(2)) -
- points.Get(el.PNum(1));
- Vec3d v2 = points.Get(el.PNum(3)) -
- points.Get(el.PNum(1));
- Vec3d v3 = points.Get(el.PNum(4)) -
- points.Get(el.PNum(1));
+ /*
+ double CalcVolume (const ARRAY<Point3d> & points,
+ const Element & el)
+ {
+ Vec3d v1 = points.Get(el.PNum(2)) -
+ points.Get(el.PNum(1));
+ Vec3d v2 = points.Get(el.PNum(3)) -
+ points.Get(el.PNum(1));
+ Vec3d v3 = points.Get(el.PNum(4)) -
+ points.Get(el.PNum(1));
- return -(Cross (v1, v2) * v3) / 6;
- }
+ return -(Cross (v1, v2) * v3) / 6;
+ }
*/
-double CalcVolume (const ARRAY<Point3d> & points,
- const ARRAY<Element> & elements)
-{
- double vol;
- Vec3d v1, v2, v3;
+ double CalcVolume (const ARRAY<Point3d> & points,
+ const ARRAY<Element> & elements)
+ {
+ double vol;
+ Vec3d v1, v2, v3;
- vol = 0;
- for (int i = 0; i < elements.Size(); i++)
- {
- v1 = points.Get(elements[i][1]) - points.Get(elements[i][0]);
- v2 = points.Get(elements[i][2]) - points.Get(elements[i][0]);
- v3 = points.Get(elements[i][3]) - points.Get(elements[i][0]);
- vol -= (Cross (v1, v2) * v3) / 6;
- }
- return vol;
-}
+ vol = 0;
+ for (int i = 0; i < elements.Size(); i++)
+ {
+ v1 = points.Get(elements[i][1]) - points.Get(elements[i][0]);
+ v2 = points.Get(elements[i][2]) - points.Get(elements[i][0]);
+ v3 = points.Get(elements[i][3]) - points.Get(elements[i][0]);
+ vol -= (Cross (v1, v2) * v3) / 6;
+ }
+ return vol;
+ }
-void MeshQuality3d (const Mesh & mesh, ARRAY<int> * inclass)
-{
- int ncl = 20;
- signed int cl;
- ARRAY<INDEX> incl(ncl);
- INDEX i;
- double qual;
- double sum = 0;
- int nontet = 0;
+ void MeshQuality3d (const Mesh & mesh, ARRAY<int> * inclass)
+ {
+ int ncl = 20;
+ signed int cl;
+ ARRAY<INDEX> incl(ncl);
+ INDEX i;
+ double qual;
+ double sum = 0;
+ int nontet = 0;
- for (i = 1; i <= incl.Size(); i++)
- incl.Elem(i) = 0;
+ for (i = 1; i <= incl.Size(); i++)
+ incl.Elem(i) = 0;
- for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
- {
- if (mesh[ei].GetType() != TET)
- {
- nontet++;
- continue;
- }
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ {
+ if (mesh[ei].GetType() != TET)
+ {
+ nontet++;
+ continue;
+ }
+
+ qual = TetElementQuality (mesh.Point(mesh[ei][0]),
+ mesh.Point(mesh[ei][1]),
+ mesh.Point(mesh[ei][2]),
+ mesh.Point(mesh[ei][3]));
+
+ if (qual > 1) qual = 1;
+ cl = int (ncl * qual ) + 1;
+
+ if (cl < 1) cl = 1;
+ if (cl > ncl) cl = ncl;
- qual = TetElementQuality (mesh.Point(mesh[ei][0]),
- mesh.Point(mesh[ei][1]),
- mesh.Point(mesh[ei][2]),
- mesh.Point(mesh[ei][3]));
+ incl.Elem(cl)++;
+ if (inclass) (*inclass)[ei] = cl;
+ sum += 1/qual;
+ }
- if (qual > 1) qual = 1;
- cl = int (ncl * qual ) + 1;
-
- if (cl < 1) cl = 1;
- if (cl > ncl) cl = ncl;
-
- incl.Elem(cl)++;
- if (inclass) (*inclass)[ei] = cl;
- sum += 1/qual;
- }
-
- (*testout) << endl << endl;
- (*testout) << "Points: " << mesh.GetNP() << endl;
- (*testout) << "Volume Elements: " << mesh.GetNE() << endl;
- if (nontet)
- (*testout) << nontet << " non tetrahedral elements" << endl;
- (*testout) << endl;
-
- (*testout) << "Volume elements in qualityclasses:" << endl;
- (*testout).precision(2);
- for (i = 1; i <= ncl; i++)
- {
- (*testout) << setw(4) << double (i-1)/ncl << " - "
- << setw(4) << double (i) / ncl << ": "
- << incl.Get(i) << endl;
- }
- (*testout) << "total error: " << sum << endl;
-}
+ (*testout) << endl << endl;
+ (*testout) << "Points: " << mesh.GetNP() << endl;
+ (*testout) << "Volume Elements: " << mesh.GetNE() << endl;
+ if (nontet)
+ (*testout) << nontet << " non tetrahedral elements" << endl;
+ (*testout) << endl;
+
+ (*testout) << "Volume elements in qualityclasses:" << endl;
+ (*testout).precision(2);
+ for (i = 1; i <= ncl; i++)
+ {
+ (*testout) << setw(4) << double (i-1)/ncl << " - "
+ << setw(4) << double (i) / ncl << ": "
+ << incl.Get(i) << endl;
+ }
+ (*testout) << "total error: " << sum << endl;
+ }
-void SaveEdges (const Mesh & mesh, const char * geomfile, double h, char * filename)
-{
- ofstream of (filename);
- int i;
- const Segment * seg;
+ void SaveEdges (const Mesh & mesh, const char * geomfile, double h, char * filename)
+ {
+ ofstream of (filename);
+ int i;
+ const Segment * seg;
- of << "edges" << endl;
- of << geomfile << endl;
- of << h << endl;
-
- of << mesh.GetNP() << endl;
- for (i = 1; i <= mesh.GetNP(); i++)
- of << mesh.Point(i).X() << " "
- << mesh.Point(i).Y() << " "
- << mesh.Point(i).Z() << "\n";
+ of << "edges" << endl;
+ of << geomfile << endl;
+ of << h << endl;
+
+ of << mesh.GetNP() << endl;
+ for (i = 1; i <= mesh.GetNP(); i++)
+ of << mesh.Point(i).X() << " "
+ << mesh.Point(i).Y() << " "
+ << mesh.Point(i).Z() << "\n";
- of << 2 * mesh.GetNSeg() << endl;
- for (i = 1; i <= mesh.GetNSeg(); i++)
- {
- seg = &mesh.LineSegment(i);
+ of << 2 * mesh.GetNSeg() << endl;
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ seg = &mesh.LineSegment(i);
- of << seg->p2 << " " << seg->p1 << " " << seg->si << "\n";
- }
+ of << seg->p2 << " " << seg->p1 << " " << seg->si << "\n";
+ }
-}
+ }
-void SaveSurfaceMesh (const Mesh & mesh,
- double h,
- char * filename)
+ void SaveSurfaceMesh (const Mesh & mesh,
+ double h,
+ char * filename)
-{
- INDEX i;
+ {
+ INDEX i;
- ofstream outfile(filename);
+ ofstream outfile(filename);
- outfile << "surfacemesh" << endl;
- outfile << h << endl;
+ outfile << "surfacemesh" << endl;
+ outfile << h << endl;
- outfile << mesh.GetNP() << endl;
- for (i = 1; i <= mesh.GetNP(); i++)
- outfile << mesh.Point(i).X() << " "
- << mesh.Point(i).Y() << " "
- << mesh.Point(i).Z() << endl;
+ outfile << mesh.GetNP() << endl;
+ for (i = 1; i <= mesh.GetNP(); i++)
+ outfile << mesh.Point(i).X() << " "
+ << mesh.Point(i).Y() << " "
+ << mesh.Point(i).Z() << endl;
- outfile << mesh.GetNSE() << endl;
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
-
- if (mesh.GetFaceDescriptor(el.GetIndex()).DomainOut() == 0)
- outfile << mesh.SurfaceElement(i).PNum(1) << " "
- << mesh.SurfaceElement(i).PNum(2) << " "
- << mesh.SurfaceElement(i).PNum(3) << endl;
- if (mesh.GetFaceDescriptor(el.GetIndex()).DomainIn() == 0)
- outfile << mesh.SurfaceElement(i).PNum(1) << " "
- << mesh.SurfaceElement(i).PNum(3) << " "
- << mesh.SurfaceElement(i).PNum(2) << endl;
- }
-}
+ outfile << mesh.GetNSE() << endl;
+ for (i = 1; i <= mesh.GetNSE(); i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+
+ if (mesh.GetFaceDescriptor(el.GetIndex()).DomainOut() == 0)
+ outfile << mesh.SurfaceElement(i).PNum(1) << " "
+ << mesh.SurfaceElement(i).PNum(2) << " "
+ << mesh.SurfaceElement(i).PNum(3) << endl;
+ if (mesh.GetFaceDescriptor(el.GetIndex()).DomainIn() == 0)
+ outfile << mesh.SurfaceElement(i).PNum(1) << " "
+ << mesh.SurfaceElement(i).PNum(3) << " "
+ << mesh.SurfaceElement(i).PNum(2) << endl;
+ }
+ }
#ifdef OLD
-void Save2DMesh (
- const Mesh & mesh2d,
- const ARRAY<SplineSegment *> * splines,
- ostream & outfile)
+ void Save2DMesh (
+ const Mesh & mesh2d,
+ const ARRAY<SplineSegment *> * splines,
+ ostream & outfile)
-{
- int i, j;
- outfile.precision (6);
+ {
+ int i, j;
+ outfile.precision (6);
- outfile << "areamesh2" << endl;
+ outfile << "areamesh2" << endl;
- outfile << endl;
- outfile << mesh2d.GetNSeg() << endl;
- for (i = 1; i <= mesh2d.GetNSeg(); i++)
- outfile << mesh2d.LineSegment(i).si << " "
- << mesh2d.LineSegment(i).p1 << " "
- << mesh2d.LineSegment(i).p2 << " " << endl;
+ outfile << endl;
+ outfile << mesh2d.GetNSeg() << endl;
+ for (i = 1; i <= mesh2d.GetNSeg(); i++)
+ outfile << mesh2d.LineSegment(i).si << " "
+ << mesh2d.LineSegment(i).p1 << " "
+ << mesh2d.LineSegment(i).p2 << " " << endl;
- outfile << mesh2d.GetNSE() << endl;
- for (i = 1; i <= mesh2d.GetNSE(); i++)
- {
- outfile << mesh2d.SurfaceElement(i).GetIndex() << " ";
- outfile << mesh2d.SurfaceElement(i).GetNP() << " ";
- for (j = 1; j <= mesh2d.SurfaceElement(i).GetNP(); j++)
- outfile << mesh2d.SurfaceElement(i).PNum(j) << " ";
- outfile << endl;
- }
-
- outfile << mesh2d.GetNP() << endl;
- for (i = 1; i <= mesh2d.GetNP(); i++)
- outfile << mesh2d.Point(i).X() << " "
- << mesh2d.Point(i).Y() << endl;
-
- if (splines)
- {
- outfile << splines->Size() << endl;
- for (i = 1; i <= splines->Size(); i++)
- splines->Get(i) -> PrintCoeff (outfile);
- }
- else
- outfile << "0" << endl;
-}
+ outfile << mesh2d.GetNSE() << endl;
+ for (i = 1; i <= mesh2d.GetNSE(); i++)
+ {
+ outfile << mesh2d.SurfaceElement(i).GetIndex() << " ";
+ outfile << mesh2d.SurfaceElement(i).GetNP() << " ";
+ for (j = 1; j <= mesh2d.SurfaceElement(i).GetNP(); j++)
+ outfile << mesh2d.SurfaceElement(i).PNum(j) << " ";
+ outfile << endl;
+ }
+
+ outfile << mesh2d.GetNP() << endl;
+ for (i = 1; i <= mesh2d.GetNP(); i++)
+ outfile << mesh2d.Point(i).X() << " "
+ << mesh2d.Point(i).Y() << endl;
+
+ if (splines)
+ {
+ outfile << splines->Size() << endl;
+ for (i = 1; i <= splines->Size(); i++)
+ splines->Get(i) -> PrintCoeff (outfile);
+ }
+ else
+ outfile << "0" << endl;
+ }
#endif
@@ -600,266 +713,266 @@ void Save2DMesh (
-void SaveVolumeMesh (const Mesh & mesh,
- const CSGeometry & geometry,
- char * filename)
-{
- INDEX i;
+ void SaveVolumeMesh (const Mesh & mesh,
+ const CSGeometry & geometry,
+ char * filename)
+ {
+ INDEX i;
- ofstream outfile(filename);
- outfile << "volumemesh" << endl;
+ ofstream outfile(filename);
+ outfile << "volumemesh" << endl;
- outfile << mesh.GetNSE() << endl;
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- if (mesh.SurfaceElement(i).GetIndex())
- outfile << mesh.GetFaceDescriptor(mesh.SurfaceElement(i).GetIndex ()).SurfNr()
- << "\t";
- else
- outfile << "0" << "\t";
- outfile << mesh.SurfaceElement(i)[0] << " "
- << mesh.SurfaceElement(i)[1] << " "
- << mesh.SurfaceElement(i)[2] << endl;
- }
- outfile << mesh.GetNE() << endl;
- for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
- outfile << mesh[ei].GetIndex() << "\t"
- << mesh[ei][0] << " " << mesh[ei][1] << " "
- << mesh[ei][2] << " " << mesh[ei][3] << endl;
-
- outfile << mesh.GetNP() << endl;
- for (i = 1; i <= mesh.GetNP(); i++)
- outfile << mesh.Point(i).X() << " "
- << mesh.Point(i).Y() << " "
- << mesh.Point(i).Z() << endl;
+ outfile << mesh.GetNSE() << endl;
+ for (i = 1; i <= mesh.GetNSE(); i++)
+ {
+ if (mesh.SurfaceElement(i).GetIndex())
+ outfile << mesh.GetFaceDescriptor(mesh.SurfaceElement(i).GetIndex ()).SurfNr()
+ << "\t";
+ else
+ outfile << "0" << "\t";
+ outfile << mesh.SurfaceElement(i)[0] << " "
+ << mesh.SurfaceElement(i)[1] << " "
+ << mesh.SurfaceElement(i)[2] << endl;
+ }
+ outfile << mesh.GetNE() << endl;
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ outfile << mesh[ei].GetIndex() << "\t"
+ << mesh[ei][0] << " " << mesh[ei][1] << " "
+ << mesh[ei][2] << " " << mesh[ei][3] << endl;
+
+ outfile << mesh.GetNP() << endl;
+ for (i = 1; i <= mesh.GetNP(); i++)
+ outfile << mesh.Point(i).X() << " "
+ << mesh.Point(i).Y() << " "
+ << mesh.Point(i).Z() << endl;
#ifdef SOLIDGEOM
- outfile << geometry.GetNSurf() << endl;
- for (i = 1; i <= geometry.GetNSurf(); i++)
- geometry.GetSurface(i) -> Print (outfile);
+ outfile << geometry.GetNSurf() << endl;
+ for (i = 1; i <= geometry.GetNSurf(); i++)
+ geometry.GetSurface(i) -> Print (outfile);
#endif
-}
+ }
-int CheckCode ()
-{
- return 1;
+ int CheckCode ()
+ {
+ return 1;
- /*
- char st[100];
- ifstream ist("pw");
+ /*
+ char st[100];
+ ifstream ist("pw");
- if (!ist.good()) return 0;
- ist >> st;
- if (strcmp (st, "JKULinz") == 0) return 1;
- return 0;
+ if (!ist.good()) return 0;
+ ist >> st;
+ if (strcmp (st, "JKULinz") == 0) return 1;
+ return 0;
*/
-}
+ }
-/* ******************** CheckMesh ******************************* */
+ /* ******************** CheckMesh ******************************* */
-/// Checks, whether mesh contains a valid 3d mesh
-int CheckMesh3D (const Mesh & mesh)
-{
- INDEX_3_HASHTABLE<int> faceused(mesh.GetNE()/3);
- INDEX i;
- int j, k, l;
- INDEX_3 i3;
- int ok = 1;
- ElementIndex ei;
-
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
+ /// Checks, whether mesh contains a valid 3d mesh
+ int CheckMesh3D (const Mesh & mesh)
+ {
+ INDEX_3_HASHTABLE<int> faceused(mesh.GetNE()/3);
+ INDEX i;
+ int j, k, l;
+ INDEX_3 i3;
+ int ok = 1;
+ ElementIndex ei;
+
+ for (i = 1; i <= mesh.GetNSE(); i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
- if (mesh.GetFaceDescriptor(el.GetIndex()).DomainIn() == 0 ||
- mesh.GetFaceDescriptor(el.GetIndex()).DomainOut() == 0)
- {
- for (j = 1; j <= 3; j++)
- i3.I(j) = el.PNum(j);
+ if (mesh.GetFaceDescriptor(el.GetIndex()).DomainIn() == 0 ||
+ mesh.GetFaceDescriptor(el.GetIndex()).DomainOut() == 0)
+ {
+ for (j = 1; j <= 3; j++)
+ i3.I(j) = el.PNum(j);
- i3.Sort();
- faceused.Set (i3, 1);
- }
- }
-
- for (ei = 0; ei < mesh.GetNE(); ei++)
- {
- const Element & el = mesh[ei];
-
- for (j = 1; j <= 4; j++)
- {
- l = 0;
- for (k = 1; k <= 4; k++)
- {
- if (j != k)
- {
- l++;
- i3.I(l) = el.PNum(k);
- }
- }
-
- i3.Sort();
- if (faceused.Used(i3))
- faceused.Set(i3, faceused.Get(i3)+1);
- else
+ i3.Sort();
faceused.Set (i3, 1);
- }
- }
+ }
+ }
+
+ for (ei = 0; ei < mesh.GetNE(); ei++)
+ {
+ const Element & el = mesh[ei];
+
+ for (j = 1; j <= 4; j++)
+ {
+ l = 0;
+ for (k = 1; k <= 4; k++)
+ {
+ if (j != k)
+ {
+ l++;
+ i3.I(l) = el.PNum(k);
+ }
+ }
+
+ i3.Sort();
+ if (faceused.Used(i3))
+ faceused.Set(i3, faceused.Get(i3)+1);
+ else
+ faceused.Set (i3, 1);
+ }
+ }
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
+ for (i = 1; i <= mesh.GetNSE(); i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
- for (j = 1; j <= 3; j++)
- i3.I(j) = el.PNum(j);
+ for (j = 1; j <= 3; j++)
+ i3.I(j) = el.PNum(j);
- i3.Sort();
- k = faceused.Get (i3);
- if (k != 2)
- {
- ok = 0;
- (*testout) << "face " << i << " with points "
- << i3.I1() << "-" << i3.I2() << "-" << i3.I3()
- << " has " << k << " elements" << endl;
- }
- }
+ i3.Sort();
+ k = faceused.Get (i3);
+ if (k != 2)
+ {
+ ok = 0;
+ (*testout) << "face " << i << " with points "
+ << i3.I1() << "-" << i3.I2() << "-" << i3.I3()
+ << " has " << k << " elements" << endl;
+ }
+ }
- for (ei = 0; ei < mesh.GetNE(); ei++)
- {
- const Element & el = mesh[ei];
-
- for (j = 1; j <= 4; j++)
- {
- l = 0;
- for (k = 1; k <= 4; k++)
- {
- if (j != k)
- {
- l++;
- i3.I(l) = el.PNum(k);
- }
- }
-
- i3.Sort();
- k = faceused.Get(i3);
- if (k != 2)
- {
- ok = 0;
- (*testout) << "element " << ei << " with face "
- << i3.I1() << "-" << i3.I2() << "-"
- << i3.I3()
- << " has " << k << " elements" << endl;
- }
- }
- }
+ for (ei = 0; ei < mesh.GetNE(); ei++)
+ {
+ const Element & el = mesh[ei];
+
+ for (j = 1; j <= 4; j++)
+ {
+ l = 0;
+ for (k = 1; k <= 4; k++)
+ {
+ if (j != k)
+ {
+ l++;
+ i3.I(l) = el.PNum(k);
+ }
+ }
+
+ i3.Sort();
+ k = faceused.Get(i3);
+ if (k != 2)
+ {
+ ok = 0;
+ (*testout) << "element " << ei << " with face "
+ << i3.I1() << "-" << i3.I2() << "-"
+ << i3.I3()
+ << " has " << k << " elements" << endl;
+ }
+ }
+ }
- /*
- for (i = 1; i <= faceused.GetNBags(); i++)
- for (j = 1; j <= faceused.GetBagSize(i); j++)
- {
- faceused.GetData(i, j, i3, k);
- if (k != 2)
- {
- (*testout) << "Face: " << i3.I1() << "-"
- << i3.I2() << "-" << i3.I3() << " has "
- << k << " Faces " << endl;
- cerr << "Face Error" << endl;
- ok = 0;
- }
- }
+ /*
+ for (i = 1; i <= faceused.GetNBags(); i++)
+ for (j = 1; j <= faceused.GetBagSize(i); j++)
+ {
+ faceused.GetData(i, j, i3, k);
+ if (k != 2)
+ {
+ (*testout) << "Face: " << i3.I1() << "-"
+ << i3.I2() << "-" << i3.I3() << " has "
+ << k << " Faces " << endl;
+ cerr << "Face Error" << endl;
+ ok = 0;
+ }
+ }
*/
- if (!ok)
- {
- (*testout) << "surfelements: " << endl;
- for (i = 1; i <= mesh.GetNSE(); i++)
- {
- const Element2d & el = mesh.SurfaceElement(i);
- (*testout) << setw(5) << i << ":"
- << setw(6) << el.GetIndex()
- << setw(6) << el.PNum(1)
- << setw(4) << el.PNum(2)
- << setw(4) << el.PNum(3) << endl;
- }
- (*testout) << "volelements: " << endl;
- for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
- {
- const Element & el = mesh[ei];
- (*testout) << setw(5) << i << ":"
- << setw(6) << el.GetIndex()
- << setw(6) << el[0] << setw(4) << el[1]
- << setw(4) << el[2] << setw(4) << el[3] << endl;
- }
- }
+ if (!ok)
+ {
+ (*testout) << "surfelements: " << endl;
+ for (i = 1; i <= mesh.GetNSE(); i++)
+ {
+ const Element2d & el = mesh.SurfaceElement(i);
+ (*testout) << setw(5) << i << ":"
+ << setw(6) << el.GetIndex()
+ << setw(6) << el.PNum(1)
+ << setw(4) << el.PNum(2)
+ << setw(4) << el.PNum(3) << endl;
+ }
+ (*testout) << "volelements: " << endl;
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ {
+ const Element & el = mesh[ei];
+ (*testout) << setw(5) << i << ":"
+ << setw(6) << el.GetIndex()
+ << setw(6) << el[0] << setw(4) << el[1]
+ << setw(4) << el[2] << setw(4) << el[3] << endl;
+ }
+ }
- return ok;
-}
+ return ok;
+ }
-void RemoveProblem (Mesh & mesh)
-{
- int i, j, k;
+ void RemoveProblem (Mesh & mesh)
+ {
+ int i, j, k;
- mesh.FindOpenElements();
- int np = mesh.GetNP();
+ mesh.FindOpenElements();
+ int np = mesh.GetNP();
- BitArrayChar<PointIndex::BASE> ppoints(np);
+ BitArrayChar<PointIndex::BASE> ppoints(np);
- int ndom = mesh.GetNDomains();
+ int ndom = mesh.GetNDomains();
- PrintMessage (3, "Elements before Remove: ", mesh.GetNE());
- for (k = 1; k <= ndom; k++)
- {
- ppoints.Clear();
+ PrintMessage (3, "Elements before Remove: ", mesh.GetNE());
+ for (k = 1; k <= ndom; k++)
+ {
+ ppoints.Clear();
- for (i = 1; i <= mesh.GetNOpenElements(); i++)
- {
- const Element2d & sel = mesh.OpenElement(i);
- if (sel.GetIndex() == k)
- {
- for (j = 1; j <= sel.GetNP(); j++)
- ppoints.Set (sel.PNum(j));
- }
- }
-
- for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
- {
- const Element & el = mesh[ei];
- if (el.GetIndex() == k)
- {
- int todel = 0;
- for (j = 0; j < el.GetNP(); j++)
- if (ppoints.Test (el[j]))
- todel = 1;
+ for (i = 1; i <= mesh.GetNOpenElements(); i++)
+ {
+ const Element2d & sel = mesh.OpenElement(i);
+ if (sel.GetIndex() == k)
+ {
+ for (j = 1; j <= sel.GetNP(); j++)
+ ppoints.Set (sel.PNum(j));
+ }
+ }
+
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ {
+ const Element & el = mesh[ei];
+ if (el.GetIndex() == k)
+ {
+ int todel = 0;
+ for (j = 0; j < el.GetNP(); j++)
+ if (ppoints.Test (el[j]))
+ todel = 1;
- if (el.GetNP() != 4)
- todel = 0;
+ if (el.GetNP() != 4)
+ todel = 0;
- if (todel)
- {
- mesh[ei].Delete();
- // ei--;
- }
- }
- }
- }
+ if (todel)
+ {
+ mesh[ei].Delete();
+ // ei--;
+ }
+ }
+ }
+ }
- mesh.Compress();
- PrintMessage (3, "Elements after Remove: ", mesh.GetNE());
-}
+ mesh.Compress();
+ PrintMessage (3, "Elements after Remove: ", mesh.GetNE());
+ }
}
diff --git a/Netgen/libsrc/meshing/meshtool.hpp b/Netgen/libsrc/meshing/meshtool.hpp
index 397528876f..1baafe40ff 100644
--- a/Netgen/libsrc/meshing/meshtool.hpp
+++ b/Netgen/libsrc/meshing/meshtool.hpp
@@ -44,6 +44,7 @@ void SaveVolumeMesh (const Mesh & mesh,
///
extern int CheckCode ();
+
///
extern double CalcTetBadness (const Point3d & p1,
const Point3d & p2,
diff --git a/Netgen/libsrc/meshing/meshtype.cpp b/Netgen/libsrc/meshing/meshtype.cpp
index 7a8bcb513c..3ed65c5857 100644
--- a/Netgen/libsrc/meshing/meshtype.cpp
+++ b/Netgen/libsrc/meshing/meshtype.cpp
@@ -6,6 +6,8 @@
namespace netgen
{
+
+
MultiPointGeomInfo :: MultiPointGeomInfo()
{
cnt = 0;
@@ -14,9 +16,7 @@ namespace netgen
int MultiPointGeomInfo ::
AddPointGeomInfo (const PointGeomInfo & gi)
{
- int k;
-
- for (k = 0; k < cnt; k++)
+ for (int k = 0; k < cnt; k++)
if (mgi[k].trignum == gi.trignum)
return 0;
@@ -26,12 +26,10 @@ namespace netgen
cnt++;
return 0;
}
- // #ifdef DEVELOP
- cout << "Please Increase MPGI - Size" << endl;
- // #endif
- return 1;
- }
+ throw NgException ("Please report error: MPGI Size too small\n");
+ }
+
void MultiPointGeomInfo ::
Init ()
@@ -50,33 +48,73 @@ namespace netgen
Segment :: Segment()
{
- p1 = p2 = 0;
- geominfo[0].trignum=0;
- geominfo[1].trignum=0;
- surfnr1 = surfnr2 = 0;
- edgenr = 0;
+ p1 = -1;
+ p2 = -1;
+ edgenr = -1;
- singedge = 0;
+ singedge_left = 0;
+ singedge_right = 0;
+ seginfo = 0;
+
+ si = -1;
+
+ domin = -1;
+ domout = -1;
+ tlosurf = -1;
+
+ surfnr1 = -1;
+ surfnr2 = -1;
+ pmid = -1;
+ meshdocval = 0;
+ /*
+ geominfo[0].trignum=-1;
+ geominfo[1].trignum=-1;
epgeominfo[0].edgenr = 1;
epgeominfo[0].dist = 0;
epgeominfo[1].edgenr = 1;
epgeominfo[1].dist = 0;
+ */
+ }
+
+
- pmid = 0;
+ Segment& Segment::operator=(const Segment & other)
+ {
+ p1 = other.p1;
+ p2 = other.p2;
+ edgenr = other.edgenr;
+ singedge_left = other.singedge_left;
+ singedge_right = other.singedge_right;
+ seginfo = other.seginfo;
+ si = other.si;
+ domin = other.domin;
+ domout = other.domout;
+ tlosurf = other.tlosurf;
+ geominfo[0] = other.geominfo[0];
+ geominfo[1] = other.geominfo[1];
+ surfnr1 = other.surfnr1;
+ surfnr2 = other.surfnr2;
+ epgeominfo[0] = other.epgeominfo[0];
+ epgeominfo[1] = other.epgeominfo[1];
+ pmid = other.pmid;
+ meshdocval = other.meshdocval;
+
+ return *this;
}
+
ostream & operator<<(ostream & s, const Segment & seg)
{
s << seg.p1 << "(gi=" << seg.geominfo[0].trignum << ") - "
- << seg.p2 << "(gi=" << seg.geominfo[1].trignum << ")";
+ << seg.p2 << "(gi=" << seg.geominfo[1].trignum << ")"
+ << " si = " << seg.si;
return s;
}
Element2d :: Element2d (int anp)
{
- int i;
- for (i = 0; i < 6; i++)
+ for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
{
pnum[i] = 0;
geominfo[i].trignum = 0;
@@ -90,15 +128,15 @@ namespace netgen
case 3: typ = TRIG; break;
case 4: typ = QUAD; break;
case 6: typ = TRIG6; break;
+ case 8: typ = QUAD8; break;
}
order = 1;
+ refflag = 1;
}
-
Element2d :: Element2d (ELEMENT_TYPE atyp)
{
- int i;
- for (i = 0; i < 6; i++)
+ for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
{
pnum[i] = 0;
geominfo[i].trignum = 0;
@@ -110,6 +148,7 @@ namespace netgen
badel = 0;
deleted = 0;
order = 1;
+ refflag = 1;
}
@@ -126,7 +165,7 @@ namespace netgen
pnum[4] = 0;
pnum[5] = 0;
- for (int i = 0; i < 6; i++)
+ for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
geominfo[i].trignum = 0;
index = 0;
badel = 0;
@@ -147,7 +186,7 @@ Element2d :: Element2d (int pi1, int pi2, int pi3, int pi4)
pnum[4] = 0;
pnum[5] = 0;
- for (int i = 0; i < 6; i++)
+ for (int i = 0; i < ELEMENT2D_MAXPOINTS; i++)
geominfo[i].trignum = 0;
index = 0;
badel = 0;
@@ -157,6 +196,7 @@ Element2d :: Element2d (int pi1, int pi2, int pi3, int pi4)
}
+/*
void Element2d :: SetType (ELEMENT_TYPE atyp)
{
typ = atyp;
@@ -170,7 +210,7 @@ void Element2d :: SetType (ELEMENT_TYPE atyp)
PrintSysError ("Element2d::SetType, illegal type ", typ);
}
}
-
+*/
void Element2d :: GetBox (const T_POINTS & points, Box3d & box) const
@@ -244,13 +284,12 @@ void Element2d :: NormalizeNumbering2 ()
}
else
{
- int i;
int mini = 1;
- for (i = 2; i <= GetNP(); i++)
+ for (int i = 2; i <= GetNP(); i++)
if (PNum(i) < PNum(mini)) mini = i;
Element2d hel = (*this);
- for (i = 1; i <= GetNP(); i++)
+ for (int i = 1; i <= GetNP(); i++)
PNum(i) = hel.PNumMod (i+mini-1);
}
}
@@ -336,14 +375,16 @@ GetTransformation (int ip, class DenseMatrix & pmat,
{
int np = GetNP();
+#ifdef DEBUG
if (pmat.Width() != np || pmat.Height() != 2)
{
(*testout) << "GetTransofrmation: pmat doesn't fit" << endl;
return;
}
+#endif
ComputeIntegrationPointData ();
- DenseMatrix * dshapep = 0;
+ DenseMatrix * dshapep;
switch (typ)
{
case TRIG: dshapep = &ipdtrig.Get(ip)->dshape; break;
@@ -425,15 +466,17 @@ void Element2d ::
GetPointMatrix (const ARRAY<Point2d> & points,
DenseMatrix & pmat) const
{
- int i;
int np = GetNP();
+
+#ifdef DEBUG
if (pmat.Width() != np || pmat.Height() != 2)
{
cerr << "Element::GetPointMatrix: sizes don't fit" << endl;
return;
}
+#endif
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
{
const Point2d & p = points.Get(PNum(i));
pmat.Elem(1, i) = p.X();
@@ -480,13 +523,94 @@ double Element2d :: CalcJacobianBadness (const ARRAY<Point2d> & points) const
}
+
+static const int qip_table[4][4] =
+ { { 0, 1, 0, 3 },
+ { 0, 1, 1, 2 },
+ { 3, 2, 0, 3 },
+ { 3, 2, 1, 2 }
+ };
+
double Element2d ::
CalcJacobianBadnessDirDeriv (const ARRAY<Point2d> & points,
int pi, Vec2d & dir, double & dd) const
{
- int i, j, k, l;
+ if (typ == QUAD)
+ {
+ Mat<2,2> trans, dtrans;
+ Mat<2,4> vmat, pmat;
+
+ for (int j = 0; j < 4; j++)
+ {
+ const Point2d & p = points.Get( (*this)[j] );
+ pmat(0, j) = p.X();
+ pmat(1, j) = p.Y();
+ }
+
+ vmat = 0.0;
+ vmat(0, pi-1) = dir.X();
+ vmat(1, pi-1) = dir.Y();
+
+ double err = 0;
+ dd = 0;
+
+ for (int i = 0; i < 4; i++)
+ {
+ int ix1 = qip_table[i][0];
+ int ix2 = qip_table[i][1];
+ int iy1 = qip_table[i][2];
+ int iy2 = qip_table[i][3];
+
+ trans(0,0) = pmat(0, ix2) - pmat(0,ix1);
+ trans(1,0) = pmat(1, ix2) - pmat(1,ix1);
+ trans(0,1) = pmat(0, iy2) - pmat(0,iy1);
+ trans(1,1) = pmat(1, iy2) - pmat(1,iy1);
+
+ double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
+
+ if (det <= 0)
+ {
+ dd = 0;
+ return 1e12;
+ }
+
+ dtrans(0,0) = vmat(0, ix2) - vmat(0,ix1);
+ dtrans(1,0) = vmat(1, ix2) - vmat(1,ix1);
+ dtrans(0,1) = vmat(0, iy2) - vmat(0,iy1);
+ dtrans(1,1) = vmat(1, iy2) - vmat(1,iy1);
+
+
+ // Frobenius norm
+ double frob = 0;
+ for (int j = 0; j < 4; j++)
+ frob += sqr (trans(j));
+ frob = sqrt (frob);
+
+ double dfrob = 0;
+ for (int j = 0; j < 4; j++)
+ dfrob += trans(j) * dtrans(j);
+ dfrob = dfrob / frob;
+
+ frob /= 2;
+ dfrob /= 2;
+
+
+ // ddet = \sum_j det (m_j) with m_j = trans, except col j = dtrans
+ double ddet
+ = 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 += frob * frob / det;
+ dd += (2 * frob * dfrob * det - frob * frob * ddet) / (det * det);
+ }
+
+ err /= 4;
+ dd /= 4;
+ return err;
+ }
+
int nip = GetNIP();
- static DenseMatrix trans(2,2), dtrans(2,2), hmat(2,2);
+ static DenseMatrix trans(2,2), dtrans(2,2);
static DenseMatrix pmat, vmat;
pmat.SetSize (2, GetNP());
@@ -494,50 +618,39 @@ CalcJacobianBadnessDirDeriv (const ARRAY<Point2d> & points,
GetPointMatrix (points, pmat);
- for (i = 1; i <= np; i++)
- for (j = 1; j <= 2; j++)
- vmat.Elem(j, i) = 0;
- // for (j = 1; j <= 2; j++)
+ vmat = 0.0;
vmat.Elem(1, pi) = dir.X();
vmat.Elem(2, pi) = dir.Y();
-
double err = 0;
dd = 0;
- for (i = 1; i <= nip; i++)
+ for (int i = 1; i <= nip; i++)
{
GetTransformation (i, pmat, trans);
GetTransformation (i, vmat, dtrans);
-
// Frobenius norm
double frob = 0;
- for (j = 1; j <= 4; j++)
+ for (int j = 1; j <= 4; j++)
frob += sqr (trans.Get(j));
frob = sqrt (frob);
double dfrob = 0;
- for (j = 1; j <= 4; j++)
+ for (int j = 1; j <= 4; j++)
dfrob += trans.Get(j) * dtrans.Get(j);
dfrob = dfrob / frob;
frob /= 2;
dfrob /= 2;
-
-
- double det = trans.Det();
- double ddet = 0;
- for (j = 1; j <= 2; j++)
- {
- hmat = trans;
- for (k = 1; k <= 2; k++)
- hmat.Elem(k, j) = dtrans.Get(k, j);
- ddet += hmat.Det();
- }
+ double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
+ // ddet = \sum_j det (m_j) with m_j = trans, except col j = dtrans
+ double ddet
+ = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
+ + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
if (det <= 0)
err += 1e12;
@@ -609,8 +722,7 @@ void Element2d :: ComputeIntegrationPointData () const
case 4: if (ipdquad.Size()) return; break;
}
- int i;
- for (i = 1; i <= GetNIP(); i++)
+ for (int i = 1; i <= GetNIP(); i++)
{
IntegrationPointData * ipd = new IntegrationPointData;
Point2d hp;
@@ -672,9 +784,11 @@ Element :: Element ()
flags.reverse = 0;
flags.illegal = 0;
flags.illegal_valid = 0;
+ flags.badness_valid = 0;
flags.refflag = 1;
flags.deleted = 0;
order = 1;
+ partitionNumber = -1;
}
@@ -690,6 +804,7 @@ Element :: Element (int anp)
flags.reverse = 0;
flags.illegal = 0;
flags.illegal_valid = 0;
+ flags.badness_valid = 0;
flags.refflag = 1;
flags.deleted = 0;
switch (np)
@@ -718,6 +833,7 @@ Element :: Element (ELEMENT_TYPE type)
flags.reverse = 0;
flags.illegal = 0;
flags.illegal_valid = 0;
+ flags.badness_valid = 0;
flags.refflag = 1;
flags.deleted = 0;
order = 1;
@@ -729,14 +845,14 @@ Element :: Element (ELEMENT_TYPE type)
Element & Element :: operator= (const Element & el2)
{
- int i;
typ = el2.typ;
np = el2.np;
- for (i = 0; i < ELEMENT_MAXPOINTS; i++)
+ for (int i = 0; i < ELEMENT_MAXPOINTS; i++)
pnum[i] = el2.pnum[i];
index = el2.index;
flags = el2.flags;
order = el2.order;
+ hp_elnr = el2.hp_elnr;
return *this;
}
@@ -1434,36 +1550,130 @@ void Element :: GetShape (const Point3d & p, Vector & shape) const
switch (typ)
{
case TET:
- shape.Elem(1) = 1 - p.X() - p.Y() - p.Z();
- shape.Elem(2) = p.X();
- shape.Elem(3) = p.Y();
- shape.Elem(4) = p.Z();
- break;
+ {
+ shape.Elem(1) = 1 - p.X() - p.Y() - p.Z();
+ shape.Elem(2) = p.X();
+ shape.Elem(3) = p.Y();
+ shape.Elem(4) = p.Z();
+ break;
+ }
case TET10:
- double lam1 = 1 - p.X() - p.Y() - p.Z();
- double lam2 = p.X();
- double lam3 = p.Y();
- double lam4 = p.Z();
-
- shape.Elem(5) = 4 * lam1 * lam2;
- shape.Elem(6) = 4 * lam1 * lam3;
- shape.Elem(7) = 4 * lam1 * lam4;
- shape.Elem(8) = 4 * lam2 * lam3;
- shape.Elem(9) = 4 * lam2 * lam4;
- shape.Elem(10) = 4 * lam3 * lam4;
-
- shape.Elem(1) = lam1 -
- 0.5 * (shape.Elem(5) + shape.Elem(6) + shape.Elem(7));
- shape.Elem(2) = lam2 -
- 0.5 * (shape.Elem(5) + shape.Elem(8) + shape.Elem(9));
- shape.Elem(3) = lam3 -
- 0.5 * (shape.Elem(6) + shape.Elem(8) + shape.Elem(10));
- shape.Elem(4) = lam4 -
- 0.5 * (shape.Elem(7) + shape.Elem(9) + shape.Elem(10));
- break;
+ {
+ double lam1 = 1 - p.X() - p.Y() - p.Z();
+ double lam2 = p.X();
+ double lam3 = p.Y();
+ double lam4 = p.Z();
+
+ shape.Elem(5) = 4 * lam1 * lam2;
+ shape.Elem(6) = 4 * lam1 * lam3;
+ shape.Elem(7) = 4 * lam1 * lam4;
+ shape.Elem(8) = 4 * lam2 * lam3;
+ shape.Elem(9) = 4 * lam2 * lam4;
+ shape.Elem(10) = 4 * lam3 * lam4;
+
+ shape.Elem(1) = lam1 -
+ 0.5 * (shape.Elem(5) + shape.Elem(6) + shape.Elem(7));
+ shape.Elem(2) = lam2 -
+ 0.5 * (shape.Elem(5) + shape.Elem(8) + shape.Elem(9));
+ shape.Elem(3) = lam3 -
+ 0.5 * (shape.Elem(6) + shape.Elem(8) + shape.Elem(10));
+ shape.Elem(4) = lam4 -
+ 0.5 * (shape.Elem(7) + shape.Elem(9) + shape.Elem(10));
+ break;
+ }
+
+ case PRISM:
+ {
+ Point<3> hp = p;
+ shape(0) = hp(0) * (1-hp(2));
+ shape(1) = hp(1) * (1-hp(2));
+ shape(2) = (1-hp(0)-hp(1)) * (1-hp(2));
+ shape(3) = hp(0) * hp(2);
+ shape(4) = hp(1) * hp(2);
+ shape(5) = (1-hp(0)-hp(1)) * hp(2);
+ break;
+ }
+ case HEX:
+ {
+ Point<3> hp = p;
+ shape(0) = (1-hp(0))*(1-hp(1))*(1-hp(2));
+ shape(1) = ( hp(0))*(1-hp(1))*(1-hp(2));
+ shape(2) = ( hp(0))*( hp(1))*(1-hp(2));
+ shape(3) = (1-hp(0))*( hp(1))*(1-hp(2));
+ shape(4) = (1-hp(0))*(1-hp(1))*( hp(2));
+ shape(5) = ( hp(0))*(1-hp(1))*( hp(2));
+ shape(6) = ( hp(0))*( hp(1))*( hp(2));
+ shape(7) = (1-hp(0))*( hp(1))*( hp(2));
+ break;
+ }
}
}
+
+void Element :: GetShapeNew (const Point<3> & p, FlatVector & shape) const
+{
+ /*
+ if (shape.Size() < GetNP())
+ {
+ cerr << "Element::GetShape: Length not fitting" << endl;
+ return;
+ }
+ */
+
+ switch (typ)
+ {
+ case TET:
+ {
+ shape(0) = p(0);
+ shape(1) = p(1);
+ shape(2) = p(2);
+ shape(3) = 1-p(0)-p(1)-p(2);
+ break;
+ }
+
+ case PYRAMID:
+ {
+ double noz = 1-p(2);
+ if (noz == 0.0) noz = 1e-10;
+
+ double xi = p(0) / noz;
+ double eta = p(1) / noz;
+ shape(0) = (1-xi)*(1-eta) * (noz);
+ shape(1) = ( xi)*(1-eta) * (noz);
+ shape(2) = ( xi)*( eta) * (noz);
+ shape(3) = (1-xi)*( eta) * (noz);
+ shape(4) = p(2);
+ break;
+ }
+
+ case PRISM:
+ {
+ shape(0) = p(0) * (1-p(2));
+ shape(1) = p(1) * (1-p(2));
+ shape(2) = (1-p(0)-p(1)) * (1-p(2));
+ shape(3) = p(0) * p(2);
+ shape(4) = p(1) * p(2);
+ shape(5) = (1-p(0)-p(1)) * p(2);
+ break;
+ }
+ case HEX:
+ {
+ shape(0) = (1-p(0))*(1-p(1))*(1-p(2));
+ shape(1) = ( p(0))*(1-p(1))*(1-p(2));
+ shape(2) = ( p(0))*( p(1))*(1-p(2));
+ shape(3) = (1-p(0))*( p(1))*(1-p(2));
+ shape(4) = (1-p(0))*(1-p(1))*( p(2));
+ shape(5) = ( p(0))*(1-p(1))*( p(2));
+ shape(6) = ( p(0))*( p(1))*( p(2));
+ shape(7) = (1-p(0))*( p(1))*( p(2));
+ break;
+ }
+ }
+}
+
+
+
+
void Element ::
GetDShape (const Point3d & p, DenseMatrix & dshape) const
{
@@ -1492,19 +1702,78 @@ GetDShape (const Point3d & p, DenseMatrix & dshape) const
}
+
+void Element ::
+GetDShapeNew (const Point<3> & p, MatrixFixWidth<3> & dshape) const
+{
+ switch (typ)
+ {
+ case TET:
+ {
+ dshape = 0;
+ dshape(0,0) = 1;
+ dshape(1,1) = 1;
+ dshape(2,2) = 1;
+ dshape(3,0) = -1;
+ dshape(3,1) = -1;
+ dshape(3,2) = -1;
+ break;
+ }
+ case PRISM:
+ {
+ dshape = 0;
+ dshape(0,0) = 1-p(2);
+ dshape(0,2) = -p(0);
+ dshape(1,1) = 1-p(2);
+ dshape(1,2) = -p(1);
+ dshape(2,0) = -(1-p(2));
+ dshape(2,1) = -(1-p(2));
+ dshape(2,2) = -(1-p(0)-p(1));
+
+ dshape(3,0) = p(2);
+ dshape(3,2) = p(0);
+ dshape(4,1) = p(2);
+ dshape(4,2) = p(1);
+ dshape(5,0) = -p(2);
+ dshape(5,1) = -p(2);
+ dshape(5,2) = 1-p(0)-p(1);
+ break;
+ }
+
+ default:
+ {
+ int np = GetNP();
+ double eps = 1e-6;
+ Vector shaper(np), shapel(np);
+
+ for (int i = 1; i <= 3; i++)
+ {
+ Point3d pr(p), pl(p);
+ pr.X(i) += eps;
+ pl.X(i) -= eps;
+
+ GetShapeNew (pr, shaper);
+ GetShapeNew (pl, shapel);
+ for (int j = 1; j <= np; j++)
+ dshape.Elem(j, i) = (shaper.Get(j) - shapel.Get(j)) / (2 * eps);
+ }
+ }
+ }
+}
+
void Element ::
GetPointMatrix (const T_POINTS & points,
DenseMatrix & pmat) const
{
- int i;
int np = GetNP();
+ /*
if (pmat.Width() != np || pmat.Height() != 3)
{
cerr << "Element::GetPointMatrix: sizes don't fit" << endl;
return;
}
-
- for (i = 1; i <= np; i++)
+ */
+ for (int i = 1; i <= np; i++)
{
const Point3d & p = points.Get(PNum(i));
pmat.Elem(1, i) = p.X();
@@ -1672,8 +1941,8 @@ void Element :: ComputeIntegrationPointData () const
FaceDescriptor :: FaceDescriptor()
{
- surfnr = domin =
- domout = bcprop = 0;
+ surfnr = domin = domout = bcprop = 0;
+ domin_singular = domout_singular = 0;
tlosurf = -1;
}
@@ -1685,6 +1954,7 @@ FaceDescriptor(int surfnri, int domini, int domouti, int tlosurfi)
domout = domouti;
tlosurf = tlosurfi;
bcprop = surfnri;
+ domin_singular = domout_singular = 0;
}
FaceDescriptor :: FaceDescriptor(const Segment & seg)
@@ -1694,6 +1964,7 @@ FaceDescriptor :: FaceDescriptor(const Segment & seg)
domout = seg.domout+1;
tlosurf = seg.tlosurf+1;
bcprop = 0;
+ domin_singular = domout_singular = 0;
}
int FaceDescriptor :: SegmentFits (const Segment & seg)
@@ -1712,7 +1983,9 @@ ostream & operator<<(ostream & s, const FaceDescriptor & fd)
<< ", domin = " << fd.domin
<< ", domout = " << fd.domout
<< ", tlosurf = " << fd.tlosurf
- << ", bcprop = " << fd.bcprop;
+ << ", bcprop = " << fd.bcprop
+ << ", domin_sing = " << fd.domin_singular
+ << ", domout_sing = " << fd.domout_singular;
return s;
}
@@ -1771,26 +2044,20 @@ int Identifications :: GetSymmetric (PointIndex pi1, PointIndex pi2) const
}
-void Identifications :: GetMap (int identnr,
- ARRAY<int,PointIndex::BASE> & identmap) const
+void Identifications :: GetMap (int identnr, ARRAY<int,PointIndex::BASE> & identmap) const
{
- int i, j;
-
identmap.SetSize (mesh.GetNP());
- for (i = 1; i <= identmap.Size(); i++)
- identmap.Elem(i) = 0;
+ identmap = 0;
- for (i = 1; i <= identifiedpoints->GetNBags(); i++)
- for (j = 1; j <= identifiedpoints->GetBagSize(i); j++)
+ for (int i = 1; i <= identifiedpoints->GetNBags(); i++)
+ for (int j = 1; j <= identifiedpoints->GetBagSize(i); j++)
{
INDEX_2 i2;
int nr;
identifiedpoints->GetData (i, j, i2, nr);
- if (nr == identnr)
- {
- identmap.Elem(i2.I1()) = i2.I2();
- }
+ if (nr == identnr || !identnr)
+ identmap.Elem(i2.I1()) = i2.I2();
}
}
@@ -1815,6 +2082,22 @@ void Identifications :: GetPairs (int identnr,
}
+void Identifications :: SetMaxPointNr (int maxpnum)
+{
+ for (int i = 1; i <= identifiedpoints->GetNBags(); i++)
+ for (int j = 1; j <= identifiedpoints->GetBagSize(i); j++)
+ {
+ INDEX_2 i2;
+ int nr;
+ identifiedpoints->GetData (i, j, i2, nr);
+
+ if (i2.I1() > maxpnum || i2.I2() > maxpnum)
+ {
+ i2.I1() = i2.I2() = -1;
+ identifiedpoints->SetData (i, j, i2, -1);
+ }
+ }
+}
@@ -1825,14 +2108,14 @@ MeshingParameters :: MeshingParameters ()
optimize3d = "cmdmstm";
optsteps3d = 3;
optimize2d = "smsmsmSmSmSm";
- optsteps2d = 1;
+ optsteps2d = 3;
opterrpow = 2;
blockfill = 1;
filldist = 0.1;
safety = 5;
relinnersafety = 3;
uselocalh = 1;
- grading = 0.5;
+ grading = 0.3;
delaunay = 1;
maxh = 1e10;
meshsizefilename = NULL;
@@ -1840,9 +2123,10 @@ MeshingParameters :: MeshingParameters ()
checkoverlap = 1;
checkchartboundary = 1;
curvaturesafety = 2;
+ segmentsperedge = 1;
parthread = 0;
-
- elsizeweight = 0;
+
+ elsizeweight = 0.2;
giveuptol = 10;
maxoutersteps = 5;
starshapeclass = 5;
@@ -1856,13 +2140,81 @@ MeshingParameters :: MeshingParameters ()
void MeshingParameters :: Print (ostream & ost) const
{
ost << "Meshing parameters: " << endl
- << "maxh = " << maxh << endl
- << "grading = " << grading << endl
- << "startinsurface = " << startinsurface << endl
- << "checkoverlap = " << checkoverlap << endl
- << "curvaturesafety = " << curvaturesafety << endl;
+ << "optimize3d = " << optimize3d << endl
+ << "optsteps3d = " << optsteps3d << endl
+ << " optimize2d = " << optimize2d << endl
+ << " optsteps2d = " << optsteps2d << endl
+ << " opterrpow = " << opterrpow << endl
+ << " blockfill = " << blockfill << endl
+ << " filldist = " << filldist << endl
+ << " safety = " << safety << endl
+ << " relinnersafety = " << relinnersafety << endl
+ << " uselocalh = " << uselocalh << endl
+ << " grading = " << grading << endl
+ << " delaunay = " << delaunay << endl
+ << " maxh = " << maxh << endl;
+ if(meshsizefilename)
+ ost << " meshsizefilename = " << meshsizefilename << endl;
+ else
+ ost << " meshsizefilename = NULL" << endl;
+ ost << " startinsurface = " << startinsurface << endl
+ << " checkoverlap = " << checkoverlap << endl
+ << " checkchartboundary = " << checkchartboundary << endl
+ << " curvaturesafety = " << curvaturesafety << endl
+ << " segmentsperedge = " << segmentsperedge << endl
+ << " parthread = " << parthread << endl
+ << " elsizeweight = " << elsizeweight << endl
+ << " giveuptol = " << giveuptol << endl
+ << " maxoutersteps = " << maxoutersteps << endl
+ << " starshapeclass = " << starshapeclass << endl
+ << " baseelnp = " << baseelnp << endl
+ << " sloppy = " << sloppy << endl
+ << " badellimit = " << badellimit << endl
+ << " secondorder = " << secondorder << endl
+ << " elementorder = " << elementorder << endl
+ << " quad = " << quad << endl
+ << " inverttets = " << inverttets << endl
+ << " inverttrigs = " << inverttrigs << endl;
}
+void MeshingParameters :: CopyFrom(const MeshingParameters & other)
+{
+ //strcpy(optimize3d,other.optimize3d);
+ optimize3d = other.optimize3d;
+ optsteps3d = other.optsteps3d;
+ //strcpy(optimize2d,other.optimize2d);
+ optimize2d = other.optimize2d;
+ optsteps2d = other.optsteps2d;
+ opterrpow = other.opterrpow;
+ blockfill = other.blockfill;
+ filldist = other.filldist;
+ safety = other.safety;
+ relinnersafety = other.relinnersafety;
+ uselocalh = other.uselocalh;
+ grading = other.grading;
+ delaunay = other.delaunay;
+ maxh = other.maxh;
+ //strcpy(const_cast<char*>(meshsizefilename), other.meshsizefilename);
+ //const_cast<char*>(meshsizefilename) = other.meshsizefilename; //???
+ startinsurface = other.startinsurface;
+ checkoverlap = other.checkoverlap;
+ checkchartboundary = other.checkchartboundary;
+ curvaturesafety = other.curvaturesafety;
+ segmentsperedge = other.segmentsperedge;
+ parthread = other.parthread;
+ elsizeweight = other.elsizeweight;
+ giveuptol = other.giveuptol;
+ maxoutersteps = other.maxoutersteps;
+ starshapeclass = other.starshapeclass;
+ baseelnp = other.baseelnp;
+ sloppy = other.sloppy;
+ badellimit = other.badellimit;
+ secondorder = other.secondorder;
+ elementorder = other.elementorder;
+ quad = other.quad;
+ inverttets = other.inverttets;
+ inverttrigs = other.inverttrigs;
+}
DebugParameters :: DebugParameters ()
@@ -1870,6 +2222,7 @@ DebugParameters :: DebugParameters ()
slowchecks = 0;
haltsuccess = 0;
haltnosuccess = 0;
+ haltlargequalclass = 0;
haltsegment = 0;
haltsegmentp1 = 0;
haltsegmentp2 = 0;
diff --git a/Netgen/libsrc/meshing/meshtype.hpp b/Netgen/libsrc/meshing/meshtype.hpp
index 25a131114a..56cc5f902d 100644
--- a/Netgen/libsrc/meshing/meshtype.hpp
+++ b/Netgen/libsrc/meshing/meshtype.hpp
@@ -1,6 +1,8 @@
#ifndef MESHTYPE
#define MESHTYPE
+//#include <algorithm>
+
/**************************************************************************/
/* File: meshtype.hpp */
/* Author: Joachim Schoeberl */
@@ -25,7 +27,7 @@ typedef int ELEMENT_FACE[4]; // points, last one is -1 for trig
#define ELEMENT_MAXPOINTS 12
-#define ELEMENT2D_MAXPOINTS 6
+#define ELEMENT2D_MAXPOINTS 8
enum POINTTYPE { FIXEDPOINT = 1, EDGEPOINT = 2, SURFACEPOINT = 3, INNERPOINT = 4 };
@@ -40,10 +42,14 @@ enum OPTIMIZEGOAL { OPT_QUALITY, OPT_CONFORM, OPT_REST, OPT_WORSTCASE, OPT_LEGAL
extern int GetTimeStamp();
extern int NextTimeStamp();
-struct PointGeomInfo
+class PointGeomInfo
{
+public:
int trignum; // for STL Meshing
double u, v; // for OCC Meshing
+
+ PointGeomInfo ()
+ : trignum(-1), u(0), v(0) { ; }
};
inline ostream & operator<< (ostream & ost, const PointGeomInfo & gi)
@@ -69,7 +75,7 @@ public:
};
-struct EdgePointGeomInfo
+class EdgePointGeomInfo
{
public:
int edgenr;
@@ -77,7 +83,14 @@ public:
double u, v; // for OCC Meshing
EdgePointGeomInfo ()
- { edgenr = 0; dist = 0; u = v = 0; }
+ : edgenr(0), dist(0.0), u(0.0), v(0.0) { ; }
+
+ EdgePointGeomInfo & operator= (const EdgePointGeomInfo & gi2)
+ {
+ edgenr = gi2.edgenr; dist = gi2.dist;
+ u = gi2.u; v = gi2.v;
+ return *this;
+ }
};
inline ostream & operator<< (ostream & ost, const EdgePointGeomInfo & gi)
@@ -89,7 +102,6 @@ inline ostream & operator<< (ostream & ost, const EdgePointGeomInfo & gi)
-
class PointIndex
{
int i;
@@ -103,7 +115,11 @@ public:
PointIndex operator++ (int) { int hi = i; i++; return hi; }
PointIndex operator-- (int) { int hi = i; i--; return hi; }
+#ifdef BASE0
+ enum { BASE = 0 };
+#else
enum { BASE = 1 };
+#endif
};
inline istream & operator>> (istream & ist, PointIndex & pi)
@@ -132,7 +148,15 @@ public:
ElementIndex & operator-- (int) { i--; return *this; }
};
+inline istream & operator>> (istream & ist, ElementIndex & pi)
+{
+ int i; ist >> i; pi = i; return ist;
+}
+inline ostream & operator<< (ostream & ost, const ElementIndex & pi)
+{
+ return (ost << int(pi));
+}
class SurfaceElementIndex
@@ -149,7 +173,15 @@ public:
SurfaceElementIndex & operator-- (int) { i--; return *this; }
};
+inline istream & operator>> (istream & ist, SurfaceElementIndex & pi)
+{
+ int i; ist >> i; pi = i; return ist;
+}
+inline ostream & operator<< (ostream & ost, const SurfaceElementIndex & pi)
+{
+ return (ost << int(pi));
+}
class SegmentIndex
{
@@ -165,7 +197,15 @@ public:
SegmentIndex & operator-- (int) { i--; return *this; }
};
+inline istream & operator>> (istream & ist, SegmentIndex & pi)
+{
+ int i; ist >> i; pi = i; return ist;
+}
+inline ostream & operator<< (ostream & ost, const SegmentIndex & pi)
+{
+ return (ost << int(pi));
+}
@@ -178,14 +218,22 @@ public:
class MeshPoint : public Point3d
{
int layer;
+ bool singular;
+ POINTTYPE type;
public:
- MeshPoint () { ; }
- MeshPoint (const Point3d & ap, int alayer = 1)
- : Point3d (ap), layer(alayer) { ; }
+ MeshPoint () : layer(1), singular(0), type(INNERPOINT) { ; }
+ MeshPoint (const Point3d & ap, int alayer = 1, POINTTYPE apt = INNERPOINT)
+ : Point3d (ap), layer(alayer), singular(0), type(apt) { ; }
void SetPoint (const Point3d & ap)
{ Point3d::operator= (ap); }
int GetLayer() const { return layer; }
+
+ bool IsSingular() const { return singular; }
+ void SetSingular(bool s = 1) { singular = s; }
+
+ POINTTYPE Type() const { return type; }
+ void SetType(POINTTYPE at) { type = at; }
};
@@ -212,13 +260,15 @@ class Element2d
///
ELEMENT_TYPE typ:6;
/// number of points
- unsigned int np:3;
+ unsigned int np:4;
bool badel:1;
bool refflag:1; // marked for refinement
bool deleted:1; // element is deleted
/// order for hp-FEM
unsigned int order:6;
+
+
public:
///
Element2d (int anp = 3);
@@ -231,7 +281,20 @@ public:
///
ELEMENT_TYPE GetType () const { return typ; }
///
- void SetType (ELEMENT_TYPE atyp);
+ void SetType (ELEMENT_TYPE atyp)
+ {
+ typ = atyp;
+ switch (typ)
+ {
+ case TRIG: np = 3; break;
+ case QUAD: np = 4; break;
+ case TRIG6: np = 6; break;
+ case QUAD6: np = 6; break;
+ case QUAD8: np = 8; break;
+ default:
+ PrintSysError ("Element2d::SetType, illegal type ", typ);
+ }
+ }
///
int GetNP() const { return np; }
///
@@ -339,7 +402,7 @@ public:
return deleted;
}
- void SetRefinementFlag (int rflag = 1)
+ void SetRefinementFlag (bool rflag = 1)
{ refflag = rflag; }
bool TestRefinementFlag () const
{ return refflag; }
@@ -347,6 +410,8 @@ public:
int HasFace(const Element2d& el) const;
///
int meshdocval;
+ ///
+ int hp_elnr;
};
@@ -382,7 +447,8 @@ private:
/// number of points (4..tet, 5..pyramid, 6..prism, 8..hex, 10..quad tet, 12..quad prism)
int np:5;
///
- struct flagstruct {
+ class flagstruct {
+ public:
bool marked:1; // marked for refinement
bool badel:1; // angles worse then limit
bool reverse:1; // for refinement a la Bey
@@ -398,6 +464,9 @@ private:
unsigned int order:6;
/// stored shape-badness of element
float badness;
+ /// number of partition for parallel compution
+ short int partitionNumber;
+ ///
public:
flagstruct flags;
@@ -425,9 +494,10 @@ public:
case TET: return 4;
case TET10: return 4;
case PRISM12: return 6;
+ case PRISM: return 6; //SZ
default:
#ifdef DEBUG
- PrintSysError ("Element3d::GetNV not implemented for typ", typ)
+ PrintSysError ("Element3d::GetNV not implemented for typ ", typ)
#endif
;
}
@@ -513,8 +583,10 @@ public:
class DenseMatrix & trans) const;
void GetShape (const Point3d & p, class Vector & shape) const;
+ void GetShapeNew (const Point<3> & p, class FlatVector & shape) const;
/// matrix 2 * np
void GetDShape (const Point3d & p, class DenseMatrix & dshape) const;
+ void GetDShapeNew (const Point<3> & p, class MatrixFixWidth<3> & dshape) const;
/// matrix 3 * np
void GetPointMatrix (const T_POINTS & points,
class DenseMatrix & pmat) const;
@@ -529,7 +601,7 @@ public:
///
friend ostream & operator<<(ostream & s, const Element & el);
- void SetRefinementFlag (int rflag = 1)
+ void SetRefinementFlag (bool rflag = 1)
{ flags.refflag = rflag; }
int TestRefinementFlag () const
{ return flags.refflag; }
@@ -559,6 +631,11 @@ public:
return flags.deleted;
}
+
+ int GetPartition () const { return partitionNumber; }
+ void SetPartition (int nr) { partitionNumber = nr; };
+
+ int hp_elnr;
};
@@ -584,9 +661,12 @@ public:
/// edge nr
int edgenr;
///
- unsigned int singedge:1;
+ unsigned int singedge_left:1;
+ unsigned int singedge_right:1;
+
/// 0.. not first segment of segs, 1..first of class, 2..first of class, inverse
unsigned int seginfo:2;
+
/// surface decoding index
int si;
/// domain number inner side
@@ -597,6 +677,7 @@ public:
int tlosurf;
///
PointGeomInfo geominfo[2];
+
/// surfaces describing edge
int surfnr1, surfnr2;
///
@@ -605,6 +686,18 @@ public:
int pmid; // for second order
///
int meshdocval;
+
+
+ PointIndex operator[] (int i) const
+ { return (i == 0) ? p1 : p2; }
+
+ PointIndex & operator[] (int i)
+ { return (i == 0) ? p1 : p2; }
+
+ Segment& operator=(const Segment & other);
+
+
+ int hp_elnr;
};
@@ -644,6 +737,13 @@ public:
void SetBCProperty (int bc) { bcprop = bc; }
friend ostream & operator<<(ostream & s, const FaceDescriptor & fd);
+
+
+ ///
+ bool domin_singular;
+ bool domout_singular;
+
+
};
@@ -683,7 +783,7 @@ public:
int optsteps2d;
/// power of error (to approximate max err optimization)
double opterrpow;
- /// do block filling ?
+ /// do block filling ?
int blockfill;
/// block filling up to distance
double filldist;
@@ -747,6 +847,8 @@ public:
MeshingParameters ();
///
void Print (ostream & ost) const;
+
+ void CopyFrom(const MeshingParameters & other);
};
class DebugParameters
@@ -761,6 +863,8 @@ public:
///
int haltnosuccess;
///
+ int haltlargequalclass;
+ ///
int haltsegment;
///
int haltnode;
@@ -908,6 +1012,8 @@ public:
///
int GetMaxNr () const { return maxidentnr; }
+ /// remove secondorder
+ void SetMaxPointNr (int maxpnum);
};
diff --git a/Netgen/libsrc/meshing/msghandler.cpp b/Netgen/libsrc/meshing/msghandler.cpp
index 8d2bb429ee..04da502a73 100644
--- a/Netgen/libsrc/meshing/msghandler.cpp
+++ b/Netgen/libsrc/meshing/msghandler.cpp
@@ -25,6 +25,24 @@ void PrintDot(char ch)
}
}
+void PrintMessage(int importance,
+ const MyStr& s1, const MyStr& s2)
+{
+ if (importance <= printmessage_importance)
+ {
+ Ng_PrintDest(MyStr(" ")+s1+s2+MyStr("\n"));
+ }
+}
+
+void PrintMessage(int importance,
+ const MyStr& s1, const MyStr& s2, const MyStr& s3, const MyStr& s4)
+{
+ if (importance <= printmessage_importance)
+ {
+ Ng_PrintDest(MyStr(" ")+s1+s2+s3+s4+MyStr("\n"));
+ }
+}
+
void PrintMessage(int importance,
const MyStr& s1, const MyStr& s2, const MyStr& s3, const MyStr& s4,
const MyStr& s5, const MyStr& s6, const MyStr& s7, const MyStr& s8)
@@ -93,52 +111,35 @@ void PrintTime(const MyStr& s1, const MyStr& s2, const MyStr& s3, const MyStr& s
Ng_PrintDest(MyStr(" Time = ")+s1+s2+s3+s4+s5+s6+s7+s8+MyStr("\n"));
}
-ARRAY<MyStr*> msgstatus_stack(0);
-MyStr* msgstatus = NULL;
+
+static ARRAY<MyStr*> msgstatus_stack(0);
+static MyStr msgstatus = "";
+
+
+
void ResetStatus()
{
SetStatMsg("idle");
- if (msgstatus != NULL)
- {
- delete msgstatus;
- }
- int i;
- for (i = 1; i <= msgstatus_stack.Size(); i++)
- {
- delete msgstatus_stack.Get(i);
- }
-
+ for (int i = 0; i < msgstatus_stack.Size(); i++)
+ delete msgstatus_stack[i];
msgstatus_stack.SetSize(0);
- msgstatus = NULL;
- multithread.task = "";
+
+ // multithread.task = "";
multithread.percent = 100.;
}
void PushStatus(const MyStr& s)
{
- if (msgstatus == NULL)
- {
- SetStatMsg("idle");
- }
- msgstatus_stack.Append(msgstatus);
- msgstatus = NULL;
-
+ msgstatus_stack.Append(new MyStr (s));
SetStatMsg(s);
- // multithread.task = "";
}
+
void PushStatusF(const MyStr& s)
{
- if (msgstatus == NULL)
- {
- SetStatMsg("idle");
- }
- msgstatus_stack.Append(msgstatus);
- msgstatus = NULL;
-
+ msgstatus_stack.Append(new MyStr (s));
SetStatMsg(s);
- // multithread.task = "";
PrintFnStart(s);
}
@@ -147,13 +148,12 @@ void PopStatus()
SetThreadPercent(100.);
if (msgstatus_stack.Size())
{
- if (msgstatus != NULL)
- {
- delete msgstatus;
- }
- msgstatus = msgstatus_stack.Get(msgstatus_stack.Size());
+ if (msgstatus_stack.Size() > 1)
+ SetStatMsg (*msgstatus_stack.Last());
+ else
+ SetStatMsg ("");
+ delete msgstatus_stack.Last();
msgstatus_stack.SetSize(msgstatus_stack.Size()-1);
- multithread.task = msgstatus->c_str();
}
else
{
@@ -167,14 +167,11 @@ void SetStatMsgF(const MyStr& s)
SetStatMsg(s);
}
*/
+
void SetStatMsg(const MyStr& s)
{
- if (msgstatus != NULL)
- {
- delete msgstatus;
- }
- msgstatus = new MyStr(s);
- multithread.task = msgstatus->c_str();
+ msgstatus = s;
+ multithread.task = msgstatus.c_str();
}
void SetThreadPercent(double percent)
@@ -183,4 +180,14 @@ void SetThreadPercent(double percent)
}
+
+#ifdef SMALLLIB
+void Ng_PrintDest(const char * s){cout << s <<flush;}
+double GetTime(){return 0;}
+void MyError(const char * ch)
+{
+ cerr << ch << endl;
+}
+#endif
+
}
diff --git a/Netgen/libsrc/meshing/msghandler.hpp b/Netgen/libsrc/meshing/msghandler.hpp
index b7d4481866..7de9425193 100644
--- a/Netgen/libsrc/meshing/msghandler.hpp
+++ b/Netgen/libsrc/meshing/msghandler.hpp
@@ -15,8 +15,13 @@ extern void PrintDot(char ch = '.');
//importance: importance of message: 1=very important, 3=middle, 5=low, 7=unimportant
extern void PrintMessage(int importance,
- const MyStr& s1, const MyStr& s2="", const MyStr& s3="", const MyStr& s4="",
- const MyStr& s5="", const MyStr& s6="", const MyStr& s7="", const MyStr& s8="");
+ const MyStr& s1, const MyStr& s2=MyStr());
+extern void PrintMessage(int importance,
+ const MyStr& s1, const MyStr& s2, const MyStr& s3, const MyStr& s4=MyStr());
+extern void PrintMessage(int importance,
+ const MyStr& s1, const MyStr& s2, const MyStr& s3, const MyStr& s4,
+ const MyStr& s5, const MyStr& s6=MyStr(), const MyStr& s7=MyStr(), const MyStr& s8=MyStr());
+
// CR without line-feed
extern void PrintMessageCR(int importance,
const MyStr& s1, const MyStr& s2="", const MyStr& s3="", const MyStr& s4="",
diff --git a/Netgen/libsrc/meshing/netrule2.cpp b/Netgen/libsrc/meshing/netrule2.cpp
index c0acd4938d..c75c69d521 100644
--- a/Netgen/libsrc/meshing/netrule2.cpp
+++ b/Netgen/libsrc/meshing/netrule2.cpp
@@ -13,7 +13,9 @@ netrule :: netrule ()
netrule :: ~netrule()
{
- delete name;
+ if(name != NULL) delete [] name;
+ for(int i=0; i<oldutofreearea_i.Size(); i++)
+ delete oldutofreearea_i[i];
}
@@ -31,9 +33,8 @@ void netrule :: GetFreeArea (ARRAY<Point2d> & afreearea)
void netrule :: SetFreeZoneTransformation (const Vector & devp, int tolclass)
{
- int i;
double lam1 = 1.0/tolclass;
- double lam2 = 1-lam1;
+ double lam2 = 1.-lam1;
double mem1[100], mem2[100], mem3[100];
@@ -42,14 +43,20 @@ void netrule :: SetFreeZoneTransformation (const Vector & devp, int tolclass)
FlatVector devfree1(vs, mem2);
FlatVector devfree2(vs, mem3);
- oldutofreearea.Mult (devp, devfree1);
- oldutofreearealimit.Mult (devp, devfree2);
- devfree.Set2 (lam1, devfree1, lam2, devfree2);
-
- transfreezone.SetSize (freezone.Size());
-
+ if (tolclass <= oldutofreearea_i.Size())
+ {
+ oldutofreearea_i[tolclass-1] -> Mult (devp, devfree);
+ }
+ else
+ {
+ oldutofreearea.Mult (devp, devfree1);
+ oldutofreearealimit.Mult (devp, devfree2);
+ devfree.Set2 (lam1, devfree1, lam2, devfree2);
+ }
- int fzs = transfreezone.Size();
+
+ int fzs = freezone.Size();
+ transfreezone.SetSize (fzs);
if (fzs > 0)
{
@@ -59,7 +66,7 @@ void netrule :: SetFreeZoneTransformation (const Vector & devp, int tolclass)
fzmaxy = fzminy = transfreezone[0].Y();
}
- for (i = 1; i < fzs; i++)
+ for (int i = 1; i < fzs; i++)
{
transfreezone[i].X() = lam1 * freezone[i].X() + lam2 * freezonelimit[i].X() + devfree[2*i];
transfreezone[i].Y() = lam1 * freezone[i].Y() + lam2 * freezonelimit[i].Y() + devfree[2*i+1];
@@ -70,12 +77,13 @@ void netrule :: SetFreeZoneTransformation (const Vector & devp, int tolclass)
if (transfreezone[i].Y() < fzminy) fzminy = transfreezone[i].Y();
}
- for (i = 0; i < fzs; i++)
+ for (int i = 0; i < fzs; i++)
{
Point2d p1 = transfreezone[i];
Point2d p2 = transfreezone[(i+1) % fzs];
Vec2d vn (p2.Y() - p1.Y(), p1.X() - p2.X());
+
double len2 = vn.Length2();
if (len2 < 1e-10)
@@ -86,27 +94,34 @@ void netrule :: SetFreeZoneTransformation (const Vector & devp, int tolclass)
}
else
{
- vn *= 1/sqrt (len2);
+ vn /= sqrt (len2); // should not be necessary
freesetinequ(i,0) = vn.X();
freesetinequ(i,1) = vn.Y();
freesetinequ(i,2) = -(p1.X() * vn.X() + p1.Y() * vn.Y());
}
+
+ /*
+ freesetinequ(i,0) = vn.X();
+ freesetinequ(i,1) = vn.Y();
+ freesetinequ(i,2) = -(p1.X() * vn.X() + p1.Y() * vn.Y());
+ */
}
}
+/*
int netrule :: IsInFreeZone2 (const Point2d & p) const
{
- int i;
-
- for (i = 1; i <= transfreezone.Size(); i++)
+ for (int i = 0; i < transfreezone.Size(); i++)
{
- if (freesetinequ.Get(i, 1) * p.X() + freesetinequ.Get(i, 2) * p.Y() +
- freesetinequ.Get(i, 3) > 0) return 0;
+ if (freesetinequ(i, 0) * p.X() +
+ freesetinequ(i, 1) * p.Y() +
+ freesetinequ(i, 2) > 0) return 0;
}
return 1;
}
+*/
int netrule :: IsLineInFreeZone2 (const Point2d & p1, const Point2d & p2) const
{
@@ -122,9 +137,9 @@ int netrule :: IsLineInFreeZone2 (const Point2d & p1, const Point2d & p2) const
for (i = 1; i <= transfreezone.Size(); i++)
{
if (freesetinequ.Get(i, 1) * p1.X() + freesetinequ.Get(i, 2) * p1.Y() +
- freesetinequ.Get(i, 3) > -1e-5 &&
+ freesetinequ.Get(i, 3) > -1e-6 &&
freesetinequ.Get(i, 1) * p2.X() + freesetinequ.Get(i, 2) * p2.Y() +
- freesetinequ.Get(i, 3) > -1e-5
+ freesetinequ.Get(i, 3) > -1e-6
) return 0;
}
@@ -156,9 +171,8 @@ int netrule :: IsLineInFreeZone2 (const Point2d & p1, const Point2d & p2) const
int netrule :: ConvexFreeZone () const
{
- int i, n;
- n = transfreezone.Size();
- for (i = 1; i <= n; i++)
+ int n = transfreezone.Size();
+ for (int i = 1; i <= n; i++)
{
if (! CCW (transfreezone.Get(i),
transfreezone.Get(i % n + 1),
@@ -169,7 +183,7 @@ int netrule :: ConvexFreeZone () const
}
-
+/*
float netrule :: CalcPointDist (int pi, const Point2d & p) const
{
float dx = p.X() - points.Get(pi).X();
@@ -178,7 +192,7 @@ float netrule :: CalcPointDist (int pi, const Point2d & p) const
return tf->f1 * dx * dx + tf->f2 * dx * dy + tf->f3 * dy * dy;
}
-
+*/
float netrule :: CalcLineError (int li, const Vec2d & v) const
{
diff --git a/Netgen/libsrc/meshing/netrule3.cpp b/Netgen/libsrc/meshing/netrule3.cpp
index b6c5967058..fe6a7417c1 100644
--- a/Netgen/libsrc/meshing/netrule3.cpp
+++ b/Netgen/libsrc/meshing/netrule3.cpp
@@ -17,16 +17,14 @@ vnetrule :: vnetrule ()
vnetrule :: ~vnetrule ()
{
- int i;
- if (strlen(name))
- delete name;
- for (i = 1; i <= freefaces.Size(); i++)
+ if (strlen(name)) delete [] name;
+ for (int i = 1; i <= freefaces.Size(); i++)
delete freefaces.Elem(i);
- for (i = 1; i <= freesets.Size(); i++)
+ for (int i = 1; i <= freesets.Size(); i++)
delete freesets.Elem(i);
- for (i = 1; i <= freeedges.Size(); i++)
+ for (int i = 1; i <= freeedges.Size(); i++)
delete freeedges.Elem(i);
- for (i = 1; i <= freefaceinequ.Size(); i++)
+ for (int i = 1; i <= freefaceinequ.Size(); i++)
delete freefaceinequ.Elem(i);
delete oldutofreezone;
delete oldutofreezonelimit;
@@ -34,8 +32,7 @@ vnetrule :: ~vnetrule ()
int vnetrule :: TestFlag (char flag) const
{
- int i;
- for (i = 1; i <= flags.Size(); i++)
+ for (int i = 1; i <= flags.Size(); i++)
if (flags.Get(i) == flag) return 1;
return 0;
}
@@ -52,8 +49,6 @@ void vnetrule :: SetFreeZoneTransformation (const Vector & allp, int tolclass)
double lam1 = 1.0/(2 * tolclass - 1);
double lam2 = 1-lam1;
- // MARK (setfz1);
-
transfreezone.SetSize (freezone.Size());
int np = points.Size();
diff --git a/Netgen/libsrc/meshing/parser2.cpp b/Netgen/libsrc/meshing/parser2.cpp
index 402207c259..48ef280eb4 100644
--- a/Netgen/libsrc/meshing/parser2.cpp
+++ b/Netgen/libsrc/meshing/parser2.cpp
@@ -53,7 +53,7 @@ void netrule :: LoadRule (istream & ist)
ist.get (buf, sizeof(buf), '"');
ist.get (ch);
- delete name;
+ if(name != NULL) delete [] name;
name = new char[strlen (buf) + 1];
strcpy (name, buf);
// (*mycout) << "Rule " << name << " found." << endl;
@@ -83,9 +83,9 @@ void netrule :: LoadRule (istream & ist)
noldp++;
tolerances.SetSize (noldp);
- tolerances.Elem(noldp).f1 = 0;
+ tolerances.Elem(noldp).f1 = 1.0;
tolerances.Elem(noldp).f2 = 0;
- tolerances.Elem(noldp).f3 = 0;
+ tolerances.Elem(noldp).f3 = 1.0;
ist >> ch;
while (ch != ';')
@@ -449,6 +449,15 @@ void netrule :: LoadRule (istream & ist)
}
}
+ oldutofreearea_i.SetSize (10);
+ for (i = 0; i < oldutofreearea_i.Size(); i++)
+ {
+ oldutofreearea_i[i] = new DenseMatrix (oldutofreearea.Height(), oldutofreearea.Width());
+ DenseMatrix & mati = *oldutofreearea_i[i];
+ for (int j = 0; j < oldutofreearea.Height(); j++)
+ for (int k = 0; k < oldutofreearea.Width(); k++)
+ mati(j,k) = 1.0 / (i+1) * oldutofreearea(j,k) + (1 - 1.0/(i+1)) * oldutofreearealimit(j,k);
+ }
}
diff --git a/Netgen/libsrc/meshing/parser3.cpp b/Netgen/libsrc/meshing/parser3.cpp
index 7bf6e513ac..23ee84802e 100644
--- a/Netgen/libsrc/meshing/parser3.cpp
+++ b/Netgen/libsrc/meshing/parser3.cpp
@@ -982,6 +982,6 @@ void Meshing3 :: LoadRules (const char * filename, const char ** prules)
}
}
delete ist;
- delete tr1;
+ delete [] tr1;
}
}
diff --git a/Netgen/libsrc/meshing/prism2rls.cpp b/Netgen/libsrc/meshing/prism2rls.cpp
index baf0bef388..7e696554c0 100644
--- a/Netgen/libsrc/meshing/prism2rls.cpp
+++ b/Netgen/libsrc/meshing/prism2rls.cpp
@@ -53,6 +53,11 @@ const char * prismrules2[] = {
"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
"{ 0 P1, 0.25 P2, 0.25 P3, 0 P4, 0.25 P5, 0.25 P6 };\n",\
"\n",\
+"freeset\n",\
+"1 2 4 5 6 7;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 5 6 8;\n",\
"\n",\
"endrule\n",\
"\n",\
@@ -110,6 +115,12 @@ const char * prismrules2[] = {
"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
"{ 0 P1, 0.25 P2, 0.25 P3, 0 P4, 0.25 P5, 0.25 P6 };\n",\
"\n",\
+"freeset\n",\
+"1 2 4 5 6 7;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 5 6 8;\n",\
+"\n",\
"\n",\
"endrule\n",\
"\n",\
@@ -405,7 +416,7 @@ const char * prismrules2[] = {
"\n",\
"rule \"flat prism\"\n",\
"\n",\
-"quality 1\n",\
+"quality 100\n",\
"\n",\
"mappoints\n",\
"(0, 0, 0);\n",\
diff --git a/Netgen/libsrc/meshing/prism2rls_2.cpp b/Netgen/libsrc/meshing/prism2rls_2.cpp
new file mode 100644
index 0000000000..baf0bef388
--- /dev/null
+++ b/Netgen/libsrc/meshing/prism2rls_2.cpp
@@ -0,0 +1,446 @@
+namespace netgen
+{
+const char * prismrules2[] = {
+"tolfak 0.5\n",\
+"\n",\
+"rule \"prism on quad\"\n",\
+"\n",\
+"quality 1\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(1, 5, 2) del;\n",\
+"(4, 3, 6) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(5, 2, 3, 6);\n",\
+"(1, 5, 6, 4);\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"orientations\n",\
+"(1, 2, 3, 5);\n",\
+"(1, 3, 4, 6);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.3 P1, -0.1 P2, -0.1 P3, 0.3 P4, 0.3 P5, 0.3 P6 };\n",\
+"{ -0.1 P1, 0.3 P2, 0.3 P3, -0.1 P4, 0.3 P5, 0.3 P6 };\n",\
+"\n",\
+"freezonelimit\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
+"{ 0 P1, 0.25 P2, 0.25 P3, 0 P4, 0.25 P5, 0.25 P6 };\n",\
+"\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"prism on quad, one trig\"\n",\
+"\n",\
+"quality 2\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(1, 5, 2) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(5, 2, 3, 6);\n",\
+"(1, 5, 6, 4);\n",\
+"(4, 6, 3);\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"orientations\n",\
+"(1, 2, 3, 5);\n",\
+"(1, 3, 4, 6);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.3 P1, -0.1 P2, -0.1 P3, 0.3 P4, 0.3 P5, 0.3 P6 };\n",\
+"{ -0.1 P1, 0.3 P2, 0.3 P3, -0.1 P4, 0.3 P5, 0.3 P6 };\n",\
+"\n",\
+"freezonelimit\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
+"{ 0 P1, 0.25 P2, 0.25 P3, 0 P4, 0.25 P5, 0.25 P6 };\n",\
+"\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"prism on 2 quad\"\n",\
+"\n",\
+"quality 1\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(2, 5, 6, 3) del;\n",\
+"(1, 5, 2) del;\n",\
+"(4, 3, 6) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(1, 5, 6, 4);\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.3 P1, -0.1 P2, -0.1 P3, 0.3 P4, 0.3 P5, 0.3 P6 };\n",\
+"\n",\
+"freezonelimit\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
+"\n",\
+"freeset\n",\
+"1 2 4 5 6 7;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 6;\n",\
+"\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"prism on 2 quad, one trig\"\n",\
+"\n",\
+"quality 2\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(2, 5, 6, 3) del;\n",\
+"(1, 5, 2) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(1, 5, 6, 4);\n",\
+"(4, 6, 3);\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.3 P1, -0.1 P2, -0.1 P3, 0.3 P4, 0.3 P5, 0.3 P6 };\n",\
+"\n",\
+"freezonelimit\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0.25 P1, 0 P2, 0 P3, 0.25 P4, 0.25 P5, 0.25 P6 };\n",\
+"\n",\
+"freeset\n",\
+"1 2 4 5 6 7;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 6;\n",\
+"\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"prism on 2 quada\"\n",\
+"\n",\
+"quality 1\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(5, 1, 4, 6) del;\n",\
+"(1, 5, 2) del;\n",\
+"(4, 3, 6) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(5, 2, 3, 6);\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ -0.1 P1, 0.3 P2, 0.3 P3, -0.1 P4, 0.3 P5, 0.3 P6 };\n",\
+"\n",\
+"freezonelimit\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"{ 0 P1, 0.25 P2, 0.25 P3, 0 P4, 0.25 P5, 0.25 P6 };\n",\
+"\n",\
+"freeset\n",\
+"1 2 3 5 6 7;\n",\
+"\n",\
+"freeset\n",\
+"1 3 4 6;\n",\
+"\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"fill prism\"\n",\
+"\n",\
+"quality 1\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(2, 5, 6, 3) del;\n",\
+"(5, 1, 4, 6) del;\n",\
+"(1, 5, 2) del;\n",\
+"(4, 3, 6) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"\n",\
+"freeset\n",\
+"1 2 4 5;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 6;\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"prism on 3 quad, one trig\"\n",\
+"\n",\
+"quality 2\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(1, 1, 0);\n",\
+"(0, 1, 0);\n",\
+"(0.5, 0, -0.86);\n",\
+"(0.5, 1, -0.86);\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3, 4) del;\n",\
+"(2, 5, 6, 3) del;\n",\
+"(5, 1, 4, 6) del;\n",\
+"(1, 5, 2) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(4, 6, 3);\n",\
+"\n",\
+"\n",\
+"elements\n",\
+"(1, 5, 2, 4, 6, 3);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P3 };\n",\
+"{ 1 P4 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"\n",\
+"freeset\n",\
+"1 2 4 5;\n",\
+"\n",\
+"freeset\n",\
+"2 3 4 6;\n",\
+"\n",\
+"endrule\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"\n",\
+"rule \"flat prism\"\n",\
+"\n",\
+"quality 1\n",\
+"\n",\
+"mappoints\n",\
+"(0, 0, 0);\n",\
+"(1, 0, 0);\n",\
+"(0.5, 0.866, 0);\n",\
+"(0, 0, -1);\n",\
+"(1, 0, -1);\n",\
+"(0.5, 0.866, -1);\n",\
+"\n",\
+"\n",\
+"mapfaces\n",\
+"(1, 2, 3) del;\n",\
+"(5, 4, 6) del;\n",\
+"\n",\
+"newpoints\n",\
+"\n",\
+"newfaces\n",\
+"(1, 2, 4);\n",\
+"(4, 2, 5);\n",\
+"(2, 3, 5);\n",\
+"(5, 3, 6);\n",\
+"(3, 1, 6);\n",\
+"(6, 1, 4);\n",\
+"\n",\
+"\n",\
+"\n",\
+"elements\n",\
+"(1, 2, 3, 5, 4, 6);\n",\
+"\n",\
+"freezone2\n",\
+"{ 1 P1 };\n",\
+"{ 1 P2 };\n",\
+"{ 1 P5 };\n",\
+"{ 1 P6 };\n",\
+"endrule\n",\
+"\n",\
+0};
+}
diff --git a/Netgen/libsrc/meshing/quadrls.cpp b/Netgen/libsrc/meshing/quadrls.cpp
index 01555b72ea..57fb010144 100644
--- a/Netgen/libsrc/meshing/quadrls.cpp
+++ b/Netgen/libsrc/meshing/quadrls.cpp
@@ -118,9 +118,9 @@ const char * quadrules[] = {
"\n",\
"\n",\
"\n",\
-"rule \"Quad P Right (1)\"\n",\
+"rule \"Quad P Right (2)\"\n",\
"\n",\
-"quality 1\n",\
+"quality 2\n",\
"\n",\
"mappoints\n",\
"(0, 0);\n",\
@@ -131,7 +131,7 @@ const char * quadrules[] = {
"(1, 2) del;\n",\
"\n",\
"newpoints\n",\
-"(0, 1) { } { 1 y3 };\n",\
+"(0, 1) { -1 X2, 1 X3 } { 1 Y3 };\n",\
"\n",\
"newlines\n",\
"(1, 4);\n",\
@@ -141,26 +141,31 @@ const char * quadrules[] = {
"freearea\n",\
"(0, 0);\n",\
"(1, 0) { 1 X2 } { };\n",\
-"(1.2, 0.6) { 0.6 X2, 0.6 Y2 } { 0.6 Y3 };\n",\
+"(1.2, 0.5) { 0.7 X2, 0.5 X3 } { 0.5 Y3 };\n",\
"(1, 1) { 1 X3 } { 1 Y3 };\n",\
-"(-0.5, 1.5) { } { 1.5 Y3 };\n",\
+"(-0.5, 1.5) { -2 X2, 1.5 X3 } { 1.5 Y3 };\n",\
"\n",\
"freearea2\n",\
"(0, 0);\n",\
"(1, 0) { 1 X2 } { };\n",\
-"(1, 0.5) { 0.5 X2, 0.5 Y2 } { 0.5 Y3 };\n",\
+"(1, 0.5) { 0.5 X2, 0.5 X3 } { 0.5 Y3 };\n",\
"(1, 1) { 1 X3 } { 1 Y3 };\n",\
-"(0, 1) { } { 1 Y3 };\n",\
+"(0, 1) { -1 X2, 1 X3 } { 1 Y3 };\n",\
"\n",\
"elements\n",\
"(1, 2, 3, 4);\n",\
"\n",\
+"\n",\
+"orientations\n",\
+"(1, 2, 3);\n",\
+"\n",\
+"\n",\
"endrule\n",\
"\n",\
"\n",\
-"rule \"Quad Right PL (1)\"\n",\
+"rule \"Quad Right PL (2)\"\n",\
"\n",\
-"quality 1\n",\
+"quality 2\n",\
"\n",\
"mappoints\n",\
"(0, 0);\n",\
@@ -182,9 +187,9 @@ const char * quadrules[] = {
"(0, 0);\n",\
"(1, 0) { 1 X2 } { };\n",\
"(1, 1) { 1 X3 } { 1 Y3 };\n",\
-"(0.5, 1.2) { -0.2 X2, 0.6 X3, 0.6 X4 } { -0.2 Y2, 0.6 Y3, 0.6 Y4 };\n",\
+"(0.5, 1.2) { -0.1 X2, 0.6 X3, 0.6 X4 } { -0.1 Y2, 0.6 Y3, 0.6 Y4 };\n",\
"(0, 1) { 1 X4 } { 1 Y4 };\n",\
-"(-0.2, 0.5) { -0.2 X2, -0.2 X3, 0.6 X4 } { -0.2 Y2, -0.2 Y3, 0.6 Y4 };\n",\
+"(-0.2, 0.5) { -0.1 X2, -0.1 X3, 0.6 X4 } { -0.1 Y2, -0.1 Y3, 0.6 Y4 };\n",\
"\n",\
"freearea2\n",\
"(0, 0);\n",\
@@ -197,6 +202,13 @@ const char * quadrules[] = {
"elements\n",\
"(1, 2, 3, 4);\n",\
"\n",\
+"orientations\n",\
+"(1, 2, 3);\n",\
+"(1, 3, 4);\n",\
+"(1, 2, 4);\n",\
+"(4, 2, 3);\n",\
+"\n",\
+"\n",\
"endrule\n",\
"\n",\
"\n",\
@@ -246,9 +258,9 @@ const char * quadrules[] = {
"\n",\
"\n",\
"\n",\
-"rule \"Left P Quad (1)\"\n",\
+"rule \"Left P Quad (2)\"\n",\
"\n",\
-"quality 1\n",\
+"quality 2\n",\
"\n",\
"mappoints\n",\
"(0, 0);\n",\
@@ -289,9 +301,9 @@ const char * quadrules[] = {
"\n",\
"\n",\
"\n",\
-"rule \"Left Quad RP (1)\"\n",\
+"rule \"Left Quad RP (2)\"\n",\
"\n",\
-"quality 1\n",\
+"quality 2\n",\
"\n",\
"mappoints\n",\
"(0, 0);\n",\
@@ -312,9 +324,9 @@ const char * quadrules[] = {
"freearea\n",\
"(0, 0);\n",\
"(1, 0) { 1 X2 } { };\n",\
-"(1.2, 0.5) { 0.6 X2, 0.6 X4, -0.2 X3 } { 0.6 Y2, 0.6 Y4, -0.2 Y3 };\n",\
+"(1.2, 0.5) { 0.6 X2, 0.6 X4, -0.1 X3 } { 0.6 Y2, 0.6 Y4, -0.1 Y3 };\n",\
"(1, 1) { 1 X4 } { 1 Y4 };\n",\
-"(0.5, 1.2) { -0.2 X2, 0.6 X3, 0.6 X4 } { -0.2 Y2, 0.6 Y3, 0.6 Y4 };\n",\
+"(0.5, 1.2) { -0.1 X2, 0.6 X3, 0.6 X4 } { -0.1 Y2, 0.6 Y3, 0.6 Y4 };\n",\
"(0, 1) { 1 X3 } { 1 Y3 };\n",\
"\n",\
"freearea2\n",\
@@ -328,6 +340,10 @@ const char * quadrules[] = {
"elements\n",\
"(1, 2, 4, 3);\n",\
"\n",\
+"orientations\n",\
+"(1, 2, 4);\n",\
+"(1, 4, 3);\n",\
+"\n",\
"endrule\n",\
"\n",\
"\n",\
@@ -651,9 +667,9 @@ const char * quadrules[] = {
"\n",\
"\n",\
"\n",\
-"rule \"Vis A Vis (1)\"\n",\
+"rule \"Vis A Vis (2)\"\n",\
"\n",\
-"quality 1\n",\
+"quality 2\n",\
"\n",\
"mappoints\n",\
"(0, 0);\n",\
@@ -690,6 +706,12 @@ const char * quadrules[] = {
"elements\n",\
"(1, 2, 3, 4);\n",\
"\n",\
+"orientations\n",\
+"(1, 3, 4);\n",\
+"(2, 3, 4);\n",\
+"(1, 2, 3);\n",\
+"(1, 2, 4);\n",\
+"\n",\
"endrule\n",\
"\n",\
"\n",\
diff --git a/Netgen/libsrc/meshing/refine.cpp b/Netgen/libsrc/meshing/refine.cpp
index c14979693e..f7578d3394 100644
--- a/Netgen/libsrc/meshing/refine.cpp
+++ b/Netgen/libsrc/meshing/refine.cpp
@@ -4,96 +4,77 @@
namespace netgen
{
- void Refinement :: Refine (Mesh & mesh, int /* levels */)
+ void Refinement :: Refine (Mesh & mesh)
{
- int i, j, k;
-
-
// reduce 2nd order
mesh.ComputeNVertices();
mesh.SetNP(mesh.GetNV());
-
- // for (l = 1; l <= levels; l++)
- // {
INDEX_2_HASHTABLE<int> between(mesh.GetNP() + 5);
int oldne, oldns, oldnf;
// refine edges
-
- ARRAY<EdgePointGeomInfo> epgi;
+ ARRAY<EdgePointGeomInfo,PointIndex::BASE> epgi;
oldns = mesh.GetNSeg();
-
- for (i = 1; i <= oldns; i++)
+ for (SegmentIndex si = 0; si < oldns; si++)
{
- const Segment & el = mesh.LineSegment(i);
-
- INDEX_2 i2(el.p1, el.p2);
- i2.Sort();
+ const Segment & el = mesh.LineSegment(si);
- int pnew;
+ INDEX_2 i2 = INDEX_2::Sort(el.p1, el.p2);
+ PointIndex pinew;
EdgePointGeomInfo ngi;
if (between.Used(i2))
{
- pnew = between.Get(i2);
- ngi = epgi.Get(pnew);
+ pinew = between.Get(i2);
+ ngi = epgi[pinew];
}
else
{
- Point3d pb;
- pb = Center (mesh.Point (el.p1),
- mesh.Point (el.p2));
+ Point3d pnew;
PointBetween (mesh.Point (el.p1),
mesh.Point (el.p2), 0.5,
el.surfnr1, el.surfnr2,
el.epgeominfo[0], el.epgeominfo[1],
- pb, ngi);
+ pnew, ngi);
- pnew = mesh.AddPoint (pb);
+ pinew = mesh.AddPoint (pnew);
+ between.Set (i2, pinew);
- between.Set (i2, pnew);
- if (pnew > epgi.Size())
- epgi.SetSize (pnew);
- epgi.Elem(pnew) = ngi;
-
- (*testout) << "ref edge, oldgi = "
- << el.epgeominfo[0] << " - " << el.epgeominfo[1]
- << ", new gi = " << ngi << endl;
-
+ if (pinew >= epgi.Size()+PointIndex::BASE)
+ epgi.SetSize (pinew+1-PointIndex::BASE);
+ epgi[pinew] = ngi;
}
Segment ns1 = el;
Segment ns2 = el;
- ns1.p2 = pnew;
+ ns1.p2 = pinew;
ns1.epgeominfo[1] = ngi;
- ns2.p1 = pnew;
+ ns2.p1 = pinew;
ns2.epgeominfo[0] = ngi;
- mesh.LineSegment(i) = ns1;
+ mesh.LineSegment(si) = ns1;
mesh.AddSegment (ns2);
}
-
-
- (*testout) << "refine surfaces" << endl;
// refine surface elements
+ ARRAY<PointGeomInfo,PointIndex::BASE> surfgi (8*mesh.GetNP());
+ for (int i = PointIndex::BASE;
+ i < surfgi.Size()+PointIndex::BASE; i++)
+ surfgi[i].trignum = -1;
- ARRAY<PointGeomInfo> surfgi (8*mesh.GetNP());
- for (i = 1; i <= surfgi.Size(); i++)
- surfgi.Elem(i).trignum = -1;
oldnf = mesh.GetNSE();
- for (i = 1; i <= oldnf; i++)
+ for (SurfaceElementIndex sei = 0; sei < oldnf; sei++)
{
int j, k;
- const Element2d & el = mesh.SurfaceElement(i);
+ const Element2d & el = mesh.SurfaceElement(sei);
switch (el.GetType())
{
@@ -102,27 +83,25 @@ namespace netgen
{
ArrayMem<int,6> pnums(6);
ArrayMem<PointGeomInfo,6> pgis(6);
-
+
static int betw[3][3] =
{ { 2, 3, 4 },
{ 1, 3, 5 },
{ 1, 2, 6 } };
-
+
for (j = 1; j <= 3; j++)
{
pnums.Elem(j) = el.PNum(j);
pgis.Elem(j) = el.GeomInfoPi(j);
}
-
+
for (j = 0; j < 3; j++)
{
- int pi1 = pnums.Elem(betw[j][0]);
- int pi2 = pnums.Elem(betw[j][1]);
-
+ PointIndex pi1 = pnums.Elem(betw[j][0]);
+ PointIndex pi2 = pnums.Elem(betw[j][1]);
+
INDEX_2 i2 (pi1, pi2);
i2.Sort();
-
-
Point3d pb;
PointGeomInfo pgi;
@@ -146,47 +125,15 @@ namespace netgen
if (surfgi.Size() < pnums.Elem(4+j))
surfgi.SetSize (pnums.Elem(4+j));
surfgi.Elem(pnums.Elem(4+j)) = pgis.Elem(4+j);
-
-
- /*
- if (between.Used(i2))
- {
- pnums.Elem(4+j) = between.Get(i2);
- pgis.Elem(4+j) = surfgi.Get(pnums.Elem(4+j));
- }
- else
- {
- Point3d pb;
- PointBetween (mesh.Point (pi1),
- mesh.Point (pi2), 0.5,
- mesh.GetFaceDescriptor(el.GetIndex ()).SurfNr(),
- el.GeomInfoPi (betw[j][0]),
- el.GeomInfoPi (betw[j][1]),
- pb, pgis.Elem(4+j));
-
- pnums.Elem(4+j) = mesh.AddPoint (pb);
-
- between.Set (i2, pnums.Get(4+j));
-
- if (surfgi.Size() < pnums.Elem(4+j))
- surfgi.SetSize (pnums.Elem(4+j));
- surfgi.Elem(pnums.Elem(4+j)) = pgis.Elem(4+j);
-
- (*testout) << "ref face, oldgi = "
- << el.GeomInfoPi (betw[j][0]) << " - "
- << el.GeomInfoPi (betw[j][1])
- << ", new gi = " << pgis.Elem(4+j) << endl;
-
- }
- */
}
- static int reftab[4][3] =
+
+ static int reftab[4][3] =
{ { 1, 6, 5 },
{ 2, 4, 6 },
{ 3, 5, 4 },
{ 6, 4, 5 } };
-
+
int ind = el.GetIndex();
for (j = 0; j < 4; j++)
{
@@ -197,9 +144,9 @@ namespace netgen
nel.GeomInfoPi(k) = pgis.Get(reftab[j][k-1]);
}
nel.SetIndex(ind);
-
+
if (j == 0)
- mesh.SurfaceElement(i) = nel;
+ mesh.SurfaceElement(sei) = nel;
else
mesh.AddSurfaceElement(nel);
}
@@ -207,31 +154,32 @@ namespace netgen
}
case QUAD:
case QUAD6:
+ case QUAD8:
{
ArrayMem<int,9> pnums(9);
ArrayMem<PointGeomInfo,9> pgis(9);
-
+
static int betw[5][3] =
{ { 1, 2, 5 },
{ 2, 3, 6 },
{ 3, 4, 7 },
{ 1, 4, 8 },
{ 1, 3, 9 } };
-
+
for (j = 1; j <= 4; j++)
{
pnums.Elem(j) = el.PNum(j);
pgis.Elem(j) = el.GeomInfoPi(j);
}
-
+
for (j = 0; j < 5; j++)
{
int pi1 = pnums.Elem(betw[j][0]);
int pi2 = pnums.Elem(betw[j][1]);
-
+
INDEX_2 i2 (pi1, pi2);
i2.Sort();
-
+
if (between.Used(i2))
{
pnums.Elem(5+j) = between.Get(i2);
@@ -246,19 +194,19 @@ namespace netgen
el.GeomInfoPi (betw[j][0]),
el.GeomInfoPi (betw[j][1]),
pb, pgis.Elem(5+j));
-
+
pnums.Elem(5+j) = mesh.AddPoint (pb);
-
+
between.Set (i2, pnums.Get(5+j));
-
+
if (surfgi.Size() < pnums.Elem(5+j))
surfgi.SetSize (pnums.Elem(5+j));
surfgi.Elem(pnums.Elem(5+j)) = pgis.Elem(5+j);
}
}
- static int reftab[4][4] =
- {
+ static int reftab[4][4] =
+ {
{ 1, 5, 9, 8 },
{ 5, 2, 6, 9 },
{ 8, 9, 7, 4 },
@@ -274,9 +222,9 @@ namespace netgen
nel.GeomInfoPi(k) = pgis.Get(reftab[j][k-1]);
}
nel.SetIndex(ind);
-
+
if (j == 0)
- mesh.SurfaceElement(i) = nel;
+ mesh.SurfaceElement(sei) = nel;
else
mesh.AddSurfaceElement(nel);
}
@@ -286,58 +234,62 @@ namespace netgen
PrintSysError ("Refine: undefined surface element type ", int(el.GetType()));
}
}
-
- (*testout) << "refine volume" << endl;
// refine volume elements
oldne = mesh.GetNE();
- for (i = 1; i <= oldne; i++)
+ for (ElementIndex ei = 0; ei < oldne; ei++)
{
int j, k;
- const Element & el = mesh.VolumeElement(i);
- ArrayMem<int,10> pnums(10);
- static int betw[6][3] =
- { { 1, 2, 5 },
- { 1, 3, 6 },
- { 1, 4, 7 },
- { 2, 3, 8 },
- { 2, 4, 9 },
- { 3, 4, 10 } };
-
- int elrev = el.flags.reverse;
-
- for (j = 1; j <= 4; j++)
- pnums.Elem(j) = el.PNum(j);
- if (elrev)
- Swap (pnums.Elem(3), pnums.Elem(4));
- for (j = 0; j < 6; j++)
+ const Element & el = mesh.VolumeElement(ei);
+ switch (el.GetType())
{
- INDEX_2 i2;
- i2.I1() = pnums.Get(betw[j][0]);
- i2.I2() = pnums.Get(betw[j][1]);
- i2.Sort();
-
- if (between.Used(i2))
- pnums.Elem(5+j) = between.Get(i2);
- else
- {
- pnums.Elem(5+j) = mesh.AddPoint
+ case TET:
+ case TET10:
+ {
+ ArrayMem<int,10> pnums(10);
+ static int betw[6][3] =
+ { { 1, 2, 5 },
+ { 1, 3, 6 },
+ { 1, 4, 7 },
+ { 2, 3, 8 },
+ { 2, 4, 9 },
+ { 3, 4, 10 } };
+
+ int elrev = el.flags.reverse;
+
+ for (j = 1; j <= 4; j++)
+ pnums.Elem(j) = el.PNum(j);
+ if (elrev)
+ swap (pnums.Elem(3), pnums.Elem(4));
+
+ for (j = 0; j < 6; j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = pnums.Get(betw[j][0]);
+ i2.I2() = pnums.Get(betw[j][1]);
+ i2.Sort();
+
+ if (between.Used(i2))
+ pnums.Elem(5+j) = between.Get(i2);
+ else
+ {
+ pnums.Elem(5+j) = mesh.AddPoint
(Center (mesh.Point(i2.I1()),
mesh.Point(i2.I2())));
- between.Set (i2, pnums.Elem(5+j));
- }
- }
+ between.Set (i2, pnums.Elem(5+j));
+ }
+ }
- static int reftab[8][4] =
- { { 1, 5, 6, 7 },
- { 5, 2, 8, 9 },
- { 6, 8, 3, 10 },
- { 7, 9, 10, 4 },
- { 5, 6, 7, 9 },
- { 5, 6, 9, 8 },
- { 6, 7, 9, 10 },
- { 6, 8, 10, 9 } };
+ static int reftab[8][4] =
+ { { 1, 5, 6, 7 },
+ { 5, 2, 8, 9 },
+ { 6, 8, 3, 10 },
+ { 7, 9, 10, 4 },
+ { 5, 6, 7, 9 },
+ { 5, 6, 9, 8 },
+ { 6, 7, 9, 10 },
+ { 6, 8, 10, 9 } };
/*
{ { 1, 5, 6, 7 },
{ 5, 2, 8, 9 },
@@ -348,40 +300,264 @@ namespace netgen
{ 6, 7, 9, 10 },
{ 6, 8, 9, 10 } };
*/
- static int reverse[8] =
- {
- 0, 0, 0, 0, 0, 1, 0, 1
- };
-
- int ind = el.GetIndex();
- for (j = 0; j < 8; j++)
- {
- Element nel;
- for (k = 1; k <= 4; k++)
- nel.PNum(k) = pnums.Get(reftab[j][k-1]);
- nel.SetIndex(ind);
- nel.flags.reverse = reverse[j];
- if (elrev)
+ static int reverse[8] =
+ {
+ 0, 0, 0, 0, 0, 1, 0, 1
+ };
+
+ int ind = el.GetIndex();
+ for (j = 0; j < 8; j++)
+ {
+ Element nel;
+ for (k = 1; k <= 4; k++)
+ nel.PNum(k) = pnums.Get(reftab[j][k-1]);
+ nel.SetIndex(ind);
+ nel.flags.reverse = reverse[j];
+ if (elrev)
{
nel.flags.reverse = 1 - nel.flags.reverse;
- Swap (nel.PNum(3), nel.PNum(4));
+ swap (nel.PNum(3), nel.PNum(4));
}
- if (j == 0)
- mesh.VolumeElement(i) = nel;
- else
- mesh.AddVolumeElement (nel);
+ if (j == 0)
+ mesh.VolumeElement(ei) = nel;
+ else
+ mesh.AddVolumeElement (nel);
+ }
+ break;
+ }
+ case HEX:
+ {
+ ArrayMem<int,27> pnums(27);
+ static int betw[13][3] =
+ { { 1, 2, 9 },
+ { 3, 4, 10 },
+ { 4, 1, 11 },
+ { 2, 3, 12 },
+ { 5, 6, 13 },
+ { 7, 8, 14 },
+ { 8, 5, 15 },
+ { 6, 7, 16 },
+ { 1, 5, 17 },
+ { 2, 6, 18 },
+ { 3, 7, 19 },
+ { 4, 8, 20 },
+ { 2, 8, 21 },
+ };
+
+ static int fbetw[12][3] =
+ { { 1, 3, 22 },
+ { 2, 4, 22 },
+ { 5, 7, 23 },
+ { 6, 8, 23 },
+ { 1, 6, 24 },
+ { 2, 5, 24 },
+ { 2, 7, 25 },
+ { 3, 6, 25 },
+ { 3, 8, 26 },
+ { 4, 7, 26 },
+ { 1, 8, 27 },
+ { 4, 5, 27 },
+ };
+
+
+ pnums = -1;
+
+ for (j = 1; j <= 8; j++)
+ pnums.Elem(j) = el.PNum(j);
+
+
+ for (j = 0; j < 13; j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = pnums.Get(betw[j][0]);
+ i2.I2() = pnums.Get(betw[j][1]);
+ i2.Sort();
+
+ if (between.Used(i2))
+ pnums.Elem(9+j) = between.Get(i2);
+ else
+ {
+ pnums.Elem(9+j) = mesh.AddPoint
+ (Center (mesh.Point(i2.I1()),
+ mesh.Point(i2.I2())));
+ between.Set (i2, pnums.Elem(9+j));
+ }
+ }
+
+ for (j = 0; j < 6; j++)
+ {
+ INDEX_2 i2a, i2b;
+ i2a.I1() = pnums.Get(fbetw[2*j][0]);
+ i2a.I2() = pnums.Get(fbetw[2*j][1]);
+ i2a.Sort();
+ i2b.I1() = pnums.Get(fbetw[2*j+1][0]);
+ i2b.I2() = pnums.Get(fbetw[2*j+1][1]);
+ i2b.Sort();
+
+ if (between.Used(i2a))
+ pnums.Elem(22+j) = between.Get(i2a);
+ else if (between.Used(i2b))
+ pnums.Elem(22+j) = between.Get(i2b);
+ else
+ {
+ pnums.Elem(22+j) = mesh.AddPoint
+ (Center (mesh.Point(i2a.I1()),
+ mesh.Point(i2a.I2())));
+
+ between.Set (i2a, pnums.Elem(22+j));
+ }
+ }
+
+ static int reftab[8][8] =
+ { { 1, 9, 22, 11, 17, 24, 21, 27 },
+ { 9, 2, 12, 22, 24, 18, 25, 21 },
+ { 11, 22, 10, 4, 27, 21, 26, 20},
+ { 22, 12, 3, 10, 21, 25, 19, 26},
+ { 17, 24, 21, 27, 5, 13, 23, 15},
+ { 24, 18, 25, 21, 13, 6, 16, 23},
+ { 27, 21, 26, 20, 15, 23, 14, 8},
+ { 21, 25, 19, 26, 23, 16, 7, 14} };
+
+
+ int ind = el.GetIndex();
+ for (j = 0; j < 8; j++)
+ {
+ Element nel(HEX);
+ for (k = 1; k <= 8; k++)
+ nel.PNum(k) = pnums.Get(reftab[j][k-1]);
+ nel.SetIndex(ind);
+
+ if (j == 0)
+ mesh.VolumeElement(ei) = nel;
+ else
+ mesh.AddVolumeElement (nel);
+ }
+ break;
}
+ case PRISM:
+ {
+ ArrayMem<int,18> pnums(18);
+ static int betw[9][3] =
+ { { 3, 1, 7 },
+ { 1, 2, 8 },
+ { 3, 2, 9 },
+ { 6, 4, 10 },
+ { 4, 5, 11 },
+ { 6, 5, 12 },
+ { 1, 4, 13 },
+ { 3, 6, 14 },
+ { 2, 5, 15 },
+ };
+
+ static int fbetw[6][3] =
+ { { 1, 6, 16 },
+ { 3, 4, 16 },
+ { 1, 5, 17 },
+ { 2, 4, 17 },
+ { 2, 6, 18 },
+ { 3, 5, 18 },
+ };
+
+ //int elrev = el.flags.reverse;
+ pnums = -1;
+
+ for (j = 1; j <= 6; j++)
+ pnums.Elem(j) = el.PNum(j);
+ // if (elrev)
+ // swap (pnums.Elem(3), pnums.Elem(4));
+
+ for (j = 0; j < 9; j++)
+ {
+ INDEX_2 i2;
+ i2.I1() = pnums.Get(betw[j][0]);
+ i2.I2() = pnums.Get(betw[j][1]);
+ i2.Sort();
+
+ if (between.Used(i2))
+ pnums.Elem(7+j) = between.Get(i2);
+ else
+ {
+ pnums.Elem(7+j) = mesh.AddPoint
+ (Center (mesh.Point(i2.I1()),
+ mesh.Point(i2.I2())));
+ between.Set (i2, pnums.Elem(7+j));
+ }
+ }
+
+ for (j = 0; j < 3; j++)
+ {
+ INDEX_2 i2a, i2b;
+ i2a.I1() = pnums.Get(fbetw[2*j][0]);
+ i2a.I2() = pnums.Get(fbetw[2*j][1]);
+ i2a.Sort();
+ i2b.I1() = pnums.Get(fbetw[2*j+1][0]);
+ i2b.I2() = pnums.Get(fbetw[2*j+1][1]);
+ i2b.Sort();
+
+ if (between.Used(i2a))
+ pnums.Elem(16+j) = between.Get(i2a);
+ else if (between.Used(i2b))
+ pnums.Elem(16+j) = between.Get(i2b);
+ else
+ {
+ pnums.Elem(16+j) = mesh.AddPoint
+ (Center (mesh.Point(i2a.I1()),
+ mesh.Point(i2a.I2())));
+
+ between.Set (i2a, pnums.Elem(16+j));
+ }
+ }
+
+
+ static int reftab[8][6] =
+ { { 1, 8, 7, 13, 17, 16 },
+ { 7, 8, 9, 16, 17, 18 },
+ { 7, 9, 3, 16, 18, 14 },
+ { 8, 2, 9, 17, 15, 18 },
+ { 13, 17, 16, 4, 11, 10 },
+ { 16, 17, 18, 10, 11, 12 },
+ { 16, 18, 14, 10, 12, 6 },
+ { 17, 15, 18, 11, 5, 12 } };
+
+
+ int ind = el.GetIndex();
+ for (j = 0; j < 8; j++)
+ {
+ Element nel(PRISM);
+ for (k = 1; k <= 6; k++)
+ nel.PNum(k) = pnums.Get(reftab[j][k-1]);
+ nel.SetIndex(ind);
+
+
+ //nel.flags.reverse = reverse[j];
+ //if (elrev)
+ // {
+ //nel.flags.reverse = 1 - nel.flags.reverse;
+ //swap (nel.PNum(3), nel.PNum(4));
+
+
+ if (j == 0)
+ mesh.VolumeElement(ei) = nel;
+ else
+ mesh.AddVolumeElement (nel);
+ }
+ break;
+ }
+ default:
+ PrintSysError ("Refine: undefined volume element type ", int(el.GetType()));
+ }
}
-
+
+
// update identification tables
- for (i = 1; i <= mesh.GetIdentifications().GetMaxNr(); i++)
+ for (int i = 1; i <= mesh.GetIdentifications().GetMaxNr(); i++)
{
ARRAY<int,PointIndex::BASE> identmap;
mesh.GetIdentifications().GetMap (i, identmap);
- for (j = 1; j <= between.GetNBags(); j++)
- for (k = 1; k <= between.GetBagSize(j); k++)
+ for (int j = 1; j <= between.GetNBags(); j++)
+ for (int k = 1; k <= between.GetBagSize(j); k++)
{
INDEX_2 i2;
int newpi;
@@ -398,13 +574,12 @@ namespace netgen
}
-
-
-
+ mesh.ComputeNVertices();
+ return;
int cnttrials = 10;
int wrongels = 0;
- for (i = 1; i <= mesh.GetNE(); i++)
+ for (int i = 1; i <= mesh.GetNE(); i++)
if (mesh.VolumeElement(i).Volume(mesh.Points()) < 0)
{
wrongels++;
@@ -413,7 +588,6 @@ namespace netgen
else
mesh.VolumeElement(i).flags.badel = 0;
-
if (wrongels)
{
cout << "WARNING: " << wrongels << " with wrong orientation found" << endl;
@@ -421,12 +595,12 @@ namespace netgen
int np = mesh.GetNP();
ARRAY<Point3d> should(np);
ARRAY<Point3d> can(np);
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
{
should.Elem(i) = can.Elem(i) = mesh.Point(i);
}
- for (i = 1; i <= between.GetNBags(); i++)
- for (j = 1; j <= between.GetBagSize(i); j++)
+ for (int i = 1; i <= between.GetNBags(); i++)
+ for (int j = 1; j <= between.GetBagSize(i); j++)
{
INDEX_2 parent;
int child;
@@ -437,10 +611,10 @@ namespace netgen
BitArray boundp(np);
boundp.Clear();
- for (i = 1; i <= mesh.GetNSE(); i++)
+ for (int i = 1; i <= mesh.GetNSE(); i++)
{
const Element2d & sel = mesh.SurfaceElement(i);
- for (j = 1; j <= sel.GetNP(); j++)
+ for (int j = 1; j <= sel.GetNP(); j++)
boundp.Set(sel.PNum(j));
}
@@ -457,10 +631,10 @@ namespace netgen
cout << "lam = " << lam << endl;
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
if (boundp.Test(i))
{
- for (j = 1; j <= 3; j++)
+ for (int j = 1; j <= 3; j++)
mesh.Point(i).X(j) =
lam * should.Get(i).X(j) +
(1-lam) * can.Get(i).X(j);
@@ -471,38 +645,38 @@ namespace netgen
BitArray free (mesh.GetNP()), fhelp(mesh.GetNP());
free.Clear();
- for (i = 1; i <= mesh.GetNE(); i++)
+ for (int i = 1; i <= mesh.GetNE(); i++)
{
const Element & el = mesh.VolumeElement(i);
if (el.Volume(mesh.Points()) < 0)
- for (j = 1; j <= el.GetNP(); j++)
+ for (int j = 1; j <= el.GetNP(); j++)
free.Set (el.PNum(j));
}
- for (k = 1; k <= 3; k++)
+ for (int k = 1; k <= 3; k++)
{
fhelp.Clear();
- for (i = 1; i <= mesh.GetNE(); i++)
+ for (int i = 1; i <= mesh.GetNE(); i++)
{
const Element & el = mesh.VolumeElement(i);
int freeel = 0;
- for (j = 1; j <= el.GetNP(); j++)
+ for (int j = 1; j <= el.GetNP(); j++)
if (free.Test(el.PNum(j)))
freeel = 1;
if (freeel)
- for (j = 1; j <= el.GetNP(); j++)
+ for (int j = 1; j <= el.GetNP(); j++)
fhelp.Set (el.PNum(j));
}
free.Or (fhelp);
}
(*testout) << "smooth points: " << endl;
- for (i = 1; i <= free.Size(); i++)
+ for (int i = 1; i <= free.Size(); i++)
if (free.Test(i))
(*testout) << "p " << i << endl;
(*testout) << "surf points: " << endl;
- for (i = 1; i <= mesh.GetNSE(); i++)
- for (j = 1; j <= 3; j++)
+ for (int i = 1; i <= mesh.GetNSE(); i++)
+ for (int j = 1; j <= 3; j++)
(*testout) << mesh.SurfaceElement(i).PNum(j) << endl;
@@ -514,14 +688,14 @@ namespace netgen
wrongels = 0;
- for (i = 1; i <= mesh.GetNE(); i++)
+ for (int i = 1; i <= mesh.GetNE(); i++)
{
if (mesh.VolumeElement(i).Volume(mesh.Points()) < 0)
{
wrongels++;
mesh.VolumeElement(i).flags.badel = 1;
(*testout) << "wrong el: ";
- for (j = 1; j <= 4; j++)
+ for (int j = 1; j <= 4; j++)
(*testout) << mesh.VolumeElement(i).PNum(j) << " ";
(*testout) << endl;
}
@@ -532,7 +706,7 @@ namespace netgen
}
while (wrongels && cnttrials > 0);
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
can.Elem(i) = mesh.Point(i);
}
}
@@ -543,7 +717,5 @@ namespace netgen
}
mesh.ComputeNVertices();
- (*testout) << "refine done" << endl;
-
}
}
diff --git a/Netgen/libsrc/meshing/ruler2.cpp b/Netgen/libsrc/meshing/ruler2.cpp
index 700a3c4f70..82c6dbe57d 100644
--- a/Netgen/libsrc/meshing/ruler2.cpp
+++ b/Netgen/libsrc/meshing/ruler2.cpp
@@ -57,8 +57,8 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
double minelerr = 2 + 0.5 * tolerance * tolerance;
- int ok, found;
- netrule * rule;
+ bool ok;
+ int found; // rule number
Vector oldu, newu;
Point2d np;
Vec2d linevec;
@@ -172,18 +172,9 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
}
-
-#ifdef MARK
- MARK (applyrules2m1);
-#endif
-
for (ri = 1; ri <= rules.Size(); ri++)
{
-#ifdef MARK
- MARK (applyrules2m1a);
-#endif
-
- rule = rules.Get(ri);
+ netrule * rule = rules.Get(ri);
if (loctestmode)
(*testout) << "Rule " << rule->Name() << endl;
@@ -192,7 +183,12 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
pmap.SetSize (rule->GetNP());
lmap.SetSize (rule->GetNL());
-
+
+ lused = 0;
+ pused = 0;
+ pmap = 0;
+ lmap = 0;
+ /*
for (i = 1; i <= lused.Size(); i++)
lused.Set (i, 0);
for (i = 1; i <= pused.Size(); i++)
@@ -201,9 +197,10 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
pmap.Set(i, 0);
for (i = 1; i <= lmap.Size(); i++)
lmap.Set(i, 0);
+ */
- lused.Set (1, 1);
- lmap.Set (1, 1);
+ lused[0] = 1; // .Set (1, 1);
+ lmap[0] = 1; // .Set (1, 1);
for (j = 1; j <= 2; j++)
{
@@ -217,11 +214,6 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
while (nlok >= 2)
{
-#ifdef MARK
- MARK (applyrules2m2b);
-#endif
-
-
if (nlok <= rule->GetNOldL())
{
@@ -244,7 +236,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
lpoints.Get (loclin.I1()).Y();
if (rule->CalcLineError (nlok, linevec) > maxerr)
- ok = 0;
+ ok = 0;
for (j = 1; j <= 2 && ok; j++)
{
@@ -259,8 +251,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
{
if (rule->CalcPointDist (refpi, lpoints.Get(loclin.I(j))) > maxerr
|| !legalpoints.Get(loclin.I(j))
- || pused.Get(loclin.I(j)))
- ok = 0;
+ || pused.Get(loclin.I(j))) ok = 0;
}
}
}
@@ -296,11 +287,6 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
{
-#ifdef MARK
- MARK (applyrules2mc);
-#endif
-
-
// all lines are mapped !!
// map also all points:
@@ -335,7 +321,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
if (pmap.Get(npok))
pused.Elem(pmap.Get(npok))--;
- while (!ok && pmap.Get(npok) < maxlegalpoint /* lpoints.Size() */)
+ while (!ok && pmap.Get(npok) < maxlegalpoint)
{
ok = 1;
@@ -349,8 +335,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
{
if (rule->CalcPointDist (npok, lpoints.Get(pmap.Get(npok))) > maxerr
|| !legalpoints.Get(pmap.Get(npok))
- )
- ok = 0;
+ ) ok = 0;
}
}
@@ -374,36 +359,61 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
else
{
-#ifdef MARK
- MARK (applyrules2m2d);
-#endif
-
if (ok)
- {
- foundmap.Elem(ri)++;
- }
+ foundmap.Elem(ri)++;
if (loctestmode)
(*testout) << "lines and points mapped" << endl;
- oldu.SetSize (2 * rule->GetNOldP());
- for (i = 1; i <= rule->GetNOldP(); i++)
+ ok = 1;
+
+ // check orientations
+
+ for (i = 1; i <= rule->GetNOrientations() && ok; i++)
{
- // ui = lpoints.Get(pmap.Get(i)) - rule->GetPoint(i);
- Vec2d ui(rule->GetPoint(i), lpoints.Get(pmap.Get(i)));
- oldu.Set (2*i-1, ui.X());
- oldu.Set (2*i , ui.Y());
+ if (CW (lpoints.Get(pmap.Get(rule->GetOrientation(i).i1)),
+ lpoints.Get(pmap.Get(rule->GetOrientation(i).i2)),
+ lpoints.Get(pmap.Get(rule->GetOrientation(i).i3))) )
+ {
+ ok = 0;
+ if (loctestmode)
+ (*testout) << "Orientation " << i << " not ok" << endl;
+ }
}
- rule -> SetFreeZoneTransformation (oldu, tolerance);
-
- ok = 1;
+ if (ok)
+ {
+ oldu.SetSize (2 * rule->GetNOldP());
+
+ for (i = 1; i <= rule->GetNOldP(); i++)
+ {
+ Vec2d ui(rule->GetPoint(i), lpoints.Get(pmap.Get(i)));
+ oldu.Set (2*i-1, ui.X());
+ oldu.Set (2*i , ui.Y());
+ }
+
+ rule -> SetFreeZoneTransformation (oldu, tolerance);
+ }
+
- if (!rule->ConvexFreeZone())
+ if (ok && !rule->ConvexFreeZone())
{
ok = 0;
if (loctestmode) (*testout) << "freezone not convex" << endl;
+
+ /*
+ static int cnt = 0;
+ cnt++;
+ if (cnt % 100 == 0)
+ {
+ cout << "freezone not convex, cnt = " << cnt << "; rule = " << rule->Name() << endl;
+ (*testout) << "freezone not convex, cnt = " << cnt << "; rule = " << rule->Name() << endl;
+ (*testout) << "tol = " << tolerance << endl;
+ (*testout) << "maxerr = " << maxerr << "; minerr = " << minelerr << endl;
+ (*testout) << "freezone = " << rule->GetTransFreeZone() << endl;
+ }
+ */
}
// check freezone:
@@ -455,7 +465,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
}
-
+ /*
// check orientations
for (i = 1; i <= rule->GetNOrientations() && ok; i++)
@@ -469,7 +479,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
(*testout) << "Orientation " << i << " not ok" << endl;
}
}
-
+ */
if (ok)
@@ -542,7 +552,7 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
if (elerr < minelerr)
{
- if (testmode)
+ if (loctestmode)
{
(*testout) << "rule = " << rule->Name() << endl;
(*testout) << "class = " << tolerance << endl;
@@ -613,25 +623,19 @@ int Meshing2 ::ApplyRules (ARRAY<Point2d> & lpoints,
}
-#ifdef MARK
- MARK (applyrules2m3);
-#endif
-
-
if (found)
{
- for (i = 1; i <= tempnewpoints.Size(); i++)
- lpoints.Append (tempnewpoints.Get(i));
- for (i = 1; i <= tempnewlines.Size(); i++)
- llines.Append (tempnewlines.Get(i));
- for (i = 1; i <= tempdellines.Size(); i++)
- dellines.Append (tempdellines.Get(i));
- for (i = 1; i <= tempelements.Size(); i++)
- elements.Append (tempelements.Get(i));
-
- // (*testout) << "minelerr = " << minelerr << endl;
+ for (i = 0; i < tempnewpoints.Size(); i++)
+ lpoints.Append (tempnewpoints[i]);
+ for (i = 0; i < tempnewlines.Size(); i++)
+ llines.Append (tempnewlines[i]);
+ for (i = 0; i < tempdellines.Size(); i++)
+ dellines.Append (tempdellines[i]);
+ for (i = 0; i < tempelements.Size(); i++)
+ elements.Append (tempelements[i]);
}
+
return found;
}
diff --git a/Netgen/libsrc/meshing/ruler2.hpp b/Netgen/libsrc/meshing/ruler2.hpp
index 3627df521e..4ef855d4ec 100644
--- a/Netgen/libsrc/meshing/ruler2.hpp
+++ b/Netgen/libsrc/meshing/ruler2.hpp
@@ -42,6 +42,8 @@ private:
///
DenseMatrix oldutonewu, oldutofreearea, oldutofreearealimit;
///
+ ARRAY<DenseMatrix*> oldutofreearea_i;
+ ///
MatrixFixWidth<3> freesetinequ;
///
@@ -95,21 +97,36 @@ public:
///
void GetFreeZone (ARRAY<Point2d> & afreearea);
///
- float CalcPointDist (int pi, const Point2d & p) const;
+
+ double CalcPointDist (int pi, const Point2d & p) const
+ {
+ double dx = p.X() - points.Get(pi).X();
+ double dy = p.Y() - points.Get(pi).Y();
+ const threefloat * tf = &tolerances.Get(pi);
+ return tf->f1 * dx * dx + tf->f2 * dx * dy + tf->f3 * dy * dy;
+ }
+
///
float CalcLineError (int li, const Vec2d & v) const;
///
void SetFreeZoneTransformation (const Vector & u, int tolclass);
+
///
- int IsInFreeZone (const Point2d & p) const
+ bool IsInFreeZone (const Point2d & p) const
{
if (p.X() < fzminx || p.X() > fzmaxx ||
p.Y() < fzminy || p.Y() > fzmaxy) return 0;
- return IsInFreeZone2 (p);
+
+ for (int i = 0; i < transfreezone.Size(); i++)
+ {
+ if (freesetinequ(i, 0) * p.X() +
+ freesetinequ(i, 1) * p.Y() +
+ freesetinequ(i, 2) > 0) return 0;
+ }
+ return 1;
}
- ///
- int IsInFreeZone2 (const Point2d & p) const;
+
///
int IsLineInFreeZone (const Point2d & p1, const Point2d & p2) const
{
diff --git a/Netgen/libsrc/meshing/ruler3.cpp b/Netgen/libsrc/meshing/ruler3.cpp
index 0d6c2dab1f..48ba5bc465 100644
--- a/Netgen/libsrc/meshing/ruler3.cpp
+++ b/Netgen/libsrc/meshing/ruler3.cpp
@@ -65,7 +65,6 @@ int Meshing3 :: ApplyRules
)
{
- // const int rotsym = 3;
int i, j, k, ri, nfok, npok, incnpok, refpi, locpi, locfi, locfr;
int hi, minn, hpi;
float hf, err, minerr, teterr, minteterr;
diff --git a/Netgen/libsrc/meshing/secondorder.cpp b/Netgen/libsrc/meshing/secondorder.cpp
index 120ff024f1..d260eb20d7 100644
--- a/Netgen/libsrc/meshing/secondorder.cpp
+++ b/Netgen/libsrc/meshing/secondorder.cpp
@@ -19,24 +19,30 @@ namespace netgen
void Refinement :: MakeSecondOrder (Mesh & mesh)
{
- int i, j;
+ int nseg, nse, ne;
+
+ mesh.ComputeNVertices();
+ mesh.SetNP(mesh.GetNV());
INDEX_2_HASHTABLE<int> between(mesh.GetNP() + 5);
- int nseg, nse, ne;
+ bool thinlayers = 0;
+ for (ElementIndex ei = 0; ei < mesh.GetNE(); ei++)
+ if (mesh[ei].GetType() == PRISM ||
+ mesh[ei].GetType() == PRISM12)
+ thinlayers = 1;
+
nseg = mesh.GetNSeg();
- for (i = 1; i <= nseg; i++)
+ for (SegmentIndex si = 0; si < nseg; si++)
{
- Segment & el = mesh.LineSegment(i);
-
- INDEX_2 i2 (el.p1, el.p2);
- i2.Sort();
-
- int pnew;
+ Segment & el = mesh.LineSegment(si);
+
+ INDEX_2 i2 = INDEX_2::Sort (el.p1, el.p2);
+
if (between.Used(i2))
- pnew = between.Get(i2);
+ el.pmid = between.Get(i2);
else
{
Point3d pb;
@@ -47,31 +53,35 @@ namespace netgen
el.epgeominfo[0], el.epgeominfo[1],
pb, ngi);
- pnew = mesh.AddPoint (pb);
- between.Set (i2, pnew);
+ el.pmid = mesh.AddPoint (pb);
+ between.Set (i2, el.pmid);
}
- el.pmid = pnew;
}
// refine surface elements
nse = mesh.GetNSE();
- for (i = 1; i <= nse; i++)
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
{
int j;
- const Element2d & el = mesh.SurfaceElement(i);
+ const Element2d & el = mesh.SurfaceElement(sei);
- int onp = el.GetNP();
+ int onp;
Element2d newel;
newel.SetIndex (el.GetIndex());
static int betw_trig[3][3] =
- { { 2, 3, 4 },
- { 1, 3, 5 },
- { 1, 2, 6 } };
+ { { 1, 2, 3 },
+ { 0, 2, 4 },
+ { 0, 1, 5 } };
static int betw_quad6[2][3] =
- { { 1, 2, 5 },
- { 4, 3, 6 } };
+ { { 0, 1, 4 },
+ { 3, 2, 5 } };
+ static int betw_quad8[4][3] =
+ { { 0, 1, 4 },
+ { 3, 2, 5 },
+ { 0, 3, 6 },
+ { 1, 2, 7 } };
int (*betw)[3];
switch (el.GetType())
@@ -81,34 +91,43 @@ namespace netgen
{
betw = betw_trig;
newel.SetType (TRIG6);
+ onp = 3;
break;
}
case QUAD:
- case QUAD6:
+ case QUAD6:
case QUAD8:
{
- betw = betw_quad6;
- newel.SetType (QUAD6);
+ if (thinlayers)
+ {
+ betw = betw_quad6;
+ newel.SetType (QUAD6);
+ }
+ else
+ {
+ betw = betw_quad8;
+ newel.SetType (QUAD8);
+ }
+ onp = 4;
break;
}
default:
PrintSysError ("Unhandled element in secondorder:", int(el.GetType()));
}
- for (j = 1; j <= onp; j++)
- newel.PNum(j) = el.PNum(j);
+ for (j = 0; j < onp; j++)
+ newel[j] = el[j];
int nnp = newel.GetNP();
for (j = 0; j < nnp-onp; j++)
{
- int pi1 = newel.PNum(betw[j][0]);
- int pi2 = newel.PNum(betw[j][1]);
+ int pi1 = newel[betw[j][0]];
+ int pi2 = newel[betw[j][1]];
- INDEX_2 i2 (pi1, pi2);
- i2.Sort();
+ INDEX_2 i2 = INDEX_2::Sort (pi1, pi2);
if (between.Used(i2))
- newel.PNum(onp+1+j) = between.Get(i2);
+ newel[onp+j] = between.Get(i2);
else
{
Point3d pb;
@@ -116,32 +135,30 @@ namespace netgen
PointBetween (mesh.Point (pi1),
mesh.Point (pi2), 0.5,
mesh.GetFaceDescriptor(el.GetIndex ()).SurfNr(),
- el.GeomInfoPi (betw[j][0]),
- el.GeomInfoPi (betw[j][1]),
+ el.GeomInfoPi (betw[j][0]+1),
+ el.GeomInfoPi (betw[j][1]+1),
pb, newgi);
- newel.PNum(onp+1+j) = mesh.AddPoint (pb);
- between.Set (i2, newel.PNum(onp+1+j));
+ newel[onp+j] = mesh.AddPoint (pb);
+ between.Set (i2, newel[onp+j]);
}
}
- mesh.SurfaceElement(i) = newel;
+ mesh.SurfaceElement(sei) = newel;
}
+ // int i, j;
+
// refine volume elements
ne = mesh.GetNE();
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
{
int j;
const Element & el = mesh.VolumeElement(i);
-
- if (el.GetType() != TET && el.GetType() != PRISM)
- continue;
-
- int onp = el.GetNP();
+ int onp;
Element newel;
newel.SetIndex (el.GetIndex());
@@ -171,6 +188,7 @@ namespace netgen
{
betw = betw_tet;
newel.SetType (TET10);
+ onp = 4;
break;
}
case PRISM:
@@ -178,6 +196,7 @@ namespace netgen
{
betw = betw_prism;
newel.SetType (PRISM12);
+ onp = 6;
break;
}
default:
@@ -185,11 +204,11 @@ namespace netgen
}
- for (j = 1; j <= onp; j++)
+ for (int j = 1; j <= onp; j++)
newel.PNum(j) = el.PNum(j);
int nnp = newel.GetNP();
- for (j = 0; j < nnp-onp; j++)
+ for (int j = 0; j < nnp-onp; j++)
{
INDEX_2 i2(newel.PNum(betw[j][0]),
newel.PNum(betw[j][1]));
@@ -209,42 +228,58 @@ namespace netgen
mesh.VolumeElement (i) = newel;
}
- /*
+
// makes problems after linear mesh refinement, since
// 2nd order identifications are not removed
// update identification tables
- for (i = 1; i <= mesh.GetIdentifications().GetMaxNr(); i++)
- {
- ARRAY<int> identmap;
- mesh.GetIdentifications().GetMap (i, identmap);
-
- for (j = 1; j <= between.GetNBags(); j++)
- for (k = 1; k <= between.GetBagSize(j); k++)
- {
- INDEX_2 i2;
- int newpi;
- between.GetData (j, k, i2, newpi);
- INDEX_2 oi2(identmap.Get(i2.I1()),
- identmap.Get(i2.I2()));
- oi2.Sort();
- if (between.Used (oi2))
- {
- int onewpi = between.Get(oi2);
- mesh.GetIdentifications().Add (newpi, onewpi, i);
- }
- }
-
- }
- */
+ for (int i = 1; i <= mesh.GetIdentifications().GetMaxNr(); i++)
+ {
+ ARRAY<int,PointIndex::BASE> identmap;
+ mesh.GetIdentifications().GetMap (i, identmap);
+
+ for (INDEX_2_HASHTABLE<int>::Iterator it = between.Begin();
+ it != between.End(); it++)
+ {
+ INDEX_2 i2;
+ int newpi;
+ between.GetData (it, i2, newpi);
+ INDEX_2 oi2(identmap.Get(i2.I1()),
+ identmap.Get(i2.I2()));
+ oi2.Sort();
+ if (between.Used (oi2))
+ {
+ int onewpi = between.Get(oi2);
+ mesh.GetIdentifications().Add (newpi, onewpi, i);
+ }
+ }
+
+ /*
+ for (int j = 1; j <= between.GetNBags(); j++)
+ for (int k = 1; k <= between.GetBagSize(j); k++)
+ {
+ INDEX_2 i2;
+ int newpi;
+ between.GetData (j, k, i2, newpi);
+ INDEX_2 oi2(identmap.Get(i2.I1()),
+ identmap.Get(i2.I2()));
+ oi2.Sort();
+ if (between.Used (oi2))
+ {
+ int onewpi = between.Get(oi2);
+ mesh.GetIdentifications().Add (newpi, onewpi, i);
+ }
+ }
+ */
+ }
+
// mesh.mglevels++;
int oldsize = mesh.mlbetweennodes.Size();
mesh.mlbetweennodes.SetSize(mesh.GetNP());
- for (i = oldsize+1; i <= mesh.GetNP(); i++)
- {
- mesh.mlbetweennodes.Elem(i).I1() = 0;
- mesh.mlbetweennodes.Elem(i).I2() = 0;
- }
+ for (int i = oldsize; i < mesh.GetNP(); i++)
+ mesh.mlbetweennodes[i] = INDEX_2(0,0);
+
+ /*
for (i = 1; i <= between.GetNBags(); i++)
for (j = 1; j <= between.GetBagSize(i); j++)
{
@@ -253,6 +288,13 @@ namespace netgen
between.GetData (i, j, oldp, newp);
mesh.mlbetweennodes.Elem(newp) = oldp;
}
+ */
+
+ for (INDEX_2_HASHTABLE<int>::Iterator it = between.Begin();
+ it != between.End(); it++)
+ {
+ mesh.mlbetweennodes[between.GetData (it)] = between.GetHash(it);
+ }
mesh.ComputeNVertices();
@@ -265,13 +307,13 @@ namespace netgen
PrintMessage (3, "Validate mesh");
int np = mesh.GetNP();
int ne = mesh.GetNE();
- int i, j;
+ // int i, j;
ARRAY<INDEX_2> parents(np);
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
parents.Elem(i) = INDEX_2(0,0);
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
{
const Element & el = mesh.VolumeElement(i);
if (el.GetType() == TET10)
@@ -283,7 +325,7 @@ namespace netgen
{ 2, 3, 8 },
{ 2, 4, 9 },
{ 3, 4, 10 } };
- for (j = 0; j < 6; j++)
+ for (int j = 0; j < 6; j++)
{
int f1 = el.PNum (betweentab[j][0]);
int f2 = el.PNum (betweentab[j][1]);
@@ -302,7 +344,7 @@ namespace netgen
ValidateRefinedMesh (Mesh & mesh,
ARRAY<INDEX_2> & parents)
{
- int i, j, k;
+ // int i, j, k;
// homotopy method
@@ -310,7 +352,7 @@ namespace netgen
int cnttrials = 100;
int wrongels = 0;
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
if (mesh.VolumeElement(i).CalcJacobianBadness (mesh.Points()) > 1e10)
{
wrongels++;
@@ -334,12 +376,12 @@ namespace netgen
ARRAY<Point3d> should(np);
ARRAY<Point3d> can(np);
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
{
should.Elem(i) = can.Elem(i) = mesh.Point(i);
}
- for (i = 1; i <= parents.Size(); i++)
+ for (int i = 1; i <= parents.Size(); i++)
{
if (parents.Get(i).I1())
can.Elem(i) = Center (can.Elem(parents.Get(i).I1()),
@@ -348,16 +390,16 @@ namespace netgen
BitArray boundp(np);
boundp.Clear();
- for (i = 1; i <= mesh.GetNSE(); i++)
+ for (int i = 1; i <= mesh.GetNSE(); i++)
{
const Element2d & sel = mesh.SurfaceElement(i);
- for (j = 1; j <= sel.GetNP(); j++)
+ for (int j = 1; j <= sel.GetNP(); j++)
boundp.Set(sel.PNum(j));
}
(*testout) << "bpoints:" << endl;
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
if (boundp.Test(i))
(*testout) << i << endl;
@@ -379,10 +421,10 @@ namespace netgen
factry = lam + (1-lam) * facok;
cout << "trying: " << factry << endl;
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
if (boundp.Test(i))
{
- for (j = 1; j <= 3; j++)
+ for (int j = 1; j <= 3; j++)
mesh.Point(i).X(j) =
lam * should.Get(i).X(j) +
(1-lam) * can.Get(i).X(j);
@@ -392,7 +434,7 @@ namespace netgen
// (*testout) << "bad els: " << endl;
wrongels = 0;
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
{
if (!illegalels.Test(i) &&
mesh.VolumeElement(i).
@@ -425,14 +467,14 @@ namespace netgen
mesh.ImproveMeshJacobian (OPT_WORSTCASE);
facok = factry;
- for (i = 1; i <= np; i++)
+ for (int i = 1; i <= np; i++)
can.Elem(i) = mesh.Point(i);
}
}
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
{
if (illegalels.Test(i))
{
diff --git a/Netgen/libsrc/meshing/smoothing2.cpp b/Netgen/libsrc/meshing/smoothing2.cpp
index 32e44b256d..d26b20ad5d 100644
--- a/Netgen/libsrc/meshing/smoothing2.cpp
+++ b/Netgen/libsrc/meshing/smoothing2.cpp
@@ -6,460 +6,569 @@
namespace netgen
{
-static const MeshOptimize2d * meshthis;
+ static const MeshOptimize2d * meshthis;
+#ifdef OLD
+ void CalcTriangleBadness (double x2, double x3, double y3, double metricweight,
+ double h, double & badness, double & g1x, double & g1y)
+ {
+ // badness = sqrt(3.0) /36 * circumference^2 / area - 1
+ // p1 = (0, 0), p2 = (x2, 0), p3 = (x3, y3);
-inline void CalcTriangleBadness (double x2, double x3, double y3, double metricweight,
- double h, double & badness, double & g1x, double & g1y)
-{
- // badness = sqrt(3.0) /36 * circumference^2 / area - 1
- // p1 = (0, 0), p2 = (x2, 0), p3 = (x3, y3);
-
- Vec2d v23;
- double l12, l13, l23, cir, area;
- static const double c = sqrt(3.0) / 36;
- double c1, c2, c3, c4;
+ Vec2d v23;
+ double l12, l13, l23, cir, area;
+ static const double c = sqrt(3.0) / 36;
+ double c1, c2, c3, c4;
- v23.X() = x3 - x2;
- v23.Y() = y3;
+ v23.X() = x3 - x2;
+ v23.Y() = y3;
- l12 = x2;
- l13 = sqrt (x3*x3 + y3*y3);
- l23 = v23.Length();
+ l12 = x2;
+ l13 = sqrt (x3*x3 + y3*y3);
+ l23 = v23.Length();
- cir = l12 + l13 + l23;
- area = 0.5 * x2 * y3;
+ cir = l12 + l13 + l23;
+ area = 0.5 * x2 * y3;
- if (area <= 1e-24 * cir * cir)
- {
- g1x = 0;
- g1y = 0;
- badness = 1e10;
- return;
- }
+ if (area <= 1e-24 * cir * cir)
+ {
+ g1x = 0;
+ g1y = 0;
+ badness = 1e10;
+ return;
+ }
- badness = c * cir * cir / area - 1;
+ badness = c * cir * cir / area - 1;
- c1 = 2 * c * cir / area;
- c2 = 0.5 * c * cir * cir / (area * area);
+ c1 = 2 * c * cir / area;
+ c2 = 0.5 * c * cir * cir / (area * area);
- g1x = c1 * ( - 1 - x3 / l13) - c2 * (-v23.Y());
- g1y = c1 * ( - y3 / l13) - c2 * ( v23.X());
+ g1x = c1 * ( - 1 - x3 / l13) - c2 * (-v23.Y());
+ g1y = c1 * ( - y3 / l13) - c2 * ( v23.X());
- // metricweight = 0.1;
- if (metricweight > 0)
- {
- // area = (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);
- // add: metricweight * (area / h^2 + h^2 / area - 2)
+ // metricweight = 0.1;
+ if (metricweight > 0)
+ {
+ // area = (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);
+ // add: metricweight * (area / h^2 + h^2 / area - 2)
- const double area = x2 * y3;
- const double dareax1 = -y3;
- const double dareay1 = x3 - x2;
+ const double area = x2 * y3;
+ const double dareax1 = -y3;
+ const double dareay1 = x3 - x2;
- const double areahh = area / (h * h);
- const double fac = metricweight * (areahh - 1 / areahh) / area;
+ const double areahh = area / (h * h);
+ const double fac = metricweight * (areahh - 1 / areahh) / area;
- badness += metricweight * (areahh + 1 / areahh - 2);
- g1x += fac * dareax1;
- g1y += fac * dareay1;
+ badness += metricweight * (areahh + 1 / areahh - 2);
+ g1x += fac * dareax1;
+ g1y += fac * dareay1;
- /*
- // add: metricweight * (l1^2/h^2 + l2^2/h^2 + l3^2/h2 + h^2/l1^2 + h^2/l2^2 + h^2/l3^2 - 6)
- double h2 = h*h;
- double l1 = x2*x2;
- double l2 = x3*x3+y3*y3;
- double l3 = (x2-x3)*(x2-x3)+y3*y3;
- double dl1dx = 2*(-x2);
- double dl1dy = 0;
- double dl2dx = -2*x3;
- double dl2dy = -2*y3;
-
- badness += (l1/h2 + l2/h2 + l3/h2 +h2/l1 + h2/l2 + h2/l3-6) * metricweight;
-
- g1x += metricweight * (dl1dx/h2-h2/(l1*l1)*dl1dx + dl2dx/h2-h2/(l2*l2)*dl2dx);
- g1y += metricweight * (dl1dy/h2-h2/(l1*l1)*dl1dy + dl2dy/h2-h2/(l2*l2)*dl2dy);
- */
- }
-}
+ /*
+ // add: metricweight * (l1^2/h^2 + l2^2/h^2 + l3^2/h2 + h^2/l1^2 + h^2/l2^2 + h^2/l3^2 - 6)
+ double h2 = h*h;
+ double l1 = x2*x2;
+ double l2 = x3*x3+y3*y3;
+ double l3 = (x2-x3)*(x2-x3)+y3*y3;
+ double dl1dx = 2*(-x2);
+ double dl1dy = 0;
+ double dl2dx = -2*x3;
+ double dl2dy = -2*y3;
+
+ badness += (l1/h2 + l2/h2 + l3/h2 +h2/l1 + h2/l2 + h2/l3-6) * metricweight;
+
+ g1x += metricweight * (dl1dx/h2-h2/(l1*l1)*dl1dx + dl2dx/h2-h2/(l2*l2)*dl2dx);
+ g1y += metricweight * (dl1dy/h2-h2/(l1*l1)*dl1dy + dl2dy/h2-h2/(l2*l2)*dl2dy);
+ */
+ }
+ }
+
+#endif
+
+
+ /*
+ static const double c_trig = sqrt(3.0) / 12;
+ static const double c_trig4 = sqrt(3.0) / 3;
+ */
+ static const double c_trig = 0.14433756;
+ static const double c_trig4 = 0.57735026;
+
+ inline double CalcTriangleBadness (double x2, double x3, double y3,
+ double metricweight, double h)
+ {
+ // badness = sqrt(3.0) / 12 * (\sum l_i^2) / area - 1
+ // p1 = (0, 0), p2 = (x2, 0), p3 = (x3, y3);
+
+ double cir_2 = (x2*x2 + x3*x3 + y3*y3 - x2*x3);
+ double area = x2 * y3;
+
+ if (area <= 1e-24 * cir_2)
+ return 1e10;
+
+ double badness = c_trig4 * cir_2 / area - 1;
+
+ if (metricweight > 0)
+ {
+ // add: metricweight * (area / h^2 + h^2 / area - 2)
+
+ double areahh = area / (h * h);
+ badness += metricweight * (areahh + 1 / areahh - 2);
+ }
+ return badness;
+ }
+
+
+
+ inline void CalcTriangleBadness (double x2, double x3, double y3, double metricweight,
+ double h, double & badness, double & g1x, double & g1y)
+ {
+ // old: badness = sqrt(3.0) /36 * circumference^2 / area - 1
+ // badness = sqrt(3.0) / 12 * (\sum l_i^2) / area - 1
+ // p1 = (0, 0), p2 = (x2, 0), p3 = (x3, y3);
+
+
+ double cir_2 = 2* (x2*x2 + x3*x3 + y3*y3 - x2*x3);
+ double area = 0.5 * x2 * y3;
+
+ if (area <= 1e-24 * cir_2)
+ {
+ g1x = 0;
+ g1y = 0;
+ badness = 1e10;
+ return;
+ }
+
+ badness = c_trig * cir_2 / area - 1;
+
+ double c1 = -2 * c_trig / area;
+ double c2 = 0.5 * c_trig * cir_2 / (area * area);
+ g1x = c1 * (x2 + x3) + c2 * y3;
+ g1y = c1 * (y3) + c2 * (x2-x3);
+
+ if (metricweight > 0)
+ {
+ // area = (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);
+ // add: metricweight * (area / h^2 + h^2 / area - 2)
+
+ double area = x2 * y3;
+ double dareax1 = -y3;
+ double dareay1 = x3 - x2;
+
+ double areahh = area / (h * h);
+ double fac = metricweight * (areahh - 1 / areahh) / area;
+
+ badness += metricweight * (areahh + 1 / areahh - 2);
+ g1x += fac * dareax1;
+ g1y += fac * dareay1;
+ }
+ }
+
+
+
+
+
+
+
+#ifdef OLD
double CalcTriangleBadness (const Point3d & p1,
const Point3d & p2,
const Point3d & p3,
double metricweight,
double h)
{
- double badness;
- double g1x, g1y;
+ double badness;
+ double g1x, g1y;
- Vec3d e1 (p1, p2);
- Vec3d e2 (p1, p3);
+ Vec3d e1 (p1, p2);
+ Vec3d e2 (p1, p3);
- double e1l = e1.Length() + 1e-24;
- e1 /= e1l;
- double e1e2 = (e1 * e2);
- e2.Add (-e1e2, e1);
- double e2l = e2.Length();
+ double e1l = e1.Length() + 1e-24;
+ e1 /= e1l;
+ double e1e2 = (e1 * e2);
+ e2.Add (-e1e2, e1);
+ double e2l = e2.Length();
- CalcTriangleBadness ( e1l, e1e2, e2l,
- metricweight, h, badness, g1x, g1y);
- return badness;
-}
+ CalcTriangleBadness ( e1l, e1e2, e2l,
+ metricweight, h, badness, g1x, g1y);
+ return badness;
+ }
+#endif
-double CalcTriangleBadness (const Point3d & p1,
- const Point3d & p2,
- const Point3d & p3,
- const Vec3d & n,
- double metricweight,
- double h)
-{
- double badness;
- double g1x, g1y;
+
+
+ double CalcTriangleBadness (const Point3d & p1,
+ const Point3d & p2,
+ const Point3d & p3,
+ double metricweight,
+ double h)
+ {
+ // badness = sqrt(3.0) / 12 * (\sum l_i^2) / area - 1
+ // p1 = (0, 0), p2 = (x2, 0), p3 = (x3, y3);
+
+ Vec3d e12(p1,p2);
+ Vec3d e13(p1,p3);
+ Vec3d e23(p2,p3);
- Vec3d v1 (p1, p2);
- Vec3d v2 (p1, p3);
+ double l12_2 = e12.Length2();
+ double l13_2 = e13.Length2();
+ double l23_2 = e23.Length2();
- Vec3d e1 = v1;
- Vec3d e2 = v2;
+ double cir_2 = l12_2 + l13_2 + l23_2;
+ Vec3d area_v = Cross (e12, e13);
+ double area = 0.5 * area_v.Length();
- e1 -= (e1 * n) * n;
- e1 /= (e1.Length() + 1e-12);
- e2 = Cross (n, e1);
+ if (area <= 1e-24 * cir_2)
+ return 1e10;
- CalcTriangleBadness ( (e1 * v1), (e1 * v2), (e2 * v2),
- metricweight, h, badness, g1x, g1y);
- return badness;
-}
+ double badness = c_trig * cir_2 / area - 1;
+ if (metricweight > 0)
+ {
+ // area = (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);
+ // add: metricweight * (area / h^2 + h^2 / area - 2)
+ const double areahh = area / (h * h);
+ badness += metricweight * (areahh + 1 / areahh - 2);
+ }
+ return badness;
+ }
-static Point3d sp1;
-static PointGeomInfo gi1;
-static Vec3d n, t1, t2;
-static ARRAY<SurfaceElementIndex> locelements(0);
-static ARRAY<int> locrots(0);
-static ARRAY<double> lochs(0);
-// static int locerr2;
-static double locmetricweight = 0;
-static double loch;
-static int surfi, surfi2;
-static int uselocalh;
+ double CalcTriangleBadness (const Point3d & p1,
+ const Point3d & p2,
+ const Point3d & p3,
+ const Vec3d & n,
+ double metricweight,
+ double h)
+ {
+ Vec3d v1 (p1, p2);
+ Vec3d v2 (p1, p3);
-class Opti2SurfaceMinFunction : public MinFunction
-{
- const Mesh & mesh;
-public:
- Opti2SurfaceMinFunction (const Mesh & amesh)
- : mesh(amesh)
- { } ;
- virtual double FuncGrad (const Vector & x, Vector & g) const;
- virtual double Func (const Vector & x) const;
-};
-
-double Opti2SurfaceMinFunction ::
-Func (const Vector & x) const
-{
- Vector g(x.Size());
- return FuncGrad (x, g);
-}
+ Vec3d e1 = v1;
+ Vec3d e2 = v2;
+
+ e1 -= (e1 * n) * n;
+ e1 /= (e1.Length() + 1e-24);
+ e2 = Cross (n, e1);
+
+ return CalcTriangleBadness ( (e1 * v1), (e1 * v2), (e2 * v2),
+ metricweight, h);
+ }
-double Opti2SurfaceMinFunction ::
-FuncGrad (const Vector & x, Vector & grad) const
-{
- int j, roti;
- Vec3d n, vgrad;
- Point3d pp1;
- Vec2d g1;
- double badness, hbadness;
- vgrad = 0;
- badness = 0;
- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+ static MeshPoint sp1;
+ static PointGeomInfo gi1;
+ static Vec3d n, t1, t2;
+ static ARRAY<SurfaceElementIndex> locelements(0);
+ static ARRAY<int> locrots(0);
+ static ARRAY<double> lochs(0);
+ // static int locerr2;
+ static double locmetricweight = 0;
+ static double loch;
+ static int surfi, surfi2;
+ static int uselocalh;
- pp1 = sp1;
- pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
- // meshthis -> ProjectPoint (surfi, pp1);
- // meshthis -> GetNormalVector (surfi, pp1, n);
+ class Opti2SurfaceMinFunction : public MinFunction
+ {
+ const Mesh & mesh;
+ public:
+ Opti2SurfaceMinFunction (const Mesh & amesh)
+ : mesh(amesh)
+ { } ;
+ virtual double FuncGrad (const Vector & x, Vector & g) const;
+ virtual double Func (const Vector & x) const;
+ };
+
+ double Opti2SurfaceMinFunction ::
+ Func (const Vector & x) const
+ {
+ Vector g(x.Size());
+ return FuncGrad (x, g);
+ }
- for (j = 0; j < locelements.Size(); j++)
- {
- roti = locrots[j];
- const Element2d & bel = mesh[locelements[j]];
+ double Opti2SurfaceMinFunction ::
+ FuncGrad (const Vector & x, Vector & grad) const
+ {
+ Vec3d n, vgrad;
+ Point3d pp1;
+ double g1x, g1y;
+ double badness, hbadness;
- Vec3d e1(pp1, mesh[bel.PNumMod(roti + 1)]);
- Vec3d e2(pp1, mesh[bel.PNumMod(roti + 2)]);
+ vgrad = 0;
+ badness = 0;
- if (uselocalh) loch = lochs[j];
+ meshthis -> GetNormalVector (surfi, sp1, gi1, n);
- double e1l = e1.Length();
- if (Determinant(e1, e2, n) > 1e-8 * e1l * e2.Length())
- {
- e1 /= e1l;
- double e1e2 = e1 * e2;
- e2.Add (-e1e2, e1);
- double e2l = e2.Length();
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
- CalcTriangleBadness ( e1l, e1e2, e2l, locmetricweight, loch,
- hbadness, g1.X(), g1.Y());
+ // meshthis -> ProjectPoint (surfi, pp1);
+ // meshthis -> GetNormalVector (surfi, pp1, n);
- badness += hbadness;
- vgrad.Add2 (g1.X(), e1, g1.Y() / e2l, e2);
- }
- else
- badness += 1e8;
- }
+ for (int j = 0; j < locelements.Size(); j++)
+ {
+ int roti = locrots[j];
+ const Element2d & bel = mesh[locelements[j]];
- vgrad.Add (-(vgrad * n), n);
+ Vec3d e1(pp1, mesh[bel.PNumMod(roti + 1)]);
+ Vec3d e2(pp1, mesh[bel.PNumMod(roti + 2)]);
- grad.Elem(1) = vgrad * t1;
- grad.Elem(2) = vgrad * t2;
- return badness;
-}
+ if (uselocalh) loch = lochs[j];
+ double e1l = e1.Length();
+ if (Determinant(e1, e2, n) > 1e-8 * e1l * e2.Length())
+ {
+ e1 /= e1l;
+ double e1e2 = e1 * e2;
+ e2.Add (-e1e2, e1);
+ double e2l = e2.Length();
-class Opti2EdgeMinFunction : public MinFunction
-{
- const Mesh & mesh;
-public:
- Opti2EdgeMinFunction (const Mesh & amesh)
- : mesh(amesh) { } ;
+ CalcTriangleBadness ( e1l, e1e2, e2l, locmetricweight, loch,
+ hbadness, g1x, g1y);
- virtual double FuncGrad (const Vector & x, Vector & g) const;
- virtual double Func (const Vector & x) const;
-};
+ badness += hbadness;
+ vgrad.Add2 (g1x, e1, g1y / e2l, e2);
+ }
+ else
+ badness += 1e8;
+ }
-double Opti2EdgeMinFunction :: Func (const Vector & x) const
-{
- Vector g(x.Size());
- return FuncGrad (x, g);
-}
+ vgrad.Add (-(vgrad * n), n);
-double Opti2EdgeMinFunction :: FuncGrad (const Vector & x, Vector & grad) const
-{
- int j, rot;
- Vec3d n1, n2, v1, v2, e1, e2, vgrad;
- Point3d pp1;
- Vec2d g1;
- double badness, hbadness;
+ grad.Elem(1) = vgrad * t1;
+ grad.Elem(2) = vgrad * t2;
+ return badness;
+ }
- vgrad.X() = 0;
- vgrad.Y() = 0;
- vgrad.Z() = 0;
- badness = 0;
- pp1 = sp1 + x.Get(1) * t1;
- meshthis -> ProjectPoint2 (surfi, surfi2, pp1);
+ class Opti2EdgeMinFunction : public MinFunction
+ {
+ const Mesh & mesh;
+ public:
+ Opti2EdgeMinFunction (const Mesh & amesh)
+ : mesh(amesh) { } ;
- for (j = 0; j < locelements.Size(); j++)
- {
- rot = locrots[j];
- const Element2d & bel = mesh[locelements[j]];
+ virtual double FuncGrad (const Vector & x, Vector & g) const;
+ virtual double Func (const Vector & x) const;
+ };
- v1 = mesh[bel.PNumMod(rot + 1)] - pp1;
- v2 = mesh[bel.PNumMod(rot + 2)] - pp1;
+ double Opti2EdgeMinFunction :: Func (const Vector & x) const
+ {
+ Vector g(x.Size());
+ return FuncGrad (x, g);
+ }
- e1 = v1;
- e2 = v2;
- e1 /= e1.Length();
- e2 -= (e1 * e2) * e1;
- e2 /= e2.Length();
+ double Opti2EdgeMinFunction :: FuncGrad (const Vector & x, Vector & grad) const
+ {
+ int j, rot;
+ Vec3d n1, n2, v1, v2, e1, e2, vgrad;
+ Point3d pp1;
+ Vec2d g1;
+ double badness, hbadness;
- if (uselocalh) loch = lochs[j];
- CalcTriangleBadness ( (e1 * v1), (e1 * v2), (e2 * v2), locmetricweight, loch,
- hbadness, g1.X(), g1.Y());
+ vgrad.X() = 0;
+ vgrad.Y() = 0;
+ vgrad.Z() = 0;
+ badness = 0;
- badness += hbadness;
+ pp1 = sp1 + x.Get(1) * t1;
+ meshthis -> ProjectPoint2 (surfi, surfi2, pp1);
- vgrad.X() += g1.X() * e1.X() + g1.Y() * e2.X();
- vgrad.Y() += g1.X() * e1.Y() + g1.Y() * e2.Y();
- vgrad.Z() += g1.X() * e1.Z() + g1.Y() * e2.Z();
- }
+ for (j = 0; j < locelements.Size(); j++)
+ {
+ rot = locrots[j];
+ const Element2d & bel = mesh[locelements[j]];
- meshthis -> GetNormalVector (surfi, pp1, n1);
- meshthis -> GetNormalVector (surfi2, pp1, n2);
+ v1 = mesh[bel.PNumMod(rot + 1)] - pp1;
+ v2 = mesh[bel.PNumMod(rot + 2)] - pp1;
- v1 = Cross (n1, n2);
- v1 /= v1.Length();
+ e1 = v1;
+ e2 = v2;
+ e1 /= e1.Length();
+ e2 -= (e1 * e2) * e1;
+ e2 /= e2.Length();
- grad.Elem(1) = (vgrad * v1) * (t1 * v1);
+ if (uselocalh) loch = lochs[j];
+ CalcTriangleBadness ( (e1 * v1), (e1 * v2), (e2 * v2), locmetricweight, loch,
+ hbadness, g1.X(), g1.Y());
- return badness;
-}
+ badness += hbadness;
+ vgrad.X() += g1.X() * e1.X() + g1.Y() * e2.X();
+ vgrad.Y() += g1.X() * e1.Y() + g1.Y() * e2.Y();
+ vgrad.Z() += g1.X() * e1.Z() + g1.Y() * e2.Z();
+ }
+ meshthis -> GetNormalVector (surfi, pp1, n1);
+ meshthis -> GetNormalVector (surfi2, pp1, n2);
+ v1 = Cross (n1, n2);
+ v1 /= v1.Length();
-class Opti2SurfaceMinFunctionJacobian : public MinFunction
-{
- const Mesh & mesh;
-public:
- Opti2SurfaceMinFunctionJacobian (const Mesh & amesh)
- : mesh(amesh)
+ grad.Elem(1) = (vgrad * v1) * (t1 * v1);
+
+ return badness;
+ }
+
+
+
+
+ class Opti2SurfaceMinFunctionJacobian : public MinFunction
+ {
+ const Mesh & mesh;
+ public:
+ Opti2SurfaceMinFunctionJacobian (const Mesh & amesh)
+ : mesh(amesh)
{ } ;
- virtual double FuncGrad (const Vector & x, Vector & g) const;
- virtual double Func (const Vector & x) const;
-};
+ virtual double FuncGrad (const Vector & x, Vector & g) const;
+ virtual double FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const;
+ virtual double Func (const Vector & x) const;
+ };
-double Opti2SurfaceMinFunctionJacobian ::
-Func (const Vector & x) const
-{
- Vector g(x.Size());
- return FuncGrad (x, g);
-}
+ double Opti2SurfaceMinFunctionJacobian ::
+ Func (const Vector & x) const
+ {
+ Vector g(x.Size());
+ return FuncGrad (x, g);
+ }
-double Opti2SurfaceMinFunctionJacobian ::
-FuncGrad (const Vector & x, Vector & grad) const
-{
- // from 2d:
+ double Opti2SurfaceMinFunctionJacobian ::
+ FuncGrad (const Vector & x, Vector & grad) const
+ {
+ // from 2d:
- int j, k, lpi, gpi;
- Vec3d n, vgrad;
- Point3d pp1;
- Vec2d g1, vdir;
- double badness, hbadness, hbad, hderiv;
+ int j, k, lpi, gpi;
+ Vec3d n, vgrad;
+ Point3d pp1;
+ Vec2d g1, vdir;
+ double badness, hbadness, hbad, hderiv;
- vgrad = 0;
- badness = 0;
+ vgrad = 0;
+ badness = 0;
- meshthis -> GetNormalVector (surfi, sp1, gi1, n);
+ meshthis -> GetNormalVector (surfi, sp1, gi1, n);
- pp1 = sp1;
- pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
- // meshthis -> ProjectPoint (surfi, pp1);
- // meshthis -> GetNormalVector (surfi, pp1, n);
+ // meshthis -> ProjectPoint (surfi, pp1);
+ // meshthis -> GetNormalVector (surfi, pp1, n);
- static ARRAY<Point2d> pts2d;
- pts2d.SetSize(mesh.GetNP());
+ static ARRAY<Point2d> pts2d;
+ pts2d.SetSize(mesh.GetNP());
- grad = 0;
+ grad = 0;
- for (j = 1; j <= locelements.Size(); j++)
- {
- lpi = locrots.Get(j);
- const Element2d & bel =
- mesh[locelements.Get(j)];
+ for (j = 1; j <= locelements.Size(); j++)
+ {
+ lpi = locrots.Get(j);
+ const Element2d & bel =
+ mesh[locelements.Get(j)];
- gpi = bel.PNum(lpi);
+ gpi = bel.PNum(lpi);
- for (k = 1; k <= bel.GetNP(); k++)
- {
- PointIndex pi = bel.PNum(k);
- pts2d.Elem(pi) = Point2d (t1 * (mesh.Point(pi) - sp1),
- t2 * (mesh.Point(pi) - sp1));
- }
- pts2d.Elem(gpi) = Point2d (x.Get(1), x.Get(2));
+ for (k = 1; k <= bel.GetNP(); k++)
+ {
+ PointIndex pi = bel.PNum(k);
+ pts2d.Elem(pi) = Point2d (t1 * (mesh.Point(pi) - sp1),
+ t2 * (mesh.Point(pi) - sp1));
+ }
+ pts2d.Elem(gpi) = Point2d (x.Get(1), x.Get(2));
- for (k = 1; k <= 2; k++)
- {
- if (k == 1)
- vdir = Vec2d (1, 0);
- else
- vdir = Vec2d (0, 1);
+ for (k = 1; k <= 2; k++)
+ {
+ if (k == 1)
+ vdir = Vec2d (1, 0);
+ else
+ vdir = Vec2d (0, 1);
- hbad = bel.
- CalcJacobianBadnessDirDeriv (pts2d, lpi, vdir, hderiv);
+ hbad = bel.
+ CalcJacobianBadnessDirDeriv (pts2d, lpi, vdir, hderiv);
- grad.Elem(k) += hderiv;
- if (k == 1)
- badness += hbad;
- }
-
-
- /*
- Vec3d e1(pp1, mesh.Point(bel.PNumMod(lpi + 1)));
- Vec3d e2(pp1, mesh.Point(bel.PNumMod(lpi + 2)));
+ grad.Elem(k) += hderiv;
+ if (k == 1)
+ badness += hbad;
+ }
+ }
- if (uselocalh)
- loch = lochs.Get(j);
- double e1l = e1.Length();
- if (Determinant(e1, e2, n) > 1e-8 * e1l * e2.Length())
- {
- e1 /= e1l;
- double e1e2 = e1 * e2;
- e2.Add (-e1e2, e1);
- double e2l = e2.Length();
+ /*
+ vgrad.Add (-(vgrad * n), n);
- CalcTriangleBadness ( e1l, e1e2, e2l, locmetricweight, loch,
- hbadness, g1.X(), g1.Y());
+ grad.Elem(1) = vgrad * t1;
+ grad.Elem(2) = vgrad * t2;
+ */
+ return badness;
+ }
- badness += hbadness;
- vgrad.Add2 (g1.X(), e1, g1.Y() / e2l, e2);
- }
- else
- badness += 1e8;
- */
- }
- /*
- vgrad.Add (-(vgrad * n), n);
- grad.Elem(1) = vgrad * t1;
- grad.Elem(2) = vgrad * t2;
- */
- return badness;
+ double Opti2SurfaceMinFunctionJacobian ::
+ FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const
+ {
+ // from 2d:
- /*
+ int j, k, lpi, gpi;
+ Vec3d n, vgrad;
+ Point3d pp1;
+ Vec2d g1, vdir;
+ double badness, hbadness, hbad, hderiv;
- // from 3d:
+ vgrad = 0;
+ badness = 0;
- int j, k;
- int lpi;
- double badness = 0, hbad;
+ meshthis -> GetNormalVector (surfi, sp1, gi1, n);
- Point3d hp = points.Elem(actpind);
- points.Elem(actpind) = hp + Vec3d (x.Get(1), x.Get(2), x.Get(3));
+ pp1 = sp1;
+ pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
- double hderiv;
- Vec3d vdir;
- g.SetSize(3);
- g = 0;
+ static ARRAY<Point2d> pts2d;
+ pts2d.SetSize(mesh.GetNP());
- for (j = 1; j <= elementsonpoint.EntrySize(actpind); j++)
- {
- int eli = elementsonpoint.Get(actpind, j);
- const Element & el = elements.Get(eli);
+ deriv = 0;
- lpi = 0;
- for (k = 1; k <= el.GetNP(); k++)
- if (el.PNum(k) == actpind)
- lpi = k;
- if (!lpi) cerr << "loc point not found" << endl;
+ for (j = 1; j <= locelements.Size(); j++)
+ {
+ lpi = locrots.Get(j);
+ const Element2d & bel =
+ mesh[locelements.Get(j)];
+
+ gpi = bel.PNum(lpi);
- for (k = 1; k <= 3; k++)
- {
- vdir = Vec3d(0,0,0);
- vdir.X(k) = 1;
-
- hbad = elements.Get(eli).
- CalcJacobianBadnessDirDeriv (points, lpi, vdir, hderiv);
- g.Elem(k) += hderiv;
- if (k == 1)
- badness += hbad;
- }
- }
-
- points.Elem(actpind) = hp;
+ for (k = 1; k <= bel.GetNP(); k++)
+ {
+ PointIndex pi = bel.PNum(k);
+ pts2d.Elem(pi) = Point2d (t1 * (mesh.Point(pi) - sp1),
+ t2 * (mesh.Point(pi) - sp1));
+ }
+ pts2d.Elem(gpi) = Point2d (x.Get(1), x.Get(2));
+
- return badness;
+ vdir = Vec2d (dir(0), dir(1));
+
+ hbad = bel.
+ CalcJacobianBadnessDirDeriv (pts2d, lpi, vdir, hderiv);
+
+ deriv += hderiv;
+ badness += hbad;
+ }
- */
-}
+ return badness;
+ }
@@ -467,324 +576,347 @@ FuncGrad (const Vector & x, Vector & grad) const
-MeshOptimize2d dummy;
+ MeshOptimize2d dummy;
-MeshOptimize2d :: MeshOptimize2d ()
-{
- SetFaceIndex (0);
- SetImproveEdges (0);
- SetMetricWeight (0);
- SetWriteStatus (1);
-}
+ MeshOptimize2d :: MeshOptimize2d ()
+ {
+ SetFaceIndex (0);
+ SetImproveEdges (0);
+ SetMetricWeight (0);
+ SetWriteStatus (1);
+ }
-void MeshOptimize2d :: SelectSurfaceOfPoint (const Point3d & p,
- const PointGeomInfo & gi)
-{
- ;
-}
+ void MeshOptimize2d :: SelectSurfaceOfPoint (const Point3d & p,
+ const PointGeomInfo & gi)
+ {
+ ;
+ }
-void MeshOptimize2d :: ImproveMesh (Mesh & mesh)
-{
- if (!faceindex)
- {
- PrintMessage (3, "Smoothing");
+ void MeshOptimize2d :: ImproveMesh (Mesh & mesh)
+ {
+ if (!faceindex)
+ {
+ PrintMessage (3, "Smoothing");
- for (faceindex = 1; faceindex <= mesh.GetNFD(); faceindex++)
- {
- ImproveMesh (mesh);
- if (multithread.terminate)
- throw NgException ("Meshing stopped");
- }
- faceindex = 0;
- return;
- }
+ for (faceindex = 1; faceindex <= mesh.GetNFD(); faceindex++)
+ {
+ ImproveMesh (mesh);
+ if (multithread.terminate)
+ throw NgException ("Meshing stopped");
+ }
+ faceindex = 0;
+ return;
+ }
- CheckMeshApproximation (mesh);
+ CheckMeshApproximation (mesh);
- int i, j, k, surfi3;
- SurfaceElementIndex sei;
+ int i, j, k, surfi3;
+ SurfaceElementIndex sei;
- ARRAY<SurfaceElementIndex> seia;
- mesh.GetSurfaceElementsOfFace (faceindex, seia);
+ ARRAY<SurfaceElementIndex> seia;
+ mesh.GetSurfaceElementsOfFace (faceindex, seia);
- bool mixed = 0;
- for (i = 0; i < seia.Size(); i++)
- if (mesh[seia[i]].GetNP() != 3)
- {
- mixed = 1;
- break;
- }
+ bool mixed = 0;
+ for (i = 0; i < seia.Size(); i++)
+ if (mesh[seia[i]].GetNP() != 3)
+ {
+ mixed = 1;
+ break;
+ }
- int loci;
- double fact;
- int moveisok;
+ int loci;
+ double fact;
+ int moveisok;
- PointGeomInfo ngi;
- Point3d origp;
+ PointGeomInfo ngi;
+ Point3d origp;
- Vec3d n1, n2;
- Vector x(2), xedge(1);
+ Vec3d n1, n2;
+ Vector x(2), xedge(1);
- ARRAY<Point3d, PointIndex::BASE> savepoints(mesh.GetNP());
- uselocalh = mparam.uselocalh;
+ ARRAY<MeshPoint, PointIndex::BASE> savepoints(mesh.GetNP());
+ uselocalh = mparam.uselocalh;
- ARRAY<int, PointIndex::BASE> nelementsonpoint(mesh.GetNP());
- nelementsonpoint = 0;
+ ARRAY<int, PointIndex::BASE> nelementsonpoint(mesh.GetNP());
+ nelementsonpoint = 0;
- for (i = 0; i < seia.Size(); i++)
- {
- const Element2d & el = mesh[seia[i]];
- for (j = 0; j < el.GetNP(); j++)
- nelementsonpoint[el[j]]++;
- }
+ for (i = 0; i < seia.Size(); i++)
+ {
+ const Element2d & el = mesh[seia[i]];
+ for (j = 0; j < el.GetNP(); j++)
+ nelementsonpoint[el[j]]++;
+ }
- TABLE<SurfaceElementIndex,PointIndex::BASE> elementsonpoint(nelementsonpoint);
- for (i = 0; i < seia.Size(); i++)
- {
- const Element2d & el = mesh[seia[i]];
- for (j = 0; j < el.GetNP(); j++)
- elementsonpoint.Add (el[j], seia[i]);
- }
+ TABLE<SurfaceElementIndex,PointIndex::BASE> elementsonpoint(nelementsonpoint);
+ for (i = 0; i < seia.Size(); i++)
+ {
+ const Element2d & el = mesh[seia[i]];
+ for (j = 0; j < el.GetNP(); j++)
+ elementsonpoint.Add (el[j], seia[i]);
+ }
- loch = mparam.maxh;
- locmetricweight = metricweight;
- meshthis = this;
+ loch = mparam.maxh;
+ locmetricweight = metricweight;
+ meshthis = this;
- Opti2SurfaceMinFunction surfminf(mesh);
- Opti2EdgeMinFunction edgeminf(mesh);
- Opti2SurfaceMinFunctionJacobian surfminfj(mesh);
+ Opti2SurfaceMinFunction surfminf(mesh);
+ Opti2EdgeMinFunction edgeminf(mesh);
+ Opti2SurfaceMinFunctionJacobian surfminfj(mesh);
- OptiParameters par;
- par.maxit_linsearch = 8;
- par.maxit_bfgs = 5;
+ OptiParameters par;
+ par.maxit_linsearch = 8;
+ par.maxit_bfgs = 5;
- /*
- if (improveedges)
- for (i = 1; i <= mesh.GetNP(); i++)
+ /*
+ if (improveedges)
+ for (i = 1; i <= mesh.GetNP(); i++)
if (mesh.PointType(i) == EDGEPOINT)
- {
- continue;
- PrintDot ();
- sp1 = mesh.Point(i);
+ {
+ continue;
+ PrintDot ();
+ sp1 = mesh.Point(i);
- locelements.SetSize(0);
- locrots.SetSize (0);
- lochs.SetSize (0);
- surfi = surfi2 = surfi3 = 0;
+ locelements.SetSize(0);
+ locrots.SetSize (0);
+ lochs.SetSize (0);
+ surfi = surfi2 = surfi3 = 0;
- for (j = 0; j < elementsonpoint[i].Size(); j++)
- {
- sei = elementsonpoint[i][j];
- const Element2d * bel = &mesh[sei];
+ for (j = 0; j < elementsonpoint[i].Size(); j++)
+ {
+ sei = elementsonpoint[i][j];
+ const Element2d * bel = &mesh[sei];
- if (!surfi)
- surfi = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
- else if (surfi != mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr())
- {
- if (surfi2 != 0 && surfi2 !=
- mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr())
- surfi3 = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
- else
- surfi2 = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
- }
+ if (!surfi)
+ surfi = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
+ else if (surfi != mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr())
+ {
+ if (surfi2 != 0 && surfi2 !=
+ mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr())
+ surfi3 = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
+ else
+ surfi2 = mesh.GetFaceDescriptor(bel->GetIndex()).SurfNr();
+ }
- locelements.Append (sei);
+ locelements.Append (sei);
- if (bel->PNum(1) == i)
- locrots.Append (1);
- else if (bel->PNum(2) == i)
- locrots.Append (2);
- else
- locrots.Append (3);
+ if (bel->PNum(1) == i)
+ locrots.Append (1);
+ else if (bel->PNum(2) == i)
+ locrots.Append (2);
+ else
+ locrots.Append (3);
- if (uselocalh)
- {
- Point3d pmid = Center (mesh.Point(bel->PNum(1)),
- mesh.Point(bel->PNum(2)),
- mesh.Point(bel->PNum(3)));
- lochs.Append (mesh.GetH(pmid));
- }
- }
+ if (uselocalh)
+ {
+ Point3d pmid = Center (mesh.Point(bel->PNum(1)),
+ mesh.Point(bel->PNum(2)),
+ mesh.Point(bel->PNum(3)));
+ lochs.Append (mesh.GetH(pmid));
+ }
+ }
- if (surfi2 && !surfi3)
- {
- GetNormalVector (surfi, sp1, n1);
- GetNormalVector (surfi2, sp1, n2);
- t1 = Cross (n1, n2);
+ if (surfi2 && !surfi3)
+ {
+ GetNormalVector (surfi, sp1, n1);
+ GetNormalVector (surfi2, sp1, n2);
+ t1 = Cross (n1, n2);
- xedge = 0;
- BFGS (xedge, edgeminf, par, 1e-6);
+ xedge = 0;
+ BFGS (xedge, edgeminf, par, 1e-6);
- mesh.Point(i).X() += xedge.Get(1) * t1.X();
- mesh.Point(i).Y() += xedge.Get(1) * t1.Y();
- mesh.Point(i).Z() += xedge.Get(1) * t1.Z();
- ProjectPoint2 (surfi, surfi2, mesh.Point(i));
- }
- }
- */
-
- bool printeddot = 0;
- char plotchar = '.';
- int modplot = 1;
- if (mesh.GetNP() > 1000)
- {
- plotchar = '+';
- modplot = 10;
- }
- int cnt = 0;
+ mesh.Point(i).X() += xedge.Get(1) * t1.X();
+ mesh.Point(i).Y() += xedge.Get(1) * t1.Y();
+ mesh.Point(i).Z() += xedge.Get(1) * t1.Z();
+ ProjectPoint2 (surfi, surfi2, mesh.Point(i));
+ }
+ }
+ */
- for (PointIndex pi = PointIndex::BASE;
- pi < mesh.GetNP()+PointIndex::BASE; pi++)
- if (mesh.PointType(pi) == SURFACEPOINT)
+ bool printeddot = 0;
+ char plotchar = '.';
+ int modplot = 1;
+ if (mesh.GetNP() > 1000)
{
- if (multithread.terminate)
- throw NgException ("Meshing stopped");
-
- cnt++;
- if (cnt % modplot == 0 && writestatus)
- {
- printeddot = 1;
- PrintDot (plotchar);
- }
-
- if (elementsonpoint[pi].Size() == 0)
- continue;
+ plotchar = '+';
+ modplot = 10;
+ }
+ if (mesh.GetNP() > 10000)
+ {
+ plotchar = 'o';
+ modplot = 100;
+ }
+ int cnt = 0;
+
+ for (PointIndex pi = PointIndex::BASE;
+ pi < mesh.GetNP()+PointIndex::BASE; pi++)
+
+ if (mesh.PointType(pi) == SURFACEPOINT)
+ {
+ if (multithread.terminate)
+ throw NgException ("Meshing stopped");
- sp1 = mesh[pi];
+ if (pi == 3679)
+ (*testout) << " old: " << mesh[pi] << endl;
- Element2d & hel = mesh[elementsonpoint[pi][0]];
- int hpi = 0;
- for (j = 1; j <= hel.GetNP(); j++)
- if (hel.PNum(j) == pi)
+ cnt++;
+ if (cnt % modplot == 0 && writestatus)
{
- hpi = j;
- break;
+ printeddot = 1;
+ PrintDot (plotchar);
}
+
+ if (elementsonpoint[pi].Size() == 0)
+ continue;
+
+ sp1 = mesh[pi];
+
+ Element2d & hel = mesh[elementsonpoint[pi][0]];
- gi1 = hel.GeomInfoPi(hpi);
- SelectSurfaceOfPoint (sp1, gi1);
+ int hpi = 0;
+ for (j = 1; j <= hel.GetNP(); j++)
+ if (hel.PNum(j) == pi)
+ {
+ hpi = j;
+ break;
+ }
+
+ gi1 = hel.GeomInfoPi(hpi);
+ SelectSurfaceOfPoint (sp1, gi1);
- locelements.SetSize(0);
- locrots.SetSize (0);
- lochs.SetSize (0);
+ locelements.SetSize(0);
+ locrots.SetSize (0);
+ lochs.SetSize (0);
- for (j = 0; j < elementsonpoint[pi].Size(); j++)
- {
- sei = elementsonpoint[pi][j];
- const Element2d & bel = mesh[sei];
- surfi = mesh.GetFaceDescriptor(bel.GetIndex()).SurfNr();
+ for (j = 0; j < elementsonpoint[pi].Size(); j++)
+ {
+ sei = elementsonpoint[pi][j];
+ const Element2d & bel = mesh[sei];
+ surfi = mesh.GetFaceDescriptor(bel.GetIndex()).SurfNr();
- locelements.Append (sei);
+ locelements.Append (sei);
- for (k = 1; k <= bel.GetNP(); k++)
- if (bel.PNum(k) == pi)
+ for (k = 1; k <= bel.GetNP(); k++)
+ if (bel.PNum(k) == pi)
+ {
+ locrots.Append (k);
+ break;
+ }
+
+ if (uselocalh)
{
- locrots.Append (k);
- break;
+ Point3d pmid = Center (mesh[bel[0]], mesh[bel[1]], mesh[bel[2]]);
+ lochs.Append (mesh.GetH(pmid));
}
-
- if (uselocalh)
- {
- Point3d pmid = Center (mesh[bel[0]], mesh[bel[1]], mesh[bel[2]]);
- lochs.Append (mesh.GetH(pmid));
- }
- }
+ }
- GetNormalVector (surfi, sp1, gi1, n);
- n.GetNormal (t1);
- t2 = Cross (n, t1);
+ GetNormalVector (surfi, sp1, gi1, n);
+ n.GetNormal (t1);
+ t2 = Cross (n, t1);
- // save points, and project to tangential plane
- for (j = 0; j < locelements.Size(); j++)
- {
- const Element2d & el = mesh[locelements[j]];
- for (k = 0; k < el.GetNP(); k++)
- savepoints[el[k]] = mesh[el[k]];
- }
+ // save points, and project to tangential plane
+ for (j = 0; j < locelements.Size(); j++)
+ {
+ const Element2d & el = mesh[locelements[j]];
+ for (k = 0; k < el.GetNP(); k++)
+ savepoints[el[k]] = mesh[el[k]];
+ }
- for (j = 0; j < locelements.Size(); j++)
- {
- const Element2d & el = mesh[locelements[j]];
- for (k = 0; k < el.GetNP(); k++)
- {
- PointIndex hpi = el[k];
- double lam = n * (mesh[hpi] - sp1);
- mesh[hpi] -= lam * n;
- }
- }
+ for (j = 0; j < locelements.Size(); j++)
+ {
+ const Element2d & el = mesh[locelements[j]];
+ for (k = 0; k < el.GetNP(); k++)
+ {
+ PointIndex hpi = el[k];
+ double lam = n * (mesh[hpi] - sp1);
+ mesh[hpi] -= lam * n;
+ }
+ }
- x = 0;
+ x = 0;
- if (mixed)
- BFGS (x, surfminfj, par, 1e-6);
- else
- BFGS (x, surfminf, par, 1e-6);
+ if (mixed)
+ BFGS (x, surfminfj, par, 1e-6);
+ else
+ BFGS (x, surfminf, par, 1e-6);
- origp = mesh[pi];
- loci = 1;
- fact = 1;
- moveisok = 0;
+ origp = mesh[pi];
+ loci = 1;
+ fact = 1;
+ moveisok = 0;
- // restore other points
- for (j = 0; j < locelements.Size(); j++)
- {
- const Element2d & el = mesh[locelements[j]];
- for (k = 0; k < el.GetNP(); k++)
- {
- PointIndex hpi = el[k];
- if (hpi != pi) mesh[hpi] = savepoints[hpi];
- }
- }
+ // restore other points
+ for (j = 0; j < locelements.Size(); j++)
+ {
+ const Element2d & el = mesh[locelements[j]];
+ for (k = 0; k < el.GetNP(); k++)
+ {
+ PointIndex hpi = el[k];
+ if (hpi != pi) mesh[hpi] = savepoints[hpi];
+ }
+ }
- //optimizer loop (if not whole distance is not possible, move only a bit!!!!)
- while (loci <= 5 && !moveisok)
- {
- loci ++;
- mesh[pi].X() = origp.X() + (x.Get(1) * t1.X() + x.Get(2) * t2.X())*fact;
- mesh[pi].Y() = origp.Y() + (x.Get(1) * t1.Y() + x.Get(2) * t2.Y())*fact;
- mesh[pi].Z() = origp.Z() + (x.Get(1) * t1.Z() + x.Get(2) * t2.Z())*fact;
- fact = fact/2.;
- ProjectPoint (surfi, mesh[pi]);
+ //optimizer loop (if not whole distance is not possible, move only a bit!!!!)
+ while (loci <= 5 && !moveisok)
+ {
+ loci ++;
+ mesh[pi].X() = origp.X() + (x.Get(1) * t1.X() + x.Get(2) * t2.X())*fact;
+ mesh[pi].Y() = origp.Y() + (x.Get(1) * t1.Y() + x.Get(2) * t2.Y())*fact;
+ mesh[pi].Z() = origp.Z() + (x.Get(1) * t1.Z() + x.Get(2) * t2.Z())*fact;
+ fact = fact/2.;
+
+ if (pi == 3679)
+ (*testout) << " before proj: " << mesh[pi] << endl;
+
+ ProjectPoint (surfi, mesh[pi]);
+
+ if (pi == 3679)
+ {
+ (*testout) << " after proj: " << mesh[pi] << endl;
+ (*testout) << "surfi =" << surfi << endl;
+ }
- moveisok = CalcPointGeomInfo(surfi, ngi, mesh[pi]);
- // point lies on same chart in stlsurface
+ moveisok = CalcPointGeomInfo(surfi, ngi, mesh[pi]);
+ // point lies on same chart in stlsurface
- if (moveisok)
- {
- for (j = 0; j < locelements.Size(); j++)
- mesh[locelements[j]].GeomInfoPi(locrots[j]) = ngi;
- }
- else
- {
- mesh[pi] = origp;
- }
+ if (moveisok)
+ {
+ for (j = 0; j < locelements.Size(); j++)
+ mesh[locelements[j]].GeomInfoPi(locrots[j]) = ngi;
+ }
+ else
+ {
+ mesh[pi] = origp;
+ }
- }
- // (*testout) << " new: " << mesh.Point(i) << endl;
- }
+ }
+
+ if (pi == 3679)
+ (*testout) << " new: " << mesh[pi] << endl;
+ }
- if (printeddot)
- PrintDot ('\n');
+
+ if (printeddot)
+ PrintDot ('\n');
- CheckMeshApproximation (mesh);
- mesh.SetNextTimeStamp();
-}
+ CheckMeshApproximation (mesh);
+ mesh.SetNextTimeStamp();
+ }
-void MeshOptimize2d :: GetNormalVector(INDEX /* surfind */, const Point3d & p, Vec3d & nv) const
-{
- nv = Vec3d (0, 0, 1);
-}
+ void MeshOptimize2d :: GetNormalVector(INDEX /* surfind */, const Point3d & p, Vec3d & nv) const
+ {
+ nv = Vec3d (0, 0, 1);
+ }
-void MeshOptimize2d :: GetNormalVector(INDEX surfind, const Point3d & p, PointGeomInfo & gi, Vec3d & n) const
-{
- GetNormalVector (surfind, p, n);
-}
+ void MeshOptimize2d :: GetNormalVector(INDEX surfind, const Point3d & p, PointGeomInfo & gi, Vec3d & n) const
+ {
+ GetNormalVector (surfind, p, n);
+ }
}
diff --git a/Netgen/libsrc/meshing/smoothing3.cpp b/Netgen/libsrc/meshing/smoothing3.cpp
index 6fcb2b8e70..61c1910884 100644
--- a/Netgen/libsrc/meshing/smoothing3.cpp
+++ b/Netgen/libsrc/meshing/smoothing3.cpp
@@ -24,15 +24,15 @@ namespace netgen
{
int j;
double badness = 0;
- Point3d pp(vp.Get(1), vp.Get(2), vp.Get(3));
+ Point3d pp(vp(0), vp(1), vp(2));
for (j = 0; j < faces.Size(); j++)
{
const INDEX_3 & el = faces[j];
- double bad = CalcTetBadness (points.Get(el.I1()),
- points.Get(el.I3()),
- points.Get(el.I2()),
+ double bad = CalcTetBadness (points[el.I1()],
+ points[el.I3()],
+ points[el.I2()],
pp, 0);
badness += bad;
}
@@ -42,7 +42,8 @@ namespace netgen
- double PointFunction1 :: FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const
+ double PointFunction1 ::
+ FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const
{
static Vector hx(3);
static double eps = 1e-6;
@@ -127,9 +128,9 @@ namespace netgen
for (i = 1; i <= nf; i++)
{
- const Point3d & p1 = points.Get(faces.Get(i).I1());
- const Point3d & p2 = points.Get(faces.Get(i).I2());
- const Point3d & p3 = points.Get(faces.Get(i).I3());
+ const Point3d & p1 = points[faces.Get(i).I1()];
+ const Point3d & p2 = points[faces.Get(i).I2()];
+ const Point3d & p3 = points[faces.Get(i).I3()];
Vec3d v1 (p1, p2);
Vec3d v2 (p1, p3);
Vec3d n;
@@ -229,15 +230,15 @@ namespace netgen
public:
Mesh::T_POINTS & points;
const Mesh::T_VOLELEMENTS & elements;
- TABLE<INDEX> elementsonpoint;
- int actpind;
+ TABLE<INDEX,PointIndex::BASE> elementsonpoint;
+ PointIndex actpind;
double h;
public:
PointFunction (Mesh::T_POINTS & apoints,
const Mesh::T_VOLELEMENTS & aelements);
- virtual void SetPointIndex (int aactpind);
+ virtual void SetPointIndex (PointIndex aactpind);
void SetLocalH (double ah) { h = ah; }
double GetLocalH () const { return h; }
virtual double PointFunctionValue (const Point3d & pp) const;
@@ -259,11 +260,11 @@ namespace netgen
{
if (elements.Get(i).NP() == 4)
for (j = 1; j <= elements.Get(i).NP(); j++)
- elementsonpoint.Add1 (elements.Get(i).PNum(j), i);
+ elementsonpoint.Add (elements.Get(i).PNum(j), i);
}
}
- void PointFunction :: SetPointIndex (int aactpind)
+ void PointFunction :: SetPointIndex (PointIndex aactpind)
{
actpind = aactpind;
}
@@ -279,20 +280,20 @@ namespace netgen
badness = 0;
- hp = points.Elem(actpind);
- points.Elem(actpind) = pp;
+ hp = points[actpind];
+ points[actpind] = pp;
- for (j = 1; j <= elementsonpoint.EntrySize(actpind); j++)
+ for (j = 0; j < elementsonpoint[actpind].Size(); j++)
{
- eli = elementsonpoint.Get(actpind, j);
+ eli = elementsonpoint[actpind][j];
el = &elements.Get(eli);
- badness += CalcTetBadness (points.Get(el->PNum(1)),
- points.Get(el->PNum(2)),
- points.Get(el->PNum(3)),
- points.Get(el->PNum(4)), -1);
+ badness += CalcTetBadness (points[el->PNum(1)],
+ points[el->PNum(2)],
+ points[el->PNum(3)],
+ points[el->PNum(4)], -1);
}
- points.Elem(actpind) = hp;
+ points[actpind] = hp;
return badness;
}
@@ -338,25 +339,25 @@ namespace netgen
// badness = 0;
- hp = points.Elem(actpind);
- points.Elem(actpind) = pp;
+ hp = points[actpind];
+ points[actpind] = pp;
- for (j = 1; j <= elementsonpoint.EntrySize(actpind); j++)
+ for (j = 0; j < elementsonpoint[actpind].Size(); j++)
{
- eli = elementsonpoint.Get(actpind, j);
+ eli = elementsonpoint[actpind][j];
const Element & el = elements.Get(eli);
for (k = 1; k <= 4; k++)
if (el.PNum(k) == actpind)
{
- CalcTetBadnessGrad (points.Get(el.PNum(1)),
- points.Get(el.PNum(2)),
- points.Get(el.PNum(3)),
- points.Get(el.PNum(4)), -1, k, vgradi);
+ CalcTetBadnessGrad (points[el.PNum(1)],
+ points[el.PNum(2)],
+ points[el.PNum(3)],
+ points[el.PNum(4)], -1, k, vgradi);
vgrad += vgradi;
}
}
- points.Elem(actpind) = hp;
+ points[actpind] = hp;
for (j = 1; j <= 3; j++)
grad.Elem(j) = vgrad.X(j);
@@ -382,28 +383,28 @@ namespace netgen
// badness = 0;
- hp = points.Elem(actpind);
- points.Elem(actpind) = pp;
+ hp = points[actpind];
+ points[actpind] = pp;
f = 0;
- for (j = 1; j <= elementsonpoint.EntrySize(actpind); j++)
+ for (j = 0; j < elementsonpoint[actpind].Size(); j++)
{
- eli = elementsonpoint.Get(actpind, j);
+ eli = elementsonpoint[actpind][j];
const Element & el = elements.Get(eli);
for (k = 1; k <= 4; k++)
if (el.PNum(k) == actpind)
{
- f += CalcTetBadnessGrad (points.Get(el.PNum(1)),
- points.Get(el.PNum(2)),
- points.Get(el.PNum(3)),
- points.Get(el.PNum(4)), -1, k, vgradi);
+ f += CalcTetBadnessGrad (points[el.PNum(1)],
+ points[el.PNum(2)],
+ points[el.PNum(3)],
+ points[el.PNum(4)], -1, k, vgradi);
vgrad += vgradi;
}
}
- points.Elem(actpind) = hp;
+ points[actpind] = hp;
deriv = dir * vgrad;
return f;
}
@@ -415,10 +416,10 @@ namespace netgen
// try point movement
ARRAY<Element2d> faces;
- for (j = 1; j <= elementsonpoint.EntrySize(actpind); j++)
+ for (j = 0; j < elementsonpoint[actpind].Size(); j++)
{
const Element & el =
- elements.Get(elementsonpoint.Get (actpind, j));
+ elements.Get(elementsonpoint[actpind][j]);
for (k = 1; k <= 4; k++)
if (el.PNum(k) == actpind)
@@ -435,12 +436,10 @@ namespace netgen
if (hi)
{
cout << "inner point found" << endl;
- points.Elem(actpind) = hp;
+ points[actpind] = hp;
}
else
cout << "no inner point found" << endl;
-
-
return hi;
}
@@ -456,7 +455,7 @@ namespace netgen
public:
CheapPointFunction (Mesh::T_POINTS & apoints,
const Mesh::T_VOLELEMENTS & aelements);
- virtual void SetPointIndex (int aactpind);
+ virtual void SetPointIndex (PointIndex aactpind);
virtual double PointFunctionValue (const Point3d & pp) const;
virtual double PointFunctionValueGrad (const Point3d & pp, Vector & grad) const;
};
@@ -470,23 +469,23 @@ namespace netgen
}
- void CheapPointFunction :: SetPointIndex (int aactpind)
+ void CheapPointFunction :: SetPointIndex (PointIndex aactpind)
{
actpind = aactpind;
- int n = elementsonpoint.EntrySize(actpind);
+ int n = elementsonpoint[actpind].Size();
int i, j;
int pi1, pi2, pi3;
m.SetSize (n, 4);
- for (i = 1; i <= n; i++)
+ for (i = 0; i < n; i++)
{
pi1 = 0;
pi2 = 0;
pi3 = 0;
- const Element & el = elements.Get (elementsonpoint.Get(actpind, i));
+ const Element & el = elements.Get (elementsonpoint[actpind][i]);
for (j = 1; j <= 4; j++)
if (el.PNum(j) != actpind)
{
@@ -495,14 +494,14 @@ namespace netgen
pi1 = el.PNum(j);
}
- const Point3d & p1 = points.Get(pi1);
- Vec3d v1 (p1, points.Get(pi2));
- Vec3d v2 (p1, points.Get(pi3));
+ const Point3d & p1 = points[pi1];
+ Vec3d v1 (p1, points[pi2]);
+ Vec3d v2 (p1, points[pi3]);
Vec3d n;
Cross (v1, v2, n);
n /= n.Length();
- Vec3d v (p1, points.Get(actpind));
+ Vec3d v (p1, points[actpind]);
double c = v * n;
if (c < 0)
@@ -976,13 +975,13 @@ public:
Mesh::T_POINTS & points;
const Mesh::T_VOLELEMENTS & elements;
TABLE<INDEX> elementsonpoint;
- int actpind;
+ PointIndex actpind;
public:
JacobianPointFunction (Mesh::T_POINTS & apoints,
const Mesh::T_VOLELEMENTS & aelements);
- virtual void SetPointIndex (int aactpind);
+ virtual void SetPointIndex (PointIndex aactpind);
virtual double Func (const Vector & x) const;
virtual double FuncGrad (const Vector & x, Vector & g) const;
virtual double FuncDeriv (const Vector & x, const Vector & dir, double & deriv) const;
@@ -1004,7 +1003,7 @@ JacobianPointFunction (Mesh::T_POINTS & apoints,
}
}
-void JacobianPointFunction :: SetPointIndex (int aactpind)
+void JacobianPointFunction :: SetPointIndex (PointIndex aactpind)
{
actpind = aactpind;
}
@@ -1320,40 +1319,39 @@ void Mesh :: ImproveMesh (const CSGeometry & geometry, OPTIMIZEGOAL goal)
void Mesh :: ImproveMesh (OPTIMIZEGOAL goal)
{
int typ = 1;
- int i, j;
+ int j;
- (*testout) << "Improve Mesh2" << "\n";
- PrintMessage (3, "ImproveMesh2");
+ (*testout) << "Improve Mesh" << "\n";
+ PrintMessage (3, "ImproveMesh");
int np = GetNP();
int ne = GetNE();
- ARRAY<double> perrs(np);
- for (i = 1; i <= np; i++)
- perrs.Elem(i) = 1;
+ ARRAY<double,PointIndex::BASE> perrs(np);
+ perrs = 1.0;
double bad1 = 0;
double badmax = 0;
if (goal == OPT_QUALITY)
{
- for (i = 1; i <= ne; i++)
+ for (int i = 1; i <= ne; i++)
{
const Element & el = VolumeElement(i);
if (el.GetType() != TET)
continue;
double hbad = CalcBad (points, el, 0);
- for (j = 1; j <= 4; j++)
- perrs.Elem(el.PNum(j)) += hbad;
+ for (j = 0; j < 4; j++)
+ perrs[el[j]] += hbad;
bad1 += hbad;
}
- for (i = 1; i <= np; i++)
- if (perrs.Get(i) > badmax)
- badmax = perrs.Get(i);
+ for (PointIndex i = PointIndex::BASE; i < np+PointIndex::BASE; i++)
+ if (perrs[i] > badmax)
+ badmax = perrs[i];
badmax = 0;
}
@@ -1390,35 +1388,26 @@ void Mesh :: ImproveMesh (OPTIMIZEGOAL goal)
char * savetask = multithread.task;
multithread.task = "Smooth Mesh";
- for (i = 1; i <= points.Size(); i++)
- if (PointType(i) == INNERPOINT && perrs.Get(i) > 0.01 * badmax)
+ for (PointIndex i = PointIndex::BASE;
+ i < points.Size()+PointIndex::BASE; i++)
+ if (PointType(i) == INNERPOINT && perrs[i] > 0.01 * badmax)
{
if (multithread.terminate)
throw NgException ("Meshing stopped");
- /*
- if (multithread.terminate)
- break;
- */
- multithread.percent = 100.0 * i / points.Size();
+ multithread.percent = 100.0 * (i+1-PointIndex::BASE) / points.Size();
if (points.Size() < 1000)
PrintDot ();
else
- if (i % 10 == 0)
+ if ( (i+1-PointIndex::BASE) % 10 == 0)
PrintDot ('+');
- // if (uselocalh)
- {
- double lh = GetH(points.Get(i));
- pf->SetLocalH (lh);
- par.typx = lh;
- // (*mycout) << "lh = " << lh << "\n";
- }
+ double lh = GetH(points[i]);
+ pf->SetLocalH (lh);
+ par.typx = lh;
- // if (elementsonpoint.EntrySize(i) == 0) continue;
-
- freeminf.SetPoint (points.Elem(i));
+ freeminf.SetPoint (points[i]);
pf->SetPointIndex (i);
x = 0;
@@ -1429,7 +1418,7 @@ void Mesh :: ImproveMesh (OPTIMIZEGOAL goal)
{
pok = pf->MovePointToInner ();
- freeminf.SetPoint (points.Elem(i));
+ freeminf.SetPoint (points[i]);
pf->SetPointIndex (i);
}
@@ -1437,9 +1426,9 @@ void Mesh :: ImproveMesh (OPTIMIZEGOAL goal)
{
BFGS (x, freeminf, par);
- points.Elem(i).X() += x.Get(1);
- points.Elem(i).Y() += x.Get(2);
- points.Elem(i).Z() += x.Get(3);
+ points[i].X() += x.Get(1);
+ points[i].Y() += x.Get(2);
+ points[i].Z() += x.Get(3);
}
}
PrintDot ('\n');
diff --git a/Netgen/libsrc/meshing/topology.cpp b/Netgen/libsrc/meshing/topology.cpp
index 9b91a464dc..9c0e79d531 100644
--- a/Netgen/libsrc/meshing/topology.cpp
+++ b/Netgen/libsrc/meshing/topology.cpp
@@ -26,6 +26,13 @@ MeshTopology :: MeshTopology (const Mesh & amesh)
face2surfel.SetName ("face2surfel");
}
+MeshTopology :: ~MeshTopology ()
+{
+ delete vert2element;
+ delete vert2surfelement;
+ delete vert2segment;
+}
+
void MeshTopology :: Update()
{
int i, j, k;
@@ -51,7 +58,7 @@ void MeshTopology :: Update()
delete vert2element;
delete vert2surfelement;
delete vert2segment;
- ARRAY<int> cnt(nv);
+ ARRAY<int,PointIndex::BASE> cnt(nv);
ARRAY<int> vnums;
(*testout) << "tables deleted" << endl;
@@ -69,9 +76,10 @@ void MeshTopology :: Update()
const Element & el = mesh.VolumeElement(i);
int nelv = el.GetNV();
for (j = 1; j <= nelv; j++)
- cnt.Elem(el.PNum(j))++;
+ cnt[el.PNum(j)]++;
}
- vert2element = new TABLE<int> (cnt);
+
+ vert2element = new TABLE<int,PointIndex::BASE> (cnt);
for (i = 1; i <= ne; i++)
{
const Element & el = mesh.VolumeElement(i);
@@ -81,21 +89,21 @@ void MeshTopology :: Update()
}
cnt = 0;
- for (i = 1; i <= nse; i++)
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
{
- const Element2d & el = mesh.SurfaceElement(i);
+ const Element2d & el = mesh[sei];
int nelv = el.GetNV();
- for (j = 1; j <= nelv; j++)
- cnt.Elem(el.PNum(j))++;
+ for (j = 0; j < nelv; j++)
+ cnt[el[j]]++;
}
- vert2surfelement = new TABLE<int> (cnt);
- for (i = 1; i <= nse; i++)
+ vert2surfelement = new TABLE<int,PointIndex::BASE> (cnt);
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
{
- const Element2d & el = mesh.SurfaceElement(i);
+ const Element2d & el = mesh[sei];
int nelv = el.GetNV();
- for (j = 1; j <= nelv; j++)
- vert2surfelement->AddSave (el.PNum(j), i);
+ for (j = 0; j < nelv; j++)
+ vert2surfelement->AddSave (el[j], sei+1);
}
@@ -103,11 +111,11 @@ void MeshTopology :: Update()
for (i = 1; i <= nseg; i++)
{
const Segment & seg = mesh.LineSegment(i);
- cnt.Elem (seg.p1)++;
- cnt.Elem (seg.p2)++;
+ cnt[seg.p1]++;
+ cnt[seg.p2]++;
}
- vert2segment = new TABLE<int> (cnt);
+ vert2segment = new TABLE<int,PointIndex::BASE> (cnt);
for (i = 1; i <= nseg; i++)
{
const Segment & seg = mesh.LineSegment(i);
@@ -117,8 +125,6 @@ void MeshTopology :: Update()
- (*testout) << "before buildedges" << endl;
-
if (buildedges)
{
@@ -137,11 +143,11 @@ void MeshTopology :: Update()
// keep existing edges
cnt = 0;
- for (i = 1; i <= edge2vert.Size(); i++)
- cnt.Elem(edge2vert.Get(i)[0])++;
- TABLE<int> vert2edge (cnt);
- for (i = 1; i <= edge2vert.Size(); i++)
- vert2edge.AddSave (edge2vert.Get(i)[0], i);
+ for (i = 0; i < edge2vert.Size(); i++)
+ cnt[edge2vert[i][0]]++;
+ TABLE<int,PointIndex::BASE> vert2edge (cnt);
+ for (i = 0; i < edge2vert.Size(); i++)
+ vert2edge.AddSave (edge2vert[i][0], i+1);
// ensure all coarse grid and intermediate level edges
cnt = 0;
@@ -154,21 +160,21 @@ void MeshTopology :: Update()
if (pa[0] > 0)
cnt.Elem(pa[0])++;
}
- TABLE<int> vert2vertcoarse (cnt);
+ TABLE<int,PointIndex::BASE> vert2vertcoarse (cnt);
for (i = 1; i <= mesh.mlbetweennodes.Size(); i++)
{
int pa[2];
pa[0] = mesh.mlbetweennodes.Get(i).I1();
pa[1] = mesh.mlbetweennodes.Get(i).I2();
- if (pa[0] > pa[1]) Swap (pa[0], pa[1]);
+ if (pa[0] > pa[1]) swap (pa[0], pa[1]);
if (pa[0] > 0)
- vert2vertcoarse.AddSave (pa[0], pa[1]);
+ vert2vertcoarse.AddSave1 (pa[0], pa[1]);
}
- ARRAY<int> edgenr(nv), edgeflag(nv);
- for (i = 1; i <= nv; i++)
- edgeflag.Elem(i) = 0;
+ ARRAY<int,PointIndex::BASE> edgenr(nv), edgeflag(nv);
+ for (i = PointIndex::BASE; i < nv+PointIndex::BASE; i++)
+ edgeflag[i] = 0;
ned = edge2vert.Size();
ARRAY<INDEX_3> missing;
@@ -207,7 +213,7 @@ void MeshTopology :: Update()
el.PNum(eledges[k][1]));
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (edge.I1() != i)
continue;
@@ -239,7 +245,7 @@ void MeshTopology :: Update()
el.PNum(eledges[k][1]));
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (edge.I1() != i)
continue;
@@ -265,7 +271,7 @@ void MeshTopology :: Update()
INDEX_2 edge(el.p1, el.p2);
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (edge.I1() != i)
continue;
@@ -298,7 +304,7 @@ void MeshTopology :: Update()
el.PNum(eledges[k][1]));
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
int edgenum = abs (edges.Elem(i)[k]);
@@ -319,7 +325,7 @@ void MeshTopology :: Update()
el.PNum(eledges[k][1]));
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
int edgenum = abs (surfedges.Elem(i)[k]);
@@ -334,7 +340,7 @@ void MeshTopology :: Update()
INDEX_2 edge(el.p1, el.p2);
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
int edgenum = abs (segedges.Elem(i));
@@ -363,6 +369,9 @@ void MeshTopology :: Update()
*/
}
+
+ // cout << "build edges done" << endl;
+
#ifdef OLD
if (buildedges == 2)
{ // old style with hash-table
@@ -399,7 +408,7 @@ void MeshTopology :: Update()
el.PNum(eledges[j][1]));
edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (vert2edge.Used (edge))
edgenum = vert2edge.Get(edge);
@@ -439,7 +448,7 @@ void MeshTopology :: Update()
el.PNum(eledges[j][1]));
edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (vert2edge.Used (edge))
edgenum = vert2edge.Get(edge);
@@ -484,7 +493,7 @@ void MeshTopology :: Update()
{
INDEX_2 edge(parents[0], parents[1]);
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (!vert2edge.Used (edge))
{
@@ -519,7 +528,7 @@ void MeshTopology :: Update()
INDEX_2 edge(seg.p1, seg.p2);
int edgenum;
int edgedir = (edge.I1() > edge.I2());
- if (edgedir) Swap (edge.I1(), edge.I2());
+ if (edgedir) swap (edge.I1(), edge.I2());
if (vert2edge.Used (edge))
edgenum = vert2edge.Get(edge);
@@ -593,17 +602,17 @@ void MeshTopology :: Update()
facedir = 0;
if (face.I1() > face.I2())
{
- Swap (face.I1(), face.I2());
+ swap (face.I1(), face.I2());
facedir += 1;
}
if (face.I2() > face.I3())
{
- Swap (face.I2(), face.I3());
+ swap (face.I2(), face.I3());
facedir += 2;
}
if (face.I1() > face.I2())
{
- Swap (face.I1(), face.I2());
+ swap (face.I1(), face.I2());
facedir += 4;
}
@@ -644,20 +653,20 @@ void MeshTopology :: Update()
min2 (face4.I4(), face4.I3()))
{ // z - flip
facedir += 1;
- Swap (face4.I1(), face4.I4());
- Swap (face4.I2(), face4.I3());
+ swap (face4.I1(), face4.I4());
+ swap (face4.I2(), face4.I3());
}
if (min2 (face4.I1(), face4.I4()) >
min2 (face4.I2(), face4.I3()))
{ // x - flip
facedir += 2;
- Swap (face4.I1(), face4.I2());
- Swap (face4.I3(), face4.I4());
+ swap (face4.I1(), face4.I2());
+ swap (face4.I3(), face4.I4());
}
if (face4.I2() > face4.I4())
{ // diagonal flip
facedir += 4;
- Swap (face4.I2(), face4.I4());
+ swap (face4.I2(), face4.I4());
}
// face4.Sort();
@@ -712,17 +721,17 @@ void MeshTopology :: Update()
facedir = 0;
if (face.I1() > face.I2())
{
- Swap (face.I1(), face.I2());
+ swap (face.I1(), face.I2());
facedir += 1;
}
if (face.I2() > face.I3())
{
- Swap (face.I2(), face.I3());
+ swap (face.I2(), face.I3());
facedir += 2;
}
if (face.I1() > face.I2())
{
- Swap (face.I1(), face.I2());
+ swap (face.I1(), face.I2());
facedir += 4;
}
@@ -764,20 +773,20 @@ void MeshTopology :: Update()
min2 (face4.I4(), face4.I3()))
{ // z - orientation
facedir += 1;
- Swap (face4.I1(), face4.I4());
- Swap (face4.I2(), face4.I3());
+ swap (face4.I1(), face4.I4());
+ swap (face4.I2(), face4.I3());
}
if (min2 (face4.I1(), face4.I4()) >
min2 (face4.I2(), face4.I3()))
{ // x - orientation
facedir += 2;
- Swap (face4.I1(), face4.I2());
- Swap (face4.I3(), face4.I4());
+ swap (face4.I1(), face4.I2());
+ swap (face4.I3(), face4.I4());
}
if (face4.I2() > face4.I4())
{
facedir += 4;
- Swap (face4.I2(), face4.I4());
+ swap (face4.I2(), face4.I4());
}
INDEX_3 face(face4.I1(), face4.I2(), face4.I3());
@@ -834,6 +843,45 @@ void MeshTopology :: Update()
cout << "hashtable: ";
vert2face.PrintMemInfo(cout);
*/
+
+
+ ARRAY<char> face_els(nfa), face_surfels(nfa);
+ face_els = 0;
+ face_surfels = 0;
+ ARRAY<int> hfaces;
+ for (i = 1; i <= ne; i++)
+ {
+ GetElementFaces (i, hfaces);
+ for (j = 0; j < hfaces.Size(); j++)
+ face_els[hfaces[j]-1]++;
+ }
+ for (i = 1; i <= nse; i++)
+ face_surfels[GetSurfaceElementFace (i)-1]++;
+
+ if (ne)
+ {
+ int cnt_err = 0;
+ for (i = 0; i < nfa; i++)
+ {
+ (*testout) << "face " << i << " has " << int(face_els[i]) << " els, "
+ << int(face_surfels[i]) << " surfels, tot = "
+ << face_els[i] + face_surfels[i] << endl;
+
+ if (face_els[i] + face_surfels[i] == 1)
+ {
+ cnt_err++;
+ (*testout) << "illegal face : " << i << endl;
+ (*testout) << "points = " << face2vert[i] << endl;
+ (*testout) << "pos = ";
+ for (int j = 0; j < 4; j++)
+ if (face2vert[i].I(j+1) >= 1)
+ (*testout) << mesh[(PointIndex)face2vert[i].I(j+1)] << " ";
+ (*testout) << endl;
+ }
+ }
+ if (cnt_err)
+ cout << cnt_err << " elements are not matching !!!" << endl;
+ }
}
/*
@@ -868,6 +916,7 @@ int MeshTopology :: GetNVertices (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return 4;
case TET:
@@ -904,6 +953,7 @@ int MeshTopology :: GetNEdges (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return 4;
case TET:
@@ -941,6 +991,7 @@ int MeshTopology :: GetNFaces (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return 1;
case TET:
@@ -1032,6 +1083,7 @@ const Point3d * MeshTopology :: GetVertices (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return quad_points;
case TET:
@@ -1130,6 +1182,7 @@ const ELEMENT_EDGE * MeshTopology :: GetEdges (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return quad_edges;
case TET:
@@ -1148,7 +1201,7 @@ const ELEMENT_EDGE * MeshTopology :: GetEdges (ELEMENT_TYPE et)
default:
cerr << "Ng_ME_GetEdges, illegal element type " << et << endl;
}
- return 0;
+ return 0;
}
@@ -1161,13 +1214,13 @@ const ELEMENT_FACE * MeshTopology :: GetFaces (ELEMENT_TYPE et)
static int tet_faces[4][4] =
{ { 4, 2, 3, 0 },
- { 4, 1, 3, 0 },
+ { 4, 3, 1, 0 },
{ 4, 1, 2, 0 },
- { 1, 2, 3, 0 } };
+ { 1, 3, 2, 0 } };
static int prism_faces[5][4] =
{
- { 1, 2, 3, 0 },
+ { 1, 3, 2, 0 },
{ 4, 5, 6, 0 },
{ 3, 1, 4, 6 },
{ 1, 2, 5, 4 },
@@ -1180,12 +1233,12 @@ const ELEMENT_FACE * MeshTopology :: GetFaces (ELEMENT_TYPE et)
{ 2, 3, 5, 0 },
{ 3, 4, 5, 0 },
{ 4, 1, 5, 0 },
- { 1, 2, 3, 4 }
+ { 1, 4, 3, 2 }
};
static int hex_faces[6][4] =
{
- { 1, 2, 3, 4 },
+ { 1, 4, 3, 2 },
{ 5, 6, 7, 8 },
{ 1, 2, 6, 5 },
{ 2, 3, 7, 6 },
@@ -1203,6 +1256,7 @@ const ELEMENT_FACE * MeshTopology :: GetFaces (ELEMENT_TYPE et)
case QUAD:
case QUAD6:
+ case QUAD8:
return quad_faces;
@@ -1375,10 +1429,9 @@ int MeshTopology :: GetSurfaceElementFace (int elnr) const
void MeshTopology ::
GetSurfaceElementEdgeOrientations (int elnr, ARRAY<int> & eorient) const
{
- int i;
int ned = GetNEdges (mesh.SurfaceElement(elnr).GetType());
eorient.SetSize (ned);
- for (i = 1; i <= ned; i++)
+ for (int i = 1; i <= ned; i++)
eorient.Elem(i) = (surfedges.Get(elnr)[i-1] > 0) ? 1 : -1;
}
@@ -1448,23 +1501,22 @@ void MeshTopology :: GetEdgeVertices (int ednr, int & v1, int & v2) const
void MeshTopology :: GetFaceEdges (int fnr, ARRAY<int> & edges) const
{
ArrayMem<int,4> pi(4);
- // ArrayMem<int,50> els;
ArrayMem<int,12> eledges;
edges.SetSize (0);
GetFaceVertices (fnr, pi);
- // GetVertexElements (pi[0], els);
+
+ // GetVertexElements (pi[0], els);
FlatArray<int> els = GetVertexElements (pi[0]);
// find one element having all vertices of the face
- int i, j, k;
- for (i = 0; i < els.Size(); i++)
+ for (int i = 0; i < els.Size(); i++)
{
const Element & el = mesh.VolumeElement(els[i]);
-
+
int cntv = 0;
- for (j = 0; j < el.GetNV(); j++)
- for (k = 0; k < pi.Size(); k++)
+ for (int j = 0; j < el.GetNV(); j++)
+ for (int k = 0; k < pi.Size(); k++)
if (el[j] == pi[k])
cntv++;
@@ -1472,13 +1524,13 @@ void MeshTopology :: GetFaceEdges (int fnr, ARRAY<int> & edges) const
{
GetElementEdges (els[i], eledges);
- for (j = 0; j < eledges.Size(); j++)
+ for (int j = 0; j < eledges.Size(); j++)
{
int vi1, vi2;
GetEdgeVertices (eledges[j], vi1, vi2);
bool has1 = 0;
bool has2 = 0;
- for (k = 0; k < pi.Size(); k++)
+ for (int k = 0; k < pi.Size(); k++)
{
if (vi1 == pi[k]) has1 = 1;
if (vi2 == pi[k]) has2 = 1;
@@ -1515,9 +1567,29 @@ void MeshTopology :: GetVertexElements (int vnr, ARRAY<int> & elements) const
FlatArray<int> MeshTopology :: GetVertexElements (int vnr) const
{
if (vert2element)
- return (*vert2element)[vnr-1];
+ return (*vert2element)[vnr];
return FlatArray<int> (0,0);
}
+FlatArray<int> MeshTopology :: GetVertexSurfaceElements (int vnr) const
+{
+ if (vert2surfelement)
+ return (*vert2surfelement)[vnr];
+ return FlatArray<int> (0,0);
+}
+
+
+void MeshTopology :: GetVertexSurfaceElements( int vnr,
+ ARRAY<int>& elements ) const
+{
+ if (vert2surfelement)
+ {
+ int i;
+ int ne = vert2surfelement->EntrySize(vnr);
+ elements.SetSize(ne);
+ for (i = 1; i <= ne; i++)
+ elements.Elem(i) = vert2surfelement->Get(vnr, i);
+ }
+}
}
diff --git a/Netgen/libsrc/meshing/topology.hpp b/Netgen/libsrc/meshing/topology.hpp
index 751034be49..3c5ac1397f 100644
--- a/Netgen/libsrc/meshing/topology.hpp
+++ b/Netgen/libsrc/meshing/topology.hpp
@@ -28,12 +28,13 @@ class MeshTopology
MoveableArray<int> surffaces;
MoveableArray<INDEX_2> surf2volelement;
MoveableArray<int> face2surfel;
- TABLE<int> *vert2element;
- TABLE<int> *vert2surfelement;
- TABLE<int> *vert2segment;
+ TABLE<int,PointIndex::BASE> *vert2element;
+ TABLE<int,PointIndex::BASE> *vert2surfelement;
+ TABLE<int,PointIndex::BASE> *vert2segment;
int timestamp;
public:
MeshTopology (const Mesh & amesh);
+ ~MeshTopology ();
void SetBuildEdges (int be)
{ buildedges = be; }
@@ -104,6 +105,9 @@ public:
void GetVertexElements (int vnr, ARRAY<int> & elements) const;
FlatArray<int> GetVertexElements (int vnr) const;
+
+ void GetVertexSurfaceElements( int vnr, ARRAY<int>& elements ) const;
+ FlatArray<int> GetVertexSurfaceElements (int vnr) const;
};
#endif
diff --git a/Netgen/libsrc/meshing/zrefine.cpp b/Netgen/libsrc/meshing/zrefine.cpp
index 70dc91e1ca..7b4d4804a9 100644
--- a/Netgen/libsrc/meshing/zrefine.cpp
+++ b/Netgen/libsrc/meshing/zrefine.cpp
@@ -28,7 +28,7 @@ namespace netgen
for (i = 1; i <= mesh.GetNSeg(); i++)
{
const Segment & seg = mesh.LineSegment(i);
- if (seg.singedge)
+ if (seg.singedge_left || seg.singedge_right)
{
INDEX_2 i2(seg.p1, seg.p2);
i2.Sort();
diff --git a/Netgen/libsrc/occ/occgenmesh.cpp b/Netgen/libsrc/occ/occgenmesh.cpp
index f7055eb027..822edf3681 100644
--- a/Netgen/libsrc/occ/occgenmesh.cpp
+++ b/Netgen/libsrc/occ/occgenmesh.cpp
@@ -4,6 +4,9 @@
#include <occgeom.hpp>
#include <meshing.hpp>
+#include <stlgeom.hpp>
+
+
namespace netgen
{
@@ -12,15 +15,23 @@ namespace netgen
#define TCL_OK 0
#define TCL_ERROR 1
+extern STLParameters stlparam;
+
+#define DIVIDEEDGESECTIONS 1000
+#define IGNORECURVELENGTH 1e-4
-void DivideEdge (TopoDS_Edge & edge, ARRAY <MeshPoint> & ps, ARRAY<double> & params, Mesh & mesh)
+
+void DivideEdge (TopoDS_Edge & edge,
+ ARRAY<MeshPoint> & ps,
+ ARRAY<double> & params,
+ Mesh & mesh)
{
double s0, s1;
int j;
double maxh = mparam.maxh;
int nsubedges = 1;
- gp_Pnt pnt;
- double svalue[1000];
+ gp_Pnt pnt, oldpnt;
+ double svalue[DIVIDEEDGESECTIONS];
GProp_GProps system;
BRepGProp::LinearProperties(edge, system);
@@ -28,49 +39,64 @@ void DivideEdge (TopoDS_Edge & edge, ARRAY <MeshPoint> & ps, ARRAY<double> & par
Handle(Geom_Curve) c = BRep_Tool::Curve(edge, s0, s1);
- double s = s0;
- j = 0;
- while (s < s1)
- {
- pnt = c->Value(s);
- svalue[j] = s;
- s += mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*(s1-s0)/L;
- j++;
- if (s < s1) nsubedges++;
- }
- svalue[j] = s;
- double stretchfac = (s1-s0)/(s-s0);
+ double hvalue[DIVIDEEDGESECTIONS+1];
+ hvalue[0] = 0;
+ pnt = c->Value(s0);
- if (nsubedges < mparam.segmentsperedge)
+ double olddist = 0;
+ double dist = 0;
+
+ for (int i = 1; i <= DIVIDEEDGESECTIONS; i++)
{
- nsubedges = 1;
- s = s0;
- j = 0;
- while (s < s1)
- {
- pnt = c->Value(s);
- svalue[j] = s;
- s += min ((s1-s0)/mparam.segmentsperedge, mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*(s1-s0)/L);
- j++;
- if (s < s1) nsubedges++;
- }
- svalue[j] = s;
- stretchfac = (s1-s0)/(s-s0);
+ oldpnt = pnt;
+ pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0));
+ hvalue[i] = hvalue[i-1] +
+ 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
+ pnt.Distance(oldpnt);
+
+ olddist = dist;
+ dist = pnt.Distance(oldpnt);
}
- ps.SetSize (nsubedges-1);
- params.SetSize (nsubedges+1);
+ // nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS]));
+ nsubedges = max (1, int(floor(hvalue[DIVIDEEDGESECTIONS]+0.5)));
- for (j = 1; j < nsubedges; j++)
+ ps.SetSize(nsubedges-1);
+ params.SetSize(nsubedges+1);
+
+ int i = 1;
+ int i1 = 0;
+ do
{
- params[j] = s0+stretchfac*(svalue[j]-s0);
- pnt = c->Value(params[j]);
- ps[j-1] = MeshPoint (Point3d(pnt.X(), pnt.Y(), pnt.Z()));
- }
+ if (hvalue[i1]/hvalue[DIVIDEEDGESECTIONS]*nsubedges >= i)
+ {
+ params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);
+ pnt = c->Value(params[i]);
+ ps[i-1] = MeshPoint (Point3d(pnt.X(), pnt.Y(), pnt.Z()));
+ i++;
+ }
+ i1++;
+ if (i1 > DIVIDEEDGESECTIONS)
+ {
+ nsubedges = i;
+ ps.SetSize(nsubedges-1);
+ params.SetSize(nsubedges+1);
+ cout << "divide edge: local h too small" << endl;
+ }
+ } while (i < nsubedges);
params[0] = s0;
params[nsubedges] = s1;
+
+ if (params[nsubedges] <= params[nsubedges-1])
+ {
+ cout << "CORRECTED" << endl;
+ ps.SetSize (nsubedges-2);
+ params.SetSize (nsubedges);
+ params[nsubedges] = s1;
+ }
}
+
@@ -78,6 +104,11 @@ static void FindEdges (OCCGeometry & geom, Mesh & mesh)
{
int i, j;
+ char * savetask = multithread.task;
+ multithread.task = "Edge meshing";
+
+ (*testout) << "edge meshing" << endl;
+
TopExp_Explorer exp0, exp01, exp1, exp2, exp3;
int nvertices = geom.vmap.Extent();
@@ -86,109 +117,245 @@ static void FindEdges (OCCGeometry & geom, Mesh & mesh)
{
gp_Pnt pnt = BRep_Tool::Pnt (TopoDS::Vertex(geom.vmap(i)));
MeshPoint mp( Point3d(pnt.X(), pnt.Y(), pnt.Z()) );
+
+ /*
+ int exists = 0;
+
+ for (j = 1; !exists && (j <= mesh.GetNP()); j++)
+ if ((mesh.Point(j)-Point<3>(mp)).Length() < 1e-6)
+ exists = 1;
+
+ if (!exists)
+ */
+
mesh.AddPoint (mp);
}
int facenr = 0;
int edgenr = 0;
+ int total = 0;
+ int solidnr = 0;
+
+ ARRAY<int> face2solid;
+ face2solid.SetSize (geom.fmap.Extent());
+ face2solid = 0;
+
+ /*
for (exp0.Init(geom.shape, TopAbs_SOLID); exp0.More(); exp0.Next())
- for (exp01.Init(exp0.Current(), TopAbs_SHELL); exp01.More(); exp01.Next())
- {
- TopoDS_Shape shell = exp01.Current();
-
- for (exp1.Init(shell, TopAbs_FACE); exp1.More(); exp1.Next())
+ {
+ solidnr++;
+ for (exp01.Init(exp0.Current(), TopAbs_SHELL); exp01.More(); exp01.Next())
+ {
+ TopoDS_Shape shell = exp01.Current();
+ for (exp1.Init(shell, TopAbs_FACE); exp1.More(); exp1.Next())
+ {
+ TopoDS_Face face = TopoDS::Face(exp1.Current());
+ facenr = geom.fmap.FindIndex(face);
+ face2solid[facenr-1] = solidnr;
+
+ for (exp2.Init (face, TopAbs_WIRE); exp2.More(); exp2.Next())
+ {
+ TopoDS_Shape wire = exp2.Current();
+
+ for (exp3.Init (wire, TopAbs_EDGE); exp3.More(); exp3.Next())
+ {
+ total++;
+ }
+ }
+ }
+ }
+ }
+ */
+
+ for (exp0.Init(geom.shape, TopAbs_SOLID); exp0.More(); exp0.Next())
+ {
+ solidnr++;
+ for (exp1.Init(exp0.Current(), TopAbs_FACE); exp1.More(); exp1.Next())
+ {
+ TopoDS_Face face = TopoDS::Face(exp1.Current());
+ facenr = geom.fmap.FindIndex(face);
+ face2solid[facenr-1] = solidnr;
+ }
+ }
+
+
+ for (int i3 = 1; i3 <= geom.fmap.Extent(); i3++)
+ for (exp2.Init (geom.fmap(i3), TopAbs_WIRE); exp2.More(); exp2.Next())
+ for (exp3.Init (exp2.Current(), TopAbs_EDGE); exp3.More(); exp3.Next())
+ total++;
+
+
+ int curr = 0;
+
+
+ solidnr = 0;
+ /*
+ for (exp0.Init(geom.shape, TopAbs_SOLID); exp0.More(); exp0.Next())
+ {
+ solidnr++;
+ for (exp01.Init(exp0.Current(), TopAbs_SHELL); exp01.More(); exp01.Next())
+ {
+ TopoDS_Shape shell = exp01.Current();
+
+ for (exp1.Init(shell, TopAbs_FACE); exp1.More(); exp1.Next())
+ {
+
+ TopoDS_Face face = TopoDS::Face(exp1.Current());
+ */
+
+ for (int i3 = 1; i3 <= geom.fmap.Extent(); i3++)
+
+
+ {
{
- TopoDS_Face face = TopoDS::Face(exp1.Current());
+ {
+ TopoDS_Face face = TopoDS::Face(geom.fmap(i3));
+ solidnr = face2solid[i3-1];
+
+
+ facenr = geom.fmap.FindIndex (face);
+
+ mesh.AddFaceDescriptor (FaceDescriptor(facenr, solidnr, 0, 0));
+ Handle(Geom_Surface) occface = BRep_Tool::Surface(face);
+
+ for (exp2.Init (face, TopAbs_WIRE); exp2.More(); exp2.Next())
+ {
+ TopoDS_Shape wire = exp2.Current();
+
+ for (exp3.Init (wire, TopAbs_EDGE); exp3.More(); exp3.Next())
+ {
+ curr++;
+
+ multithread.percent = 100 * curr / (double) total;
+ if (multithread.terminate) return;
- facenr = geom.fmap.FindIndex (face);
-
- mesh.AddFaceDescriptor (FaceDescriptor(facenr, 1, 0, 0));
- Handle(Geom_Surface) occface = BRep_Tool::Surface(face);
-
- for (exp2.Init (face, TopAbs_WIRE); exp2.More(); exp2.Next())
- {
- TopoDS_Shape wire = exp2.Current();
+ TopoDS_Edge edge = TopoDS::Edge (exp3.Current());
+ if (BRep_Tool::Degenerated(edge)) continue;
- for (exp3.Init (wire, TopAbs_EDGE); exp3.More(); exp3.Next())
- {
- TopoDS_Edge edge = TopoDS::Edge (exp3.Current());
- if (BRep_Tool::Degenerated(edge)) continue;
+ if (geom.vmap.FindIndex(TopExp::FirstVertex (edge)) ==
+ geom.vmap.FindIndex(TopExp::LastVertex (edge)))
+ {
+ GProp_GProps system;
+ BRepGProp::LinearProperties(edge, system);
+
+ if (system.Mass() < 1e-5)
+ {
+ cout << "ignoring edge " << geom.emap.FindIndex (edge)
+ << ". closed edge with length < 1e-5" << endl;
+ continue;
+ }
+ }
- Handle(Geom2d_Curve) cof;
- double s0, s1;
- cof = BRep_Tool::CurveOnSurface (edge, face, s0, s1);
-
- int geomedgenr = geom.emap.FindIndex(edge);
- ARRAY <MeshPoint> mp;
- ARRAY <double> params;
-
- DivideEdge (edge, mp, params, mesh);
+ Handle(Geom2d_Curve) cof;
+ double s0, s1;
+ cof = BRep_Tool::CurveOnSurface (edge, face, s0, s1);
+
+ int geomedgenr = geom.emap.FindIndex(edge);
+
+ ARRAY <MeshPoint> mp;
+ ARRAY <double> params;
+
+ DivideEdge (edge, mp, params, mesh);
+
- ARRAY <int> pnums;
- pnums.SetSize (mp.Size()+2);
+ ARRAY <int> pnums;
+ pnums.SetSize (mp.Size()+2);
- pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge));
- pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge));
+ pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge));
+ pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge));
- for (i = 1; i <= mp.Size(); i++)
- {
- int exists = 0;
+ for (i = 1; i <= mp.Size(); i++)
+ {
+ int exists = 0;
- for (j = 1; !exists && (j <= mesh.GetNP()-nvertices); j++)
- if ((mesh.Point(nvertices+j)-Point<3>(mp[i-1])).Length() < 1e-6) exists = 1;
- if (exists)
- {
- pnums[i] = nvertices+j-1;
- }
- else
- {
- mesh.AddPoint (mp[i-1]);
- pnums[i] = mesh.GetNP();
- }
- }
+ for (j = 1; !exists && (j <= mesh.GetNP()-nvertices); j++)
+ if ((mesh.Point(nvertices+j)-Point<3>(mp[i-1])).Length() < 1e-6) exists = 1;
+
+ if (exists)
+ {
+ pnums[i] = nvertices+j-1;
+ }
+ else
+ {
+ mesh.AddPoint (mp[i-1]);
+ pnums[i] = mesh.GetNP();
+ }
+ }
- for (i = 1; i <= mp.Size()+1; i++)
- {
- edgenr++;
- Segment seg;
-
- seg.p1 = pnums[i-1];
- seg.p2 = pnums[i];
- seg.edgenr = edgenr;
- seg.si = facenr;
- seg.epgeominfo[0].dist = params[i-1];
- seg.epgeominfo[1].dist = params[i];
- seg.epgeominfo[0].edgenr = geomedgenr;
- seg.epgeominfo[1].edgenr = geomedgenr;
-
- gp_Pnt2d p2d;
- p2d = cof->Value(params[i-1]);
- seg.epgeominfo[0].u = p2d.X();
- seg.epgeominfo[0].v = p2d.Y();
- p2d = cof->Value(params[i]);
- seg.epgeominfo[1].u = p2d.X();
- seg.epgeominfo[1].v = p2d.Y();
-
- if (edge.Orientation() == TopAbs_REVERSED)
- {
- swap (seg.p1, seg.p2);
- swap (seg.epgeominfo[0].dist, seg.epgeominfo[1].dist);
- swap (seg.epgeominfo[0].u, seg.epgeominfo[1].u);
- swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v);
- }
+ for (i = 1; i <= mp.Size()+1; i++)
+ {
+ edgenr++;
+ Segment seg;
+ seg.p1 = pnums[i-1];
+ seg.p2 = pnums[i];
+ seg.edgenr = edgenr;
+ seg.si = facenr;
+ seg.epgeominfo[0].dist = params[i-1];
+ seg.epgeominfo[1].dist = params[i];
+ seg.epgeominfo[0].edgenr = geomedgenr;
+ seg.epgeominfo[1].edgenr = geomedgenr;
- mesh.AddSegment (seg);
+ gp_Pnt2d p2d;
+ p2d = cof->Value(params[i-1]);
+ // if (i == 1) p2d = cof->Value(s0);
+ seg.epgeominfo[0].u = p2d.X();
+ seg.epgeominfo[0].v = p2d.Y();
+ p2d = cof->Value(params[i]);
+ // if (i == mp.Size()+1) p2d = cof -> Value(s1);
+ seg.epgeominfo[1].u = p2d.X();
+ seg.epgeominfo[1].v = p2d.Y();
+
+ /*
+ if (occface->IsUPeriodic())
+ {
+ cout << "U Periodic" << endl;
+ if (fabs(seg.epgeominfo[1].u-seg.epgeominfo[0].u) >
+ fabs(seg.epgeominfo[1].u-
+ (seg.epgeominfo[0].u-occface->UPeriod())))
+ seg.epgeominfo[0].u = p2d.X()+occface->UPeriod();
+
+ if (fabs(seg.epgeominfo[1].u-seg.epgeominfo[0].u) >
+ fabs(seg.epgeominfo[1].u-
+ (seg.epgeominfo[0].u+occface->UPeriod())))
+ seg.epgeominfo[0].u = p2d.X()-occface->UPeriod();
+ }
+
+ if (occface->IsVPeriodic())
+ {
+ cout << "V Periodic" << endl;
+ if (fabs(seg.epgeominfo[1].v-seg.epgeominfo[0].v) >
+ fabs(seg.epgeominfo[1].v-
+ (seg.epgeominfo[0].v-occface->VPeriod())))
+ seg.epgeominfo[0].v = p2d.Y()+occface->VPeriod();
+
+ if (fabs(seg.epgeominfo[1].v-seg.epgeominfo[0].v) >
+ fabs(seg.epgeominfo[1].v-
+ (seg.epgeominfo[0].v+occface->VPeriod())))
+ seg.epgeominfo[0].v = p2d.Y()-occface->VPeriod();
+ }
+ */
- // (*testout) << "seg" << seg.edgenr << ": " << seg.p1 << " - " << seg.p2 << endl;
- }
- }
- }
- }
- }
+ if (edge.Orientation() == TopAbs_REVERSED)
+ {
+ swap (seg.p1, seg.p2);
+ swap (seg.epgeominfo[0].dist, seg.epgeominfo[1].dist);
+ swap (seg.epgeominfo[0].u, seg.epgeominfo[1].u);
+ swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v);
+ }
+
+ mesh.AddSegment (seg);
+
+ }
+ }
+ }
+ }
+ }
+ }
mesh.CalcSurfacesOfNode();
+ multithread.task = savetask;
}
@@ -202,94 +369,238 @@ static void OCCMeshSurface (OCCGeometry & geom, Mesh & mesh, int perfstepsend)
char * savetask = multithread.task;
multithread.task = "Surface meshing";
+ geom.facemeshstatus = 0;
+
int noldp = mesh.GetNP();
double starttime = GetTime();
ARRAY<int> glob2loc(noldp);
+ int projecttype = PARAMETERSPACE;
+
+ //int projecttype = PLANESPACE;
+
+ int notrys = 1;
+
+ int surfmesherror = 0;
+
for (k = 1; k <= mesh.GetNFD(); k++)
{
-
(*testout) << "mesh face " << k << endl;
multithread.percent = 100 * k / (mesh.GetNFD()+1e-10);
+ geom.facemeshstatus[k-1] = -1;
+
+ /*
+ if (k != 138)
+ {
+ cout << "skipped" << endl;
+ continue;
+ }
+ */
+
FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
- PrintMessage (2, "Surface ", k, " / ", mesh.GetNFD());
-
int oldnf = mesh.GetNSE();
-
- Box<3> bb (Point<3> (-geom.MaxSize(), -geom.MaxSize(), -geom.MaxSize()),
- Point<3> (geom.MaxSize(), geom.MaxSize(), geom.MaxSize()));
+ Box<3> bb = geom.GetBoundingBox();
+
+ Meshing2OCCSurfaces meshing(TopoDS::Face(geom.fmap(k)), bb, projecttype);
+
+ if (meshing.GetProjectionType() == PLANESPACE)
+ PrintMessage (2, "Face ", k, " / ", mesh.GetNFD(), " (plane space projection)");
+ else
+ PrintMessage (2, "Face ", k, " / ", mesh.GetNFD(), " (parameter space projection)");
+
+ if (surfmesherror)
+ cout << "Surface meshing error occured before (in " << surfmesherror << " faces)" << endl;
- Meshing2OCCSurfaces meshing(TopoDS::Face(geom.fmap(k)), bb);
// Meshing2OCCSurfaces meshing(f2, bb);
meshing.SetStartTime (starttime);
- /*
- for (i = 1; i <= noldp; i++)
- {
- // (*testout) << "Add point " << mesh.Point(i) << endl;
- meshing.AddPoint (mesh.Point(i), i);
- }
- */
+ (*testout) << "Face " << k << endl << endl;
+
- int cntp = 0;
- glob2loc = 0;
- for (i = 1; i <= mesh.GetNSeg(); i++)
+ if (meshing.GetProjectionType() == PLANESPACE)
{
- Segment & seg = mesh.LineSegment(i);
- if (seg.si == k)
+ int cntp = 0;
+ glob2loc = 0;
+ for (i = 1; i <= mesh.GetNSeg(); i++)
{
- for (j = 1; j <= 2; j++)
+ Segment & seg = mesh.LineSegment(i);
+ if (seg.si == k)
{
- int pi = (j == 1) ? seg.p1 : seg.p2;
- if (!glob2loc.Get(pi))
+ for (j = 1; j <= 2; j++)
{
- meshing.AddPoint (mesh.Point(pi), pi);
- cntp++;
- glob2loc.Elem(pi) = cntp;
+ int pi = (j == 1) ? seg.p1 : seg.p2;
+ if (!glob2loc.Get(pi))
+ {
+ meshing.AddPoint (mesh.Point(pi), pi);
+ cntp++;
+ glob2loc.Elem(pi) = cntp;
+ }
}
}
}
+
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ {
+ Segment & seg = mesh.LineSegment(i);
+ if (seg.si == k)
+ {
+ PointGeomInfo gi0, gi1;
+ gi0.trignum = gi1.trignum = k;
+ gi0.u = seg.epgeominfo[0].u;
+ gi0.v = seg.epgeominfo[0].v;
+ gi1.u = seg.epgeominfo[1].u;
+ gi1.v = seg.epgeominfo[1].v;
+
+ meshing.AddBoundaryElement (glob2loc.Get(seg.p1), glob2loc.Get(seg.p2), gi0, gi1);
+ (*testout) << gi0.u << " " << gi0.v << endl;
+ (*testout) << gi1.u << " " << gi1.v << endl;
+ }
+ }
}
-
- for (i = 1; i <= mesh.GetNSeg(); i++)
+ else
{
- Segment & seg = mesh.LineSegment(i);
- if (seg.si == k)
+ int cntp = 0;
+
+ for (i = 1; i <= mesh.GetNSeg(); i++)
+ if (mesh.LineSegment(i).si == k)
+ cntp+=2;
+
+
+ ARRAY< PointGeomInfo > gis;
+
+ gis.SetAllocSize (cntp);
+ gis.SetSize (0);
+
+ for (i = 1; i <= mesh.GetNSeg(); i++)
{
- PointGeomInfo gi0, gi1;
- gi0.trignum = gi1.trignum = k;
- gi0.u = seg.epgeominfo[0].u;
- gi0.v = seg.epgeominfo[0].v;
- gi1.u = seg.epgeominfo[1].u;
- gi1.v = seg.epgeominfo[1].v;
-
- meshing.AddBoundaryElement (glob2loc.Get(seg.p1), glob2loc.Get(seg.p2), gi0, gi1);
+ Segment & seg = mesh.LineSegment(i);
+ if (seg.si == k)
+ {
+ PointGeomInfo gi0, gi1;
+ gi0.trignum = gi1.trignum = k;
+ gi0.u = seg.epgeominfo[0].u;
+ gi0.v = seg.epgeominfo[0].v;
+ gi1.u = seg.epgeominfo[1].u;
+ gi1.v = seg.epgeominfo[1].v;
+
+ int locpnum[2] = {0, 0};
+
+ for (j = 0; j < 2; j++)
+ {
+ PointGeomInfo gi = (j == 0) ? gi0 : gi1;
+
+ int l;
+ for (l = 0; l < gis.Size() && locpnum[j] == 0; l++)
+ {
+ double dist = sqr (gis[l].u-gi.u)+sqr(gis[l].v-gi.v);
+
+ if (dist < 1e-10)
+ locpnum[j] = l+1;
+ }
+
+ if (locpnum[j] == 0)
+ {
+ int pi = (j == 0) ? seg.p1 : seg.p2;
+ meshing.AddPoint (mesh.Point(pi), pi);
+
+ gis.SetSize (gis.Size()+1);
+ gis[l] = gi;
+ locpnum[j] = l+1;
+ }
+ }
+
+ meshing.AddBoundaryElement (locpnum[0], locpnum[1], gi0, gi1);
+ (*testout) << gi0.u << " " << gi0.v << endl;
+ (*testout) << gi1.u << " " << gi1.v << endl;
- (*testout) << "Add BE " << seg.p1 << "-" << seg.p2 << " (" << ")" << endl;
+ }
}
}
+
+
+
+
+
double maxh = mparam.maxh;
+ mparam.checkoverlap = 0;
+ // int noldpoints = mesh->GetNP();
+ int noldsurfel = mesh.GetNSE();
- MESHING2_RESULT res =
- meshing.GenerateMesh (mesh, maxh, k);
+ MESHING2_RESULT res;
+
+ try {
+ res = meshing.GenerateMesh (mesh, maxh, k);
+ }
+
+ catch (SingularMatrixException)
+ {
+ (*myerr) << "Singular Matrix" << endl;
+ res = MESHING2_GIVEUP;
+ }
+
+ catch (UVBoundsException)
+ {
+ (*myerr) << "UV bounds exceeded" << endl;
+ res = MESHING2_GIVEUP;
+ }
+
+ projecttype = PARAMETERSPACE;
if (res != MESHING2_OK)
{
- PrintError ("Problem in Surface mesh generation");
- throw NgException ("Problem in Surface mesh generation");
+ if (notrys == 1)
+ {
+ for (int i = noldsurfel+1; i <= mesh.GetNSE(); i++)
+ mesh.DeleteSurfaceElement (i);
+
+ mesh.Compress();
+
+ cout << "retry Surface " << k << endl;
+
+ k--;
+ projecttype*=-1;
+ notrys++;
+ continue;
+ }
+ else
+ {
+ geom.facemeshstatus[k-1] = -1;
+ PrintError ("Problem in Surface mesh generation");
+ surfmesherror++;
+ // throw NgException ("Problem in Surface mesh generation");
+ }
}
+ else
+ {
+ geom.facemeshstatus[k-1] = 1;
+ }
+
+ notrys = 1;
for (i = oldnf+1; i <= mesh.GetNSE(); i++)
mesh.SurfaceElement(i).SetIndex (k);
}
+ if (surfmesherror)
+ {
+ cout << "WARNING! NOT ALL FACES HAVED BEEN MESHED" << endl;
+ cout << "SURFACE MESHING ERROR OCCURED IN " << surfmesherror << " FACES:" << endl;
+ for (int i = 1; i <= geom.fmap.Extent(); i++)
+ if (geom.facemeshstatus[i-1] == -1)
+ cout << "Face " << i << endl;
+ cout << endl;
+ cout << "for more information open IGES/STEP Topology Explorer" << endl;
+ throw NgException ("Problem in Surface mesh generation");
+ }
+
+
if (multithread.terminate || perfstepsend < MESHCONST_OPTSURFACE)
return;
@@ -371,11 +682,126 @@ double ComputeH (double kappa)
if (mparam.maxh < hret)
hret = mparam.maxh;
-
+
return (hret);
}
+class Line
+{
+public:
+ Point<3> p0, p1;
+ double Dist (Line l)
+ {
+ Vec<3> n = p1-p0;
+ Vec<3> q = l.p1-l.p0;
+ double nq = n*q;
+
+ Point<3> p = p0 + 0.5*n;
+ double lambda = (p-l.p0)*n / nq;
+
+ if (lambda >= 0 && lambda <= 1)
+ {
+ double d = (p-l.p0-lambda*q).Length();
+ // if (d < 1e-3) d = 1e99;
+ return d;
+ }
+ else
+ return 1e99;
+ }
+
+ double Length ()
+ {
+ return (p1-p0).Length();
+ };
+};
+
+
+
+void RestrictHTriangle (gp_Pnt2d & par0, gp_Pnt2d & par1, gp_Pnt2d & par2,
+ BRepLProp_SLProps * prop, Mesh & mesh, double maxside, int depth, double h = 0)
+{
+ gp_Pnt2d parmid;
+
+ parmid.SetX(0.3*(par0.X()+par1.X()+par2.X()));
+ parmid.SetY(0.3*(par0.Y()+par1.Y()+par2.Y()));
+
+ if (depth == 0)
+ {
+ prop->SetParameters (parmid.X(), parmid.Y());
+ if (!prop->IsCurvatureDefined())
+ {
+ (*testout) << "curvature not defined!" << endl;
+ return;
+ }
+ double curvature = max(fabs(prop->MinCurvature()), fabs(prop->MaxCurvature()));
+ if (curvature < 1e-3)
+ {
+ (*testout) << "curvature too small (" << curvature << ")!" << endl;
+ // return;
+ }
+ h = ComputeH (curvature+1e-10);
+ }
+
+ if (h < maxside)
+ {
+ gp_Pnt2d pm0;
+ gp_Pnt2d pm1;
+ gp_Pnt2d pm2;
+
+ pm0.SetX(0.5*(par1.X()+par2.X())); pm0.SetY(0.5*(par1.Y()+par2.Y()));
+ pm1.SetX(0.5*(par0.X()+par2.X())); pm1.SetY(0.5*(par0.Y()+par2.Y()));
+ pm2.SetX(0.5*(par1.X()+par0.X())); pm2.SetY(0.5*(par1.Y()+par0.Y()));
+
+ RestrictHTriangle (pm0, pm1, pm2, prop, mesh, maxside/2, depth+1, h);
+ RestrictHTriangle (par0, pm1, pm2, prop, mesh, maxside/2, depth+1, h);
+ RestrictHTriangle (par1, pm0, pm2, prop, mesh, maxside/2, depth+1, h);
+ RestrictHTriangle (par2, pm1, pm0, prop, mesh, maxside/2, depth+1, h);
+ }
+ else
+ {
+ prop->SetParameters (parmid.X(), parmid.Y());
+ gp_Pnt pnt = prop->Value();
+ Point3d p3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+ prop->SetParameters (par0.X(), par0.Y());
+ pnt = prop->Value();
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+ prop->SetParameters (par1.X(), par1.Y());
+ pnt = prop->Value();
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+ prop->SetParameters (par2.X(), par2.Y());
+ pnt = prop->Value();
+ p3d = Point3d(pnt.X(), pnt.Y(), pnt.Z());
+ mesh.RestrictLocalH (p3d, h);
+
+ // (*testout) << "p = " << p3d << ", h = " << h << ", maxside = " << maxside << endl;
+ /*
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+ prop->SetParameters (par0.X(), par0.Y());
+ pnt = prop->Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+ prop->SetParameters (par1.X(), par1.Y());
+ pnt = prop->Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+
+ prop->SetParameters (par2.X(), par2.Y());
+ pnt = prop->Value();
+ (*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
+ */
+ }
+}
+
+
+
+
int OCCGenerateMesh (OCCGeometry & geom,
Mesh *& mesh,
int perfstepsstart, int perfstepsend,
@@ -383,6 +809,8 @@ int OCCGenerateMesh (OCCGeometry & geom,
{
int i, j;
+ multithread.percent = 0;
+
if (perfstepsstart <= MESHCONST_ANALYSE)
{
delete mesh;
@@ -390,42 +818,128 @@ int OCCGenerateMesh (OCCGeometry & geom,
mesh->SetGlobalH (mparam.maxh);
- ARRAY<double> maxhdom(1);
- maxhdom[0] = mparam.maxh;
- double maxsize = geom.MaxSize();
+ ARRAY<double> maxhdom;
+ maxhdom.SetSize (geom.NrSolids());
+ maxhdom = mparam.maxh;
mesh->SetMaxHDomain (maxhdom);
- mesh->SetLocalH (Point<3>(-maxsize, -maxsize, -maxsize),
- Point<3>(maxsize, maxsize, maxsize),
- 0.5);
+
+ Box<3> bb = geom.GetBoundingBox();
+ bb.Increase (bb.Diam()/10);
+
+ mesh->SetLocalH (bb.PMin(), bb.PMax(), 0.5);
+
if (mparam.uselocalh)
{
char * savetask = multithread.task;
- multithread.task = "Setting local mesh size";
-
- double maxsize = geom.MaxSize();
- mesh->SetLocalH (Point<3>(-maxsize, -maxsize, -maxsize),
- Point<3>(maxsize, maxsize, maxsize),
- mparam.grading);
+ multithread.percent = 0;
+
+ mesh->SetLocalH (bb.PMin(), bb.PMax(), mparam.grading);
+
+ int nedges = geom.emap.Extent();
+ int i;
+
+ double maxedgelen = 0;
+ double minedgelen = 1e99;
+
+
+ multithread.task = "Setting local mesh size (elements per edge)";
+
+ // setting elements per edge
+
+ for (i = 1; i <= nedges && !multithread.terminate; i++)
+ {
+ TopoDS_Edge e = TopoDS::Edge (geom.emap(i));
+ multithread.percent = 100 * (i-1)/double(nedges);
+ if (BRep_Tool::Degenerated(e)) continue;
+
+ GProp_GProps system;
+ BRepGProp::LinearProperties(e, system);
+ double len = system.Mass();
+
+ if (len < IGNORECURVELENGTH)
+ {
+ (*testout) << "ignored" << endl;
+ continue;
+ }
+
+
+ double localh = len/mparam.segmentsperedge;
+ double s0, s1;
+ Handle(Geom_Curve) c = BRep_Tool::Curve(e, s0, s1);
+
+ maxedgelen = max (maxedgelen, len);
+ minedgelen = min (minedgelen, len);
+
+ int j;
+ int maxj = (int) ceil (localh);
+ for (j = 0; j <= localh; j++)
+ {
+ gp_Pnt pnt = c->Value (s0+double(j)/maxj*(s1-s0));
+ mesh->RestrictLocalH (Point3d(pnt.X(), pnt.Y(), pnt.Z()), localh);
+ }
+ }
+
+
+
+
+ multithread.task = "Setting local mesh size (edge curvature)";
+
+
+ // setting edge curvature
+
+ // int nsections = 10;
+ int nsections = 20;
+
+ for (i = 1; i <= nedges && !multithread.terminate; i++)
+ {
+ multithread.percent = 100 * (i-1)/double(nedges);
+ TopoDS_Edge edge = TopoDS::Edge (geom.emap(i));
+ if (BRep_Tool::Degenerated(edge)) continue;
+ double s0, s1;
+ Handle(Geom_Curve) c = BRep_Tool::Curve(edge, s0, s1);
+ BRepAdaptor_Curve brepc(edge);
+ BRepLProp_CLProps prop(brepc, 2, 1e-5);
+
+ int j;
+ for (j = 1; j <= nsections; j++)
+ // for (j = 0; j < nsections; j++)
+ {
+ double s = s0 + j/(double) nsections * (s1-s0);
+ prop.SetParameter (s);
+ double curvature = prop.Curvature();
+
+ if (curvature >= 1e99) continue;
+
+ gp_Pnt pnt = c->Value (s);
+
+ mesh->RestrictLocalH (Point3d(pnt.X(), pnt.Y(), pnt.Z()),
+ ComputeH (fabs(curvature)));
+ }
+ }
- cout << "maxsize = " << maxsize << endl;
+
+
+ multithread.task = "Setting local mesh size (face curvature)";
+
+ // setting face curvature
int nfaces = geom.fmap.Extent();
- int i;
- for (i = 1; i <= nfaces; i++)
+ for (i = 1; i <= nfaces && !multithread.terminate; i++)
{
- (*testout) << "face " << i << endl;
multithread.percent = 100 * (i-1)/double(nfaces);
TopoDS_Face face = TopoDS::Face(geom.fmap(i));
TopLoc_Location loc;
Handle(Geom_Surface) surf = BRep_Tool::Surface (face);
Handle(Poly_Triangulation) triangulation = BRep_Tool::Triangulation (face, loc);
- BRepAdaptor_Surface sf(face, Standard_False);
- BRepLProp_SLProps prop(sf, 2, 1e-5);
+ if (triangulation.IsNull()) continue;
+ BRepAdaptor_Surface sf(face, Standard_True);
+ BRepLProp_SLProps prop(sf, 2, 1e-5);
+
int ntriangles = triangulation -> NbTriangles();
for (j = 1; j <= ntriangles; j++)
{
@@ -436,118 +950,122 @@ int OCCGenerateMesh (OCCGeometry & geom,
for (k = 1; k <=3; k++)
{
int n = triangulation->Triangles()(j)(k);
- p[k-1] = triangulation->Nodes()(n);
+ p[k-1] = triangulation->Nodes()(n).Transformed(loc);
par[k-1] = triangulation->UVNodes()(n);
}
- double lp2p0 = p[2].Distance(p[0]);
- double lp2p1 = p[2].Distance(p[1]);
-
- prop.SetParameters (p[2].X(), p[2].Y());
- double h;
-
- if (!prop.IsCurvatureDefined()) continue;
+ double maxside = 0;
+ maxside = max (maxside, p[0].Distance(p[1]));
+ maxside = max (maxside, p[0].Distance(p[2]));
+ maxside = max (maxside, p[1].Distance(p[2]));
- h = ComputeH (max(fabs(prop.MinCurvature()),
- fabs(prop.MaxCurvature()))+1e-10);
-
- double h0 = h/lp2p0;
- double h1 = h/lp2p1;
+ RestrictHTriangle (par[0], par[1], par[2], &prop, *mesh, maxside, 0);
+ }
+ }
- h0 = min (h0, 1.0);
- h1 = min (h1, 1.0);
- double l0, l1, l2;
- for (l0 = 0; l0 <= 1; l0+=h0)
- for (l1 = 0; l1 <= 1-l0; l1+=h1)
- {
- l2 = 1-l0-l1;
- double u = l0*par[0].X() + l1*par[1].X() + l2*par[2].X();
- double v = l0*par[0].Y() + l1*par[1].Y() + l2*par[2].Y();
- prop.SetParameters (u, v);
+ // setting close edges
- if (!prop.IsCurvatureDefined()) continue;
+ if (stlparam.resthcloseedgeenable)
+ {
+ multithread.task = "Setting local mesh size (close edges)";
+
+ int sections = 100;
+
+ ARRAY<Line> lines(sections*nedges);
+
+ Box3dTree* searchtree =
+ new Box3dTree (bb.PMin(), bb.PMax());
+
+ int nlines = 0;
+ for (int i = 1; i <= nedges && !multithread.terminate; i++)
+ {
+ TopoDS_Edge edge = TopoDS::Edge (geom.emap(i));
+ if (BRep_Tool::Degenerated(edge)) continue;
+
+ double s0, s1;
+ Handle(Geom_Curve) c = BRep_Tool::Curve(edge, s0, s1);
+ BRepAdaptor_Curve brepc(edge);
+ BRepLProp_CLProps prop(brepc, 1, 1e-5);
+ prop.SetParameter (s0);
+
+ gp_Vec d0 = prop.D1().Normalized();
+ double s_start = s0;
+ int count = 0;
+ for (int j = 1; j <= sections; j++)
+ {
+ double s = s0 + (s1-s0)*(double)j/(double)sections;
+ prop.SetParameter (s);
+ gp_Vec d1 = prop.D1().Normalized();
+ double cosalpha = fabs(d0*d1);
+ if ((j == sections) || (cosalpha < cos(10.0/180.0*M_PI)))
+ {
+ count++;
+ gp_Pnt p0 = c->Value (s_start);
+ gp_Pnt p1 = c->Value (s);
+ lines[nlines].p0 = Point<3> (p0.X(), p0.Y(), p0.Z());
+ lines[nlines].p1 = Point<3> (p1.X(), p1.Y(), p1.Z());
+
+ Box3d box;
+ box.SetPoint (Point3d(lines[nlines].p0));
+ box.AddPoint (Point3d(lines[nlines].p1));
- gp_Pnt pnt = prop.Value();
+ searchtree->Insert (box.PMin(), box.PMax(), nlines+1);
+ nlines++;
- mesh->RestrictLocalH (Point3d(pnt.X(), pnt.Y(), pnt.Z()),
- ComputeH (max(fabs(prop.MinCurvature()),
- fabs(prop.MaxCurvature()))+1e-10));
- }
-
+ s_start = s;
+ d0 = d1;
+ }
+ }
}
-
- /*
- // schmale lange drei+viereckerl
- TopExp_Explorer exp;
- for (exp.Init (face, TopAbs_WIRE); exp.More(); exp.Next())
+
+ ARRAY<int> linenums;
+
+ for (int i = 0; i < nlines; i++)
{
- bool done = 0;
- BRepTools_WireExplorer wexp;
- double L[4];
- GProp_GProps system;
- int i = 0;
- double minL = 1e10;
-
- for (wexp.Init (TopoDS::Wire(exp.Current())); wexp.More() && i < 4; wexp.Next())
+ multithread.percent = (100*i)/double(nlines);
+ Line & line = lines[i];
+
+ Box3d box;
+ box.SetPoint (Point3d(line.p0));
+ box.AddPoint (Point3d(line.p1));
+ double maxhline = max (mesh->GetH(box.PMin()),
+ mesh->GetH(box.PMax()));
+ box.Increase(maxhline);
+
+ double mindist = 1e99;
+ linenums.SetSize(0);
+ searchtree->GetIntersecting(box.PMin(),box.PMax(),linenums);
+
+ for (int j = 0; j < linenums.Size(); j++)
{
- BRepGProp::LinearProperties(wexp.Current(), system);
- L[i++] = system.Mass();
- minL = min (minL, L[i-1]);
+ int num = linenums[j]-1;
+ if (i == num) continue;
+ if ((line.p0-lines[num].p0).Length2() < 1e-15) continue;
+ if ((line.p0-lines[num].p1).Length2() < 1e-15) continue;
+ if ((line.p1-lines[num].p0).Length2() < 1e-15) continue;
+ if ((line.p1-lines[num].p1).Length2() < 1e-15) continue;
+ mindist = min (mindist, line.Dist(lines[num]));
}
-
- if (i == 4 && wexp.More()) continue; // more that 4 edges
-
-
- double h = minL;
-
- for (j = 1; j <= ntriangles; j++)
- {
- int k;
- gp_Pnt p[3];
- gp_Pnt2d par[3];
-
- for (k = 1; k <=3; k++)
- {
- int n = triangulation->Triangles()(j)(k);
- p[k-1] = triangulation->Nodes()(n);
- par[k-1] = triangulation->UVNodes()(n);
- }
-
- double lp2p0 = p[2].Distance(p[0]);
- double lp2p1 = p[2].Distance(p[1]);
-
- prop.SetParameters (p[2].X(), p[2].Y());
- double h0 = h/lp2p0;
- double h1 = h/lp2p1;
-
- h0 = min (h0, 1.0);
- h1 = min (h1, 1.0);
-
- double l0, l1, l2;
- for (l0 = 0; l0 <= 1; l0+=h0)
- for (l1 = 0; l1 <= 1-l0; l1+=h1)
- {
- l2 = 1-l0-l1;
- double u = l0*par[0].X() + l1*par[1].X() + l2*par[2].X();
- double v = l0*par[0].Y() + l1*par[1].Y() + l2*par[2].Y();
+ mindist *= stlparam.resthcloseedgefac;
- prop.SetParameters (u, v);
- gp_Pnt pnt = prop.Value();
-
- mesh->RestrictLocalH (Point3d(pnt.X(), pnt.Y(), pnt.Z()), h);
- }
-
+ if (mindist < 1e-3)
+ {
+ (*testout) << "extremely small local h: " << mindist
+ << " --> setting to 1e-3" << endl;
+ mindist = 1e-3;
}
+
+ mesh->RestrictLocalHLine(line.p0, line.p1, mindist);
}
- */
+ }
+
- }
-
multithread.task = savetask;
+
}
}
@@ -559,6 +1077,67 @@ int OCCGenerateMesh (OCCGeometry & geom,
{
FindEdges (geom, *mesh);
+ /*
+ cout << "Removing redundant points" << endl;
+
+ int i, j;
+ int np = mesh->GetNP();
+ ARRAY<int> equalto;
+
+ equalto.SetSize (np);
+ equalto = 0;
+
+ for (i = 1; i <= np; i++)
+ {
+ for (j = i+1; j <= np; j++)
+ {
+ if (!equalto[j-1] && (Dist2 (mesh->Point(i), mesh->Point(j)) < 1e-12))
+ equalto[j-1] = i;
+ }
+ }
+
+ for (i = 1; i <= np; i++)
+ if (equalto[i-1])
+ {
+ cout << "Point " << i << " is equal to Point " << equalto[i-1] << endl;
+ for (j = 1; j <= mesh->GetNSeg(); j++)
+ {
+ Segment & seg = mesh->LineSegment(j);
+ if (seg.p1 == i) seg.p1 = equalto[i-1];
+ if (seg.p2 == i) seg.p2 = equalto[i-1];
+ }
+ }
+
+ cout << "Removing degenerated segments" << endl;
+ for (j = 1; j <= mesh->GetNSeg(); j++)
+ {
+ Segment & seg = mesh->LineSegment(j);
+ if (seg.p1 == seg.p2)
+ {
+ mesh->DeleteSegment(j);
+ cout << "Deleting Segment " << j << endl;
+ }
+ }
+
+ mesh->Compress();
+ */
+
+ /*
+ for (int i = 1; i <= geom.fmap.Extent(); i++)
+ {
+ Handle(Geom_Surface) hf1 =
+ BRep_Tool::Surface(TopoDS::Face(geom.fmap(i)));
+ for (int j = i+1; j <= geom.fmap.Extent(); j++)
+ {
+ Handle(Geom_Surface) hf2 =
+ BRep_Tool::Surface(TopoDS::Face(geom.fmap(j)));
+ if (hf1 == hf2) cout << "face " << i << " and face " << j << " lie on same surface" << endl;
+ }
+ }
+ */
+
+
+
#ifdef LOG_STREAM
(*logout) << "Edges meshed" << endl
<< "time = " << GetTime() << " sec" << endl
@@ -629,7 +1208,7 @@ int OCCGenerateMesh (OCCGeometry & geom,
{
multithread.task = "Volume optimization";
- OptimizeVolume (mparam, *mesh, NULL);
+ OptimizeVolume (mparam, *mesh);
if (multithread.terminate) return TCL_OK;
#ifdef STAT_STREAM
diff --git a/Netgen/libsrc/occ/occgeom.cpp b/Netgen/libsrc/occ/occgeom.cpp
index bc50d82975..e24f52fa0a 100644
--- a/Netgen/libsrc/occ/occgeom.cpp
+++ b/Netgen/libsrc/occ/occgeom.cpp
@@ -2,83 +2,756 @@
#include <mystdlib.h>
#include <occgeom.hpp>
+#include "ShapeAnalysis_ShapeTolerance.hxx"
+#include "ShapeAnalysis_ShapeContents.hxx"
+#include "ShapeAnalysis_CheckSmallFace.hxx"
+#include "ShapeAnalysis_DataMapOfShapeListOfReal.hxx"
+#include "BRepAlgoAPI_Fuse.hxx"
+#include "BRepCheck_Analyzer.hxx"
+#include "BRepLib.hxx"
+#include "ShapeBuild_ReShape.hxx"
+#include "ShapeFix.hxx"
+#include "ShapeFix_FixSmallFace.hxx"
namespace netgen
{
-void PrintContents (OCCGeometry * geom)
+void OCCGeometry :: PrintNrShapes ()
{
- TopExp_Explorer exp0;
- int cnt;
+ TopExp_Explorer e;
+ int count = 0;
+ for (e.Init(shape, TopAbs_COMPSOLID); e.More(); e.Next()) count++;
+ cout << "CompSolids: " << count << endl;
- (*testout) << "OCC CONTENTS" << endl
- << "============" << endl;
+ cout << "Solids : " << somap.Extent() << endl;
+ cout << "Shells : " << shmap.Extent() << endl;
+ cout << "Faces : " << fmap.Extent() << endl;
+ cout << "Edges : " << emap.Extent() << endl;
+ cout << "Vertices : " << vmap.Extent() << endl;
+}
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_COMPOUND); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "COMPOUND : " << cnt << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_COMPSOLID); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "COMPSOLID: " << cnt << endl;
+void PrintContents (OCCGeometry * geom)
+{
+ ShapeAnalysis_ShapeContents cont;
+ cont.Clear();
+ cont.Perform(geom->shape);
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_SOLID); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "SOLID : " << cnt << endl;
+ (*testout) << "OCC CONTENTS" << endl;
+ (*testout) << "============" << endl;
+ (*testout) << "SOLIDS : " << cont.NbSolids() << endl;
+ (*testout) << "SHELLS : " << cont.NbShells() << endl;
+ (*testout) << "FACES : " << cont.NbFaces() << endl;
+ (*testout) << "WIRES : " << cont.NbWires() << endl;
+ (*testout) << "EDGES : " << cont.NbEdges() << endl;
+ (*testout) << "VERTICES : " << cont.NbVertices() << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_SHELL); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "SHELL : " << cnt << endl;
+ TopExp_Explorer e;
+ int count = 0;
+ for (e.Init(geom->shape, TopAbs_COMPOUND); e.More(); e.Next())
+ count++;
+ (*testout) << "Compounds: " << count << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_FACE); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "FACE : " << cnt << endl;
+ count = 0;
+ for (e.Init(geom->shape, TopAbs_COMPSOLID); e.More(); e.Next())
+ count++;
+ (*testout) << "CompSolids: " << count << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_WIRE); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "WIRE : " << cnt << endl;
+ (*testout) << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_EDGE); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "EDGE : " << cnt << endl;
+ cout << "Highest entry in topology hierarchy: " << endl;
+ if (count)
+ cout << count << " composite solid(s)" << endl;
+ else
+ if (geom->somap.Extent())
+ cout << geom->somap.Extent() << " solid(s)" << endl;
+ else
+ if (geom->shmap.Extent())
+ cout << geom->shmap.Extent() << " shells(s)" << endl;
+ else
+ if (geom->fmap.Extent())
+ cout << geom->fmap.Extent() << " face(s)" << endl;
+ else
+ if (geom->wmap.Extent())
+ cout << geom->wmap.Extent() << " wire(s)" << endl;
+ else
+ if (geom->emap.Extent())
+ cout << geom->emap.Extent() << " edge(s)" << endl;
+ else
+ if (geom->vmap.Extent())
+ cout << geom->vmap.Extent() << " vertices(s)" << endl;
+ else
+ cout << "no entities" << endl;
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_VERTEX); exp0.More(); exp0.Next()) cnt++;
- (*testout) << "VERTEX : " << cnt << endl;
}
-void HealGeometry (OCCGeometry * geom)
+
+void OCCGeometry :: HealGeometry ()
{
- TopExp_Explorer exp0;
- int cnt;
+ int nrc = 0, nrcs = 0,
+ nrso = somap.Extent(),
+ nrsh = shmap.Extent(),
+ nrf = fmap.Extent(),
+ nrw = wmap.Extent(),
+ nre = emap.Extent(),
+ nrv = vmap.Extent();
+
+ TopExp_Explorer e;
+ for (e.Init(shape, TopAbs_COMPOUND); e.More(); e.Next()) nrc++;
+ for (e.Init(shape, TopAbs_COMPSOLID); e.More(); e.Next()) nrcs++;
+
+ double surfacecont = 0;
+
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ GProp_GProps system;
+ BRepGProp::LinearProperties(fmap(i), system);
+ surfacecont += system.Mass();
+ }
+
+ cout << "Starting geometry healing procedure (tolerance: " << tolerance << ")" << endl
+ << "-----------------------------------" << endl;
+
+ if (fixsmalledges)
+ {
+ cout << endl << "- fixing small edges" << endl;
+
+ Handle(ShapeFix_Wire) sfw;
+ Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);
+
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ TopExp_Explorer exp1;
+ for (exp1.Init (fmap(i), TopAbs_WIRE); exp1.More(); exp1.Next())
+ {
+ TopoDS_Wire oldwire = TopoDS::Wire(exp1.Current());
+ sfw = new ShapeFix_Wire (oldwire, TopoDS::Face(fmap(i)),tolerance);
+ sfw->ModifyTopologyMode() = Standard_True;
+
+ if (sfw->FixSmall (false, tolerance))
+ {
+ cout << "Fixed small edge in wire " << wmap.FindIndex (oldwire) << endl;
+ TopoDS_Wire newwire = sfw->Wire();
+ rebuild->Replace(oldwire, newwire, Standard_False);
+ }
+ if ((sfw->StatusSmall(ShapeExtend_FAIL1)) ||
+ (sfw->StatusSmall(ShapeExtend_FAIL2)) ||
+ (sfw->StatusSmall(ShapeExtend_FAIL3)))
+ cout << "Failed to fix small edge in wire " << wmap.FindIndex (oldwire) << endl;
+
+
+ }
+ }
+
+ shape = rebuild->Apply(shape);
+
+
+
+ {
+ Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);
+ TopExp_Explorer exp1;
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
+ if (vmap.FindIndex(TopExp::FirstVertex (edge)) ==
+ vmap.FindIndex(TopExp::LastVertex (edge)))
+ {
+ GProp_GProps system;
+ BRepGProp::LinearProperties(edge, system);
+ if (system.Mass() < tolerance)
+ {
+ cout << "removing degenerated edge " << emap.FindIndex(edge) << endl;
+ rebuild->Remove(edge, false);
+ }
+ }
+ }
+ shape = rebuild->Apply(shape);
+ }
+
+
+ Handle(ShapeFix_Wireframe) sfwf = new ShapeFix_Wireframe;
+ sfwf->SetPrecision(tolerance);
+ sfwf->Load (shape);
+
+ if (sfwf->FixSmallEdges())
+ {
+ cout << endl << "- fixing wire frames" << endl;
+ if (sfwf->StatusSmallEdges(ShapeExtend_OK)) cout << "no small edges found" << endl;
+ if (sfwf->StatusSmallEdges(ShapeExtend_DONE1)) cout << "some small edges fixed" << endl;
+ if (sfwf->StatusSmallEdges(ShapeExtend_FAIL1)) cout << "failed to fix some small edges" << endl;
+ }
+
+
+ if (sfwf->FixWireGaps())
+ {
+ cout << endl << "- fixing wire gaps" << endl;
+ if (sfwf->StatusWireGaps(ShapeExtend_OK)) cout << "no gaps found" << endl;
+ if (sfwf->StatusWireGaps(ShapeExtend_DONE1)) cout << "some 2D gaps fixed" << endl;
+ if (sfwf->StatusWireGaps(ShapeExtend_DONE2)) cout << "some 3D gaps fixed" << endl;
+ if (sfwf->StatusWireGaps(ShapeExtend_FAIL1)) cout << "failed to fix some 2D gaps" << endl;
+ if (sfwf->StatusWireGaps(ShapeExtend_FAIL2)) cout << "failed to fix some 3D gaps" << endl;
+ }
+
+
+ shape = sfwf->Shape();
+ }
- for (cnt = 0, exp0.Init(geom->shape, TopAbs_SOLID); exp0.More(); exp0.Next()) cnt++;
- if (cnt == 0)
+
+
+
+ if (fixspotstripfaces)
+ {
+
+ cout << endl << "- fixing spot and strip faces" << endl;
+ Handle(ShapeFix_FixSmallFace) sffsm = new ShapeFix_FixSmallFace();
+ sffsm -> Init (shape);
+ sffsm -> SetPrecision (tolerance);
+ sffsm -> Perform();
+
+ shape = sffsm -> FixShape();
+ }
+
+ if (sewfaces)
{
- cout << "OCC: Geometry file invalid! No solids. Generating one common solid" << endl;
+ cout << endl << "- sewing faces" << endl;
+
+ TopExp_Explorer exp0;
- BRepOffsetAPI_Sewing sewedObj;
- for (exp0.Init(geom->shape, TopAbs_FACE); exp0.More(); exp0.Next())
- sewedObj.Add (TopoDS::Face(exp0.Current()));
+ BRepOffsetAPI_Sewing sewedObj(tolerance);
+
+ for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())
+ {
+ TopoDS_Face face = TopoDS::Face (exp0.Current());
+ sewedObj.Add (face);
+ }
+
sewedObj.Perform();
+
+ if (!sewedObj.SewedShape().IsNull())
+ shape = sewedObj.SewedShape();
+ else
+ cout << " not possible";
+ }
+
+ if (makesolids)
+ {
+ cout << endl << "- making solids" << endl;
+
+ TopExp_Explorer exp0;
BRepBuilderAPI_MakeSolid ms;
- for (exp0.Init(sewedObj.SewedShape(), TopAbs_SHELL); exp0.More(); exp0.Next())
- ms.Add (TopoDS::Shell(exp0.Current()));
+ int count = 0;
+ for (exp0.Init(shape, TopAbs_SHELL); exp0.More(); exp0.Next())
+ {
+ count++;
+ ms.Add (TopoDS::Shell(exp0.Current()));
+ }
+
+ if (!count)
+ {
+ cout << " not possible (no shells)" << endl;
+ }
+ else
+ {
+ BRepCheck_Analyzer ba(ms);
+ if (ba.IsValid ())
+ {
+ Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
+ sfs->Init (ms);
+ sfs->SetPrecision(tolerance);
+ sfs->SetMaxTolerance(tolerance);
+ sfs->Perform();
+ shape = sfs->Shape();
+
+ for (exp0.Init(shape, TopAbs_SOLID); exp0.More(); exp0.Next())
+ {
+ TopoDS_Solid solid = TopoDS::Solid(exp0.Current());
+ TopoDS_Solid newsolid = solid;
+ BRepLib::OrientClosedSolid (newsolid);
+ Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
+ // rebuild->Apply(shape);
+ rebuild->Replace(solid, newsolid, Standard_False);
+ TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_COMPSOLID, 1);
+ // TopoDS_Shape newshape = rebuild->Apply(shape);
+ shape = newshape;
+ }
+ }
+ else
+ cout << " not possible" << endl;
+ }
+ }
+
+ BuildFMap();
+
+ double newsurfacecont = 0;
+
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ GProp_GProps system;
+ BRepGProp::LinearProperties(fmap(i), system);
+ newsurfacecont += system.Mass();
+ }
+
+ int nnrc = 0, nnrcs = 0,
+ nnrso = somap.Extent(),
+ nnrsh = shmap.Extent(),
+ nnrf = fmap.Extent(),
+ nnrw = wmap.Extent(),
+ nnre = emap.Extent(),
+ nnrv = vmap.Extent();
+
+ for (e.Init(shape, TopAbs_COMPOUND); e.More(); e.Next()) nnrc++;
+ for (e.Init(shape, TopAbs_COMPSOLID); e.More(); e.Next()) nnrcs++;
+
+ cout << "-----------------------------------" << endl;
+ cout << "Compounds : " << nnrc << " (" << nrc << ")" << endl;
+ cout << "Composite solids: " << nnrcs << " (" << nrcs << ")" << endl;
+ cout << "Solids : " << nnrso << " (" << nrso << ")" << endl;
+ cout << "Shells : " << nnrsh << " (" << nrsh << ")" << endl;
+ cout << "Wires : " << nnrw << " (" << nrw << ")" << endl;
+ cout << "Faces : " << nnrf << " (" << nrf << ")" << endl;
+ cout << "Edges : " << nnre << " (" << nre << ")" << endl;
+ cout << "Vertices : " << nnrv << " (" << nrv << ")" << endl;
+ cout << endl;
+ cout << "Totol surface area : " << newsurfacecont << " (" << surfacecont << ")" << endl;
+ cout << endl;
+
+}
+
+
+
+
+void OCCGeometry :: BuildFMap()
+{
+ somap.Clear();
+ shmap.Clear();
+ fmap.Clear();
+ wmap.Clear();
+ emap.Clear();
+ vmap.Clear();
+
+ TopExp_Explorer exp0, exp1, exp2, exp3, exp4, exp5;
+
+ for (exp0.Init(shape, TopAbs_SOLID);
+ exp0.More(); exp0.Next())
+ {
+ TopoDS_Solid solid = TopoDS::Solid (exp0.Current());
+
+ if (somap.FindIndex(TopoDS::Solid (exp0.Current())) < 1)
+ {
+ somap.Add (TopoDS::Solid (exp0.Current()));
+
+ for (exp1.Init(exp0.Current(), TopAbs_SHELL);
+ exp1.More(); exp1.Next())
+ {
+ TopoDS_Shell shell = TopoDS::Shell (exp1.Current().Composed (exp0.Current().Orientation()));
+ if (shmap.FindIndex(shell) < 1)
+ {
+ shmap.Add (shell);
+
+ for (exp2.Init(shell, TopAbs_FACE);
+ exp2.More(); exp2.Next())
+ {
+ TopoDS_Face face = TopoDS::Face(exp2.Current().Composed(shell.Orientation()));
+ if (fmap.FindIndex(face) < 1)
+ {
+ fmap.Add (face);
+
+ for (exp3.Init(exp2.Current(), TopAbs_WIRE);
+ exp3.More(); exp3.Next())
+ {
+ TopoDS_Wire wire = TopoDS::Wire (exp3.Current().Composed(face.Orientation()));
+ if (wmap.FindIndex(wire) < 1)
+ {
+ wmap.Add (wire);
+
+ for (exp4.Init(exp3.Current(), TopAbs_EDGE);
+ exp4.More(); exp4.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp4.Current().Composed(wire.Orientation()));
+ if (emap.FindIndex(edge) < 1)
+ {
+ emap.Add (edge);
+ for (exp5.Init(exp4.Current(), TopAbs_VERTEX);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Free Shells
+ for (exp1.Init(exp0.Current(), TopAbs_SHELL, TopAbs_SOLID);
+ exp1.More(); exp1.Next())
+ {
+ TopoDS_Shape shell = exp1.Current().Composed (exp0.Current().Orientation());
+ if (shmap.FindIndex(shell) < 1)
+ {
+ shmap.Add (shell);
+
+ for (exp2.Init(shell, TopAbs_FACE);
+ exp2.More(); exp2.Next())
+ {
+ TopoDS_Face face = TopoDS::Face(exp2.Current().Composed(shell.Orientation()));
+ if (fmap.FindIndex(face) < 1)
+ {
+ fmap.Add (face);
+
+ for (exp3.Init(exp2.Current(), TopAbs_WIRE);
+ exp3.More(); exp3.Next())
+ {
+ TopoDS_Wire wire = TopoDS::Wire (exp3.Current());
+ if (wmap.FindIndex(wire) < 1)
+ {
+ wmap.Add (wire);
+
+ for (exp4.Init(exp3.Current(), TopAbs_EDGE);
+ exp4.More(); exp4.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp4.Current());
+ if (emap.FindIndex(edge) < 1)
+ {
+ emap.Add (edge);
+ for (exp5.Init(exp4.Current(), TopAbs_VERTEX);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // Free Faces
+
+ for (exp2.Init(shape, TopAbs_FACE, TopAbs_SHELL);
+ exp2.More(); exp2.Next())
+ {
+ TopoDS_Face face = TopoDS::Face(exp2.Current());
+ if (fmap.FindIndex(face) < 1)
+ {
+ fmap.Add (face);
+
+ for (exp3.Init(exp2.Current(), TopAbs_WIRE);
+ exp3.More(); exp3.Next())
+ {
+ TopoDS_Wire wire = TopoDS::Wire (exp3.Current());
+ if (wmap.FindIndex(wire) < 1)
+ {
+ wmap.Add (wire);
+
+ for (exp4.Init(exp3.Current(), TopAbs_EDGE);
+ exp4.More(); exp4.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp4.Current());
+ if (emap.FindIndex(edge) < 1)
+ {
+ emap.Add (edge);
+ for (exp5.Init(exp4.Current(), TopAbs_VERTEX);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ // Free Wires
+
+ for (exp3.Init(shape, TopAbs_WIRE, TopAbs_FACE);
+ exp3.More(); exp3.Next())
+ {
+ TopoDS_Wire wire = TopoDS::Wire (exp3.Current());
+ if (wmap.FindIndex(wire) < 1)
+ {
+ wmap.Add (wire);
+
+ for (exp4.Init(exp3.Current(), TopAbs_EDGE);
+ exp4.More(); exp4.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp4.Current());
+ if (emap.FindIndex(edge) < 1)
+ {
+ emap.Add (edge);
+ for (exp5.Init(exp4.Current(), TopAbs_VERTEX);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+ }
+ }
+ }
+ }
+
+
+ // Free Edges
+
+ for (exp4.Init(shape, TopAbs_EDGE, TopAbs_WIRE);
+ exp4.More(); exp4.Next())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(exp4.Current());
+ if (emap.FindIndex(edge) < 1)
+ {
+ emap.Add (edge);
+ for (exp5.Init(exp4.Current(), TopAbs_VERTEX);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+ }
+ }
+
+
+ // Free Vertices
+
+ for (exp5.Init(shape, TopAbs_VERTEX, TopAbs_EDGE);
+ exp5.More(); exp5.Next())
+ {
+ TopoDS_Vertex vertex = TopoDS::Vertex(exp5.Current());
+ if (vmap.FindIndex(vertex) < 1)
+ vmap.Add (vertex);
+ }
+
+
+
+
+ facemeshstatus.SetSize (fmap.Extent());
+ facemeshstatus = 0;
+
+ fvispar.SetSize (fmap.Extent());
+ evispar.SetSize (emap.Extent());
+ vvispar.SetSize (vmap.Extent());
+}
+
+
+
+void OCCGeometry :: SewFaces ()
+{
+ (*testout) << "Trying to sew faces ..." << endl;
+ cout << "Trying to sew faces ..." << flush;
+
+ BRepOffsetAPI_Sewing sewedObj(1);
+ // BRepOffsetAPI_Sewing sewedObj(healingtolerance);
+
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ TopoDS_Face face = TopoDS::Face (fmap(i));
+ sewedObj.Add (face);
+ }
+
+ sewedObj.Perform();
+
+ if (!sewedObj.SewedShape().IsNull())
+ {
+ shape = sewedObj.SewedShape();
+ cout << " done" << endl;
+ }
+ else
+ cout << " not possible";
+
+ /*
+ ShapeUpgrade_ShellSewing sewing;
+ TopoDS_Shape sh = sewing.ApplySewing (shape);
+ shape = sh;
+ */
+}
+
+
+
+
+
+void OCCGeometry :: MakeSolid ()
+{
+ TopExp_Explorer exp0;
+
+ (*testout) << "Trying to build solids ..." << endl;
+ cout << "Trying to build solids ..." << flush;
+
+ BRepBuilderAPI_MakeSolid ms;
+ int count = 0;
+ for (exp0.Init(shape, TopAbs_SHELL); exp0.More(); exp0.Next())
+ {
+ count++;
+ ms.Add (TopoDS::Shell(exp0.Current()));
+ }
+
+ if (!count)
+ {
+ cout << " not possible (no shells)" << endl;
+ return;
+ }
+
+ BRepCheck_Analyzer ba(ms);
+ if (ba.IsValid ())
+ {
+ Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape;
+ sfs->Init (ms);
+
+ sfs->SetPrecision(1e-5);
+ sfs->SetMaxTolerance(1e-5);
+
+ sfs->Perform();
- geom->shape = ms;
+ shape = sfs->Shape();
+
+ for (exp0.Init(shape, TopAbs_SOLID); exp0.More(); exp0.Next())
+ {
+ TopoDS_Solid solid = TopoDS::Solid(exp0.Current());
+ TopoDS_Solid newsolid = solid;
+ BRepLib::OrientClosedSolid (newsolid);
+ Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
+ // rebuild->Apply(shape);
+ rebuild->Replace(solid, newsolid, Standard_False);
+ // TopoDS_Shape newshape = rebuild->Apply(shape);
+
+ TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_SHAPE, 1);
+ shape = newshape;
+ }
+
+ cout << " done" << endl;
}
+ else
+ cout << " not possible" << endl;
+}
+
+
+void OCCGeometry :: BuildVisualizationMesh ()
+{
+ cout << "Preparing visualization (deflection = " << vispar.occdeflection << ") ... " << flush;
+ BRepTools::Clean (shape);
+ BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, vispar.occdeflection, true);
+ cout << "done" << endl;
+
+ Bnd_Box bb;
+ BRepBndLib::Add (shape, bb);
+
+ double x1,y1,z1,x2,y2,z2;
+ bb.Get (x1,y1,z1,x2,y2,z2);
+ Point<3> p1 = Point<3> (x1,y1,z1);
+ Point<3> p2 = Point<3> (x2,y2,z2);
+
+ (*testout) << "Bounding Box = [" << p1 << " - " << p2 << "]" << endl;
+ boundingbox = Box<3> (p1,p2);
+ SetCenter();
}
+
+ bool OCCGeometry :: FastProject (int surfi, Point<3> & ap, double& u, double& v) const
+ {
+ 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());
+
+ return true;
+ }
+
+
OCCGeometry * LoadOCC_IGES (const char * filename)
{
OCCGeometry * occgeo;
occgeo = new OCCGeometry;
IGESControl_Reader reader;
+
+#ifdef OCC52
+ Standard_Integer stat = reader.ReadFile((char*)filename);
+#else
Standard_Integer stat = reader.LoadFile((char*)filename);
- reader.TransferRoots (Standard_False); // Tranlate IGES -> OCC
+ reader.Clear();
+#endif
+
+#ifdef OCC52
+ reader.TransferRoots(); // Tranlate IGES -> OCC
+#else
+ reader.TransferRoots(Standard_False); // Tranlate IGES -> OCC
+#endif
+
occgeo->shape = reader.OneShape();
occgeo->changed = 1;
- PrintContents (occgeo);
- HealGeometry (occgeo);
occgeo->BuildFMap();
+ occgeo->BuildVisualizationMesh();
+ PrintContents (occgeo);
+
return occgeo;
}
@@ -93,12 +766,335 @@ OCCGeometry * LoadOCC_STEP (const char * filename)
reader.TransferRoots (); // Tranlate STEP -> OCC
occgeo->shape = reader.OneShape();
occgeo->changed = 1;
- PrintContents (occgeo);
- HealGeometry (occgeo);
occgeo->BuildFMap();
+ occgeo->BuildVisualizationMesh();
+ PrintContents (occgeo);
+
return occgeo;
}
+char * shapesname[] =
+ {" ", "CompSolids", "Solids", "Shells",
+ "Faces", "Wires", "Edges", "Vertices"};
+
+char * shapename[] =
+ {" ", "CompSolid", "Solid", "Shell",
+ "Face", "Wire", "Edge", "Vertex"};
+
+char * orientationstring[] =
+ {"+", "-"};
+
+void OCCGeometry :: RecursiveTopologyTree (const TopoDS_Shape & sh,
+ stringstream & str,
+ TopAbs_ShapeEnum l,
+ bool isfree,
+ const char * lname)
+{
+ if (l > TopAbs_VERTEX) return;
+
+ TopExp_Explorer e;
+ int count = 0;
+ int count2;
+
+ if (isfree)
+ e.Init(sh, l, TopAbs_ShapeEnum(l-1));
+ else
+ e.Init(sh, l);
+
+ for (; e.More(); e.Next())
+ {
+ count++;
+
+ stringstream lname2;
+ lname2 << lname << "/" << shapename[l] << count;
+ str << lname2.str() << " ";
+
+ switch (e.Current().ShapeType())
+ {
+ case TopAbs_SOLID:
+ count2 = somap.FindIndex(TopoDS::Solid(e.Current())); break;
+ case TopAbs_SHELL:
+ count2 = shmap.FindIndex(TopoDS::Shell(e.Current())); break;
+ case TopAbs_FACE:
+ count2 = fmap.FindIndex(TopoDS::Face(e.Current())); break;
+ case TopAbs_WIRE:
+ count2 = wmap.FindIndex(TopoDS::Wire(e.Current())); break;
+ case TopAbs_EDGE:
+ count2 = emap.FindIndex(TopoDS::Edge(e.Current())); break;
+ case TopAbs_VERTEX:
+ count2 = vmap.FindIndex(TopoDS::Vertex(e.Current())); break;
+ }
+
+ int nrsubshapes = 0;
+
+ if (l <= TopAbs_WIRE)
+ {
+ TopExp_Explorer e2;
+ for (e2.Init (e.Current(), TopAbs_ShapeEnum (l+1));
+ e2.More(); e2.Next())
+ nrsubshapes++;
+ }
+
+ str << "{" << shapename[l] << " " << count2;
+
+ if (l <= TopAbs_EDGE)
+ {
+ str << " (" << orientationstring[e.Current().Orientation()];
+ if (nrsubshapes != 0) str << ", " << nrsubshapes;
+ str << ") } ";
+ }
+ else
+ str << " } ";
+
+ RecursiveTopologyTree (e.Current(), str, TopAbs_ShapeEnum (l+1),
+ false, (char*)lname2.str().c_str());
+
+ }
+}
+
+void OCCGeometry :: GetTopologyTree (stringstream & str)
+{
+ cout << "Building topology tree ... " << flush;
+ RecursiveTopologyTree (shape, str, TopAbs_COMPSOLID, false, "CompSolids");
+ RecursiveTopologyTree (shape, str, TopAbs_SOLID, true, "FreeSolids");
+ RecursiveTopologyTree (shape, str, TopAbs_SHELL, true, "FreeShells");
+ RecursiveTopologyTree (shape, str, TopAbs_FACE, true, "FreeFaces");
+ RecursiveTopologyTree (shape, str, TopAbs_WIRE, true, "FreeWires");
+ RecursiveTopologyTree (shape, str, TopAbs_EDGE, true, "FreeEdges");
+ RecursiveTopologyTree (shape, str, TopAbs_VERTEX, true, "FreeVertices");
+ str << flush;
+ // cout << "done" << endl;
+}
+
+void OCCGeometry :: CheckIrregularEntities(stringstream & str)
+{
+ ShapeAnalysis_CheckSmallFace csm;
+
+ csm.SetTolerance (1e-6);
+
+ TopTools_DataMapOfShapeListOfShape mapEdges;
+ ShapeAnalysis_DataMapOfShapeListOfReal mapParam;
+ TopoDS_Compound theAllVert;
+
+ int spotfaces = 0;
+ int stripsupportfaces = 0;
+ int singlestripfaces = 0;
+ int stripfaces = 0;
+ int facessplitbyvertices = 0;
+ int stretchedpinfaces = 0;
+ int smoothpinfaces = 0;
+ int twistedfaces = 0;
+ int edgessamebutnotidentified = 0;
+
+ cout << "checking faces ... " << flush;
+
+ int i;
+ for (i = 1; i <= fmap.Extent(); i++)
+ {
+ TopoDS_Face face = TopoDS::Face (fmap(i));
+ TopoDS_Edge e1, e2;
+
+ if (csm.CheckSpotFace (face))
+ {
+ if (!spotfaces++)
+ str << "SpotFace {Spot face} ";
+
+ (*testout) << "Face " << i << " is a spot face" << endl;
+ str << "SpotFace/Face" << i << " ";
+ str << "{Face " << i << " } ";
+ }
+
+ if (csm.IsStripSupport (face))
+ {
+ if (!stripsupportfaces++)
+ str << "StripSupportFace {Strip support face} ";
+
+ (*testout) << "Face " << i << " has strip support" << endl;
+ str << "StripSupportFace/Face" << i << " ";
+ str << "{Face " << i << " } ";
+ }
+
+ if (csm.CheckSingleStrip(face, e1, e2))
+ {
+ if (!singlestripfaces++)
+ str << "SingleStripFace {Single strip face} ";
+
+ (*testout) << "Face " << i << " is a single strip (edge " << emap.FindIndex(e1)
+ << " and edge " << emap.FindIndex(e2) << " are identical)" << endl;
+ str << "SingleStripFace/Face" << i << " ";
+ str << "{Face " << i << " (edge " << emap.FindIndex(e1)
+ << " and edge " << emap.FindIndex(e2) << " are identical)} ";
+ }
+
+ if (csm.CheckStripFace(face, e1, e2))
+ {
+ if (!stripfaces++)
+ str << "StripFace {Strip face} ";
+
+ (*testout) << "Face " << i << " is a strip (edge " << emap.FindIndex(e1)
+ << " and edge " << emap.FindIndex(e2)
+ << " are identical)" << endl;
+ str << "StripFace/Face" << i << " ";
+ str << "{Face " << i << " (edge " << emap.FindIndex(e1)
+ << " and edge " << emap.FindIndex(e2) << " are identical)} ";
+ }
+
+ if (int count = csm.CheckSplittingVertices(face, mapEdges, mapParam, theAllVert))
+ {
+ if (!facessplitbyvertices++)
+ str << "FaceSplitByVertices {Face split by vertices} ";
+
+ (*testout) << "Face " << i << " is split by " << count
+ << " vertex/vertices " << endl;
+ str << "FaceSplitByVertices/Face" << i << " ";
+ str << "{Face " << i << " (split by " << count << "vertex/vertices)} ";
+ }
+
+ int whatrow, sens;
+ if (int type = csm.CheckPin (face, whatrow, sens))
+ {
+ if (type == 1)
+ {
+ if (!smoothpinfaces++)
+ str << "SmoothPinFace {Smooth pin face} ";
+
+ (*testout) << "Face " << i << " is a smooth pin" << endl;
+ str << "SmoothPinFace/Face" << i << " ";
+ str << "{Face " << i << " } ";
+ }
+ else
+ {
+ if (!stretchedpinfaces++)
+ str << "StretchedPinFace {Stretched pin face} ";
+
+ (*testout) << "Face " << i << " is a streched pin" << endl;
+ str << "StretchedPinFace/Face" << i << " ";
+ str << "{Face " << i << " } ";
+ }
+ }
+
+ double paramu, paramv;
+ if (csm.CheckTwisted (face, paramu, paramv))
+ {
+ if (!twistedfaces++)
+ str << "TwistedFace {Twisted face} ";
+
+ (*testout) << "Face " << i << " is twisted" << endl;
+ str << "TwistedFace/Face" << i << " ";
+ str << "{Face " << i << " } ";
+ }
+ }
+
+ cout << "done" << endl;
+ cout << "checking edges ... " << flush;
+
+ double dmax;
+ int cnt = 0;
+ ARRAY <double> edgeLengths;
+ ARRAY <int> order;
+ edgeLengths.SetSize (emap.Extent());
+ order.SetSize (emap.Extent());
+
+ for (i = 1; i <= emap.Extent(); i++)
+ {
+ TopoDS_Edge edge1 = TopoDS::Edge (emap(i));
+ GProp_GProps system;
+ BRepGProp::LinearProperties(edge1, system);
+ edgeLengths[i-1] = system.Mass();
+ /*
+ int j;
+ for (j = i+1; j <= emap.Extent(); j++)
+ {
+ TopoDS_Edge edge2 = TopoDS::Edge (emap(j));
+
+ if (csm.CheckStripEdges(edge1, edge2, csm.Tolerance(), dmax))
+ {
+ if (!edgessamebutnotidentified++)
+ str << "EdgesSameButNotIdentified {Edges same but not identified} ";
+
+ cnt++;
+ (*testout) << "Edge " << i << " and edge " << j
+ << " are on one strip (same but not identified)" << endl;
+ str << "EdgesSameButNotIdentified/Edge" << cnt << " ";
+ str << "{Edge " << i << " and Edge " << j << "} ";
+ }
+ }
+ */
+ }
+
+ Sort (edgeLengths, order);
+
+ str << "ShortestEdges {Shortest edges} ";
+ for (i = 1; i <= min(20, emap.Extent()); i++)
+ {
+ str << "ShortestEdges/Edge" << i;
+ str << " {Edge " << order[i-1] << " (L=" << edgeLengths[order[i-1]-1] << ")} ";
+ }
+
+ str << flush;
+
+ cout << "done" << endl;
+
+ /*
+ for (i = 1; i <= shmap.Extent(); i++)
+ {
+ TopoDS_Shell shell = TopoDS::Shell (shmap(i));
+ if (!shell.Closed())
+ cout << "Shell " << i << " is not closed" << endl;
+ if (shell.Infinite())
+ cout << "Shell " << i << " is infinite" << endl;
+
+ BRepCheck_Analyzer ba(shell);
+ if (!ba.IsValid ())
+ cout << "Shell " << i << " is not valid" << endl;
+ }
+
+ for (i = 1; i <= somap.Extent(); i++)
+ {
+ TopoDS_Solid solid = TopoDS::Solid (somap(i));
+ if (!solid.Closed())
+ cout << "Solid " << i << " is not closed" << endl;
+ if (solid.Infinite())
+ cout << "Solid " << i << " is infinite" << endl;
+
+ BRepCheck_Analyzer ba(solid);
+ if (!ba.IsValid ())
+ cout << "Solid " << i << " is not valid" << endl;
+ }
+ */
+
+
+}
+
+
+void OCCGeometry :: GetUnmeshedFaceInfo (stringstream & str)
+{
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ if (facemeshstatus[i-1] == -1)
+ str << "Face" << i << " {Face " << i << " } ";
+ }
+ str << flush;
+}
+
+void OCCGeometry :: GetNotDrawableFaces (stringstream & str)
+{
+ for (int i = 1; i <= fmap.Extent(); i++)
+ {
+ if (!fvispar[i-1].IsDrawable())
+ str << "Face" << i << " {Face " << i << " } ";
+ }
+ str << flush;
+}
+
+bool OCCGeometry :: ErrorInSurfaceMeshing ()
+{
+ for (int i = 1; i <= fmap.Extent(); i++)
+ if (facemeshstatus[i-1] == -1)
+ return true;
+
+ return false;
+}
}
diff --git a/Netgen/libsrc/occ/occgeom.hpp b/Netgen/libsrc/occ/occgeom.hpp
index 99472e71ff..5082ab3b91 100644
--- a/Netgen/libsrc/occ/occgeom.hpp
+++ b/Netgen/libsrc/occ/occgeom.hpp
@@ -35,6 +35,7 @@
#include "TopExp.hxx"
#include "gp_Pnt.hxx"
#include "TopoDS.hxx"
+#include "TopoDS_Solid.hxx"
#include "TopExp_Explorer.hxx"
#include "BRep_Tool.hxx"
#include "Geom_Curve.hxx"
@@ -51,8 +52,10 @@
#include "BRepBuilderAPI_MakeShell.hxx"
#include "BRepBuilderAPI_MakeSolid.hxx"
#include "BRepOffsetAPI_Sewing.hxx"
+#include "BRepLProp_CLProps.hxx"
#include "BRepLProp_SLProps.hxx"
#include "BRepAdaptor_Surface.hxx"
+#include "BRepAdaptor_Curve.hxx"
#include "Poly_Triangulation.hxx"
#include "Poly_Array1OfTriangle.hxx"
#include "TColgp_Array1OfPnt2d.hxx"
@@ -63,114 +66,209 @@
#include "STEPControl_Reader.hxx"
#include "TopoDS_Shape.hxx"
#include "TopoDS_Face.hxx"
-
-
+#include "IGESToBRep_Reader.hxx"
+#include "Interface_Static.hxx"
+#include "GeomAPI_ExtremaCurveCurve.hxx"
+#include "Standard_ErrorHandler.hxx"
+#include "Standard_Failure.hxx"
+#include "ShapeUpgrade_ShellSewing.hxx"
+#include "ShapeFix_Shape.hxx"
+#include "ShapeFix_Wireframe.hxx"
+#include "BRepMesh.hxx"
+#include "BRepMesh_IncrementalMesh.hxx"
+#include "BRepBndLib.hxx"
+#include "Bnd_Box.hxx"
+#include "ShapeAnalysis.hxx"
+#include "ShapeBuild_ReShape.hxx"
+#include "IGESControl_Writer.hxx"
+#include "STEPControl_Writer.hxx"
+#include "StlAPI_Writer.hxx"
+#include "STEPControl_StepModelType.hxx"
namespace netgen
{
+#include "../visualization/vispar.hpp"
+ // class VisualizationParameters;
+ // extern VisualizationParameters vispar;
+
+
#include "occmeshsurf.hpp"
+#define PROJECTION_TOLERANCE 1e-10
+
+
+#define ENTITYISVISIBLE 1
+#define ENTITYISHIGHLIGHTED 2
+#define ENTITYISDRAWABLE 4
+
+class EntityVisualizationCode
+{
+ int code;
+
+public:
+
+ EntityVisualizationCode()
+ { code = ENTITYISVISIBLE + !ENTITYISHIGHLIGHTED + ENTITYISDRAWABLE; }
+
+ int IsVisible ()
+ { return code & ENTITYISVISIBLE; }
+
+ int IsHighlighted ()
+ { return code & ENTITYISHIGHLIGHTED; }
+
+ int IsDrawable ()
+ { return code & ENTITYISDRAWABLE; }
+
+ void Show ()
+ { code |= ENTITYISVISIBLE; }
+
+ void Hide ()
+ { code &= ~ENTITYISVISIBLE; }
+
+ void Highlight ()
+ { code |= ENTITYISHIGHLIGHTED; }
+
+ void Lowlight ()
+ { code &= ~ENTITYISHIGHLIGHTED; }
+
+ void SetDrawable ()
+ { code |= ENTITYISDRAWABLE; }
+
+ void SetNotDrawable ()
+ { code &= ~ENTITYISDRAWABLE; }
+};
+
+
+
+inline double Det3 (double a00, double a01, double a02,
+ double a10, double a11, double a12,
+ double a20, double a21, double a22)
+{
+ return a00*a11*a22 + a01*a12*a20 + a10*a21*a02 - a20*a11*a02 - a10*a01*a22 - a21*a12*a00;
+}
+
+
+
+#define OCCGEOMETRYVISUALIZATIONNOCHANGE 0
+#define OCCGEOMETRYVISUALIZATIONFULLCHANGE 1
+ // == compute transformation matrices and redraw
+#define OCCGEOMETRYVISUALIZATIONHALFCHANGE 2
+ // == redraw
class OCCGeometry
{
+ Point<3> center;
+
public:
TopoDS_Shape shape;
- TopTools_IndexedMapOfShape fmap, emap, vmap;
- double maxsize;
+ TopTools_IndexedMapOfShape fmap, emap, vmap, somap, shmap, wmap;
+ Box<3> boundingbox;
+
+ int changed;
+ ARRAY<int> facemeshstatus;
+
+ ARRAY<EntityVisualizationCode> fvispar, evispar, vvispar;
- bool changed;
+ double tolerance;
+ bool fixsmalledges;
+ bool fixspotstripfaces;
+ bool sewfaces;
+ bool makesolids;
OCCGeometry()
{
+ somap.Clear();
+ shmap.Clear();
fmap.Clear();
+ wmap.Clear();
emap.Clear();
vmap.Clear();
}
- void BuildFMap()
+ void BuildFMap();
+
+ Box<3> GetBoundingBox()
+ { return boundingbox; }
+
+ int NrSolids()
+ { return somap.Extent(); }
+
+ void SetCenter()
+ { center = boundingbox.Center(); }
+
+ Point<3> Center()
+ { return center; }
+
+ void Project (int surfi, Point<3> & p) const
{
- TopExp_Explorer exp0, exp1, exp2, exp3;
- maxsize = 0;
+ static int cnt = 0;
+ if (++cnt % 1000 == 0) cout << "Project cnt = " << cnt << endl;
- /*
- for (exp3.Init(shape, TopAbs_EDGE); exp3.More(); exp3.Next())
+ gp_Pnt pnt(p(0), p(1), p(2));
+
+ GeomAPI_ProjectPointOnSurf proj(pnt, BRep_Tool::Surface(TopoDS::Face(fmap(surfi))));
+ if (proj.NbPoints() == 0)
{
- TopoDS_Edge edge = TopoDS::Edge(exp3.Current());
- (*testout) << edge.Orientation() << endl;
- if (emap.FindIndex(edge) < 1)
- emap.Add (edge);
+ cout << "Projection fails" << endl;
+ }
+ else
+ {
+ pnt = proj.NearestPoint();
+ p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
}
- */
-
-
- for (exp0.Init(shape, TopAbs_SOLID); exp0.More(); exp0.Next())
- for (exp1.Init(exp0.Current(), TopAbs_SHELL); exp1.More(); exp1.Next())
- {
- TopoDS_Shape shell = exp1.Current().Composed (exp0.Current().Orientation());
-
- for (exp2.Init(shell, TopAbs_FACE); exp2.More(); exp2.Next())
- {
- fmap.Add (exp2.Current().Composed(shell.Orientation()));
-
- for (exp3.Init(exp2.Current(), TopAbs_EDGE); exp3.More(); exp3.Next())
- {
- TopoDS_Edge edge = TopoDS::Edge(exp3.Current());
- if (emap.FindIndex(edge) < 1)
- emap.Add (edge);
- /*
- else
- {
- cout << edge.Orientation() << " = " << emap(emap.FindIndex(edge)).Orientation() << endl;
- }
- */
- }
-
- for (exp3.Init(exp2.Current(), TopAbs_VERTEX); exp3.More(); exp3.Next())
- {
- TopoDS_Vertex vertex = TopoDS::Vertex(exp3.Current());
- if (vmap.FindIndex(vertex) < 1)
- {
- vmap.Add (vertex);
-
- gp_Pnt p = BRep_Tool::Pnt(vertex);
- maxsize = max (maxsize, fabs(p.X()));
- maxsize = max (maxsize, fabs(p.Y()));
- maxsize = max (maxsize, fabs(p.Y()));
- }
- }
- }
- }
- maxsize *= 2;
}
+ bool FastProject (int surfi, Point<3> & ap, double& u, double& v) const;
- double MaxSize()
+
+ OCCSurface GetSurface (int surfi)
{
- return maxsize;
+ cout << "OCCGeometry::GetSurface using PLANESPACE" << endl;
+ return OCCSurface (TopoDS::Face(fmap(surfi)), PLANESPACE);
}
+
+ void BuildVisualizationMesh ();
+ void RecursiveTopologyTree (const TopoDS_Shape & sh,
+ stringstream & str,
+ TopAbs_ShapeEnum l,
+ bool free,
+ const char * lname);
- void Project (int surfi, Point<3> & p) const
- {
- static int cnt = 0;
- if (cnt++ % 1000 == 0) cout << "Project cnt = " << cnt << endl;
+ void GetTopologyTree (stringstream & str);
- gp_Pnt pnt(p(0), p(1), p(2));
+ void PrintNrShapes ();
- GeomAPI_ProjectPointOnSurf proj(pnt, BRep_Tool::Surface(TopoDS::Face(fmap(surfi))));
- pnt = proj.NearestPoint();
- p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
+ void CheckIrregularEntities (stringstream & str);
+
+ void SewFaces();
+
+ void MakeSolid();
+
+ void HealGeometry();
+
+ void LowLightAll()
+ {
+ for (int i = 1; i <= fmap.Extent(); i++)
+ fvispar[i-1].Lowlight();
+ for (int i = 1; i <= emap.Extent(); i++)
+ evispar[i-1].Lowlight();
+ for (int i = 1; i <= vmap.Extent(); i++)
+ vvispar[i-1].Lowlight();
}
+ void GetUnmeshedFaceInfo (stringstream & str);
+ void GetNotDrawableFaces (stringstream & str);
+ bool ErrorInSurfaceMeshing ();
};
void PrintContents (OCCGeometry * geom);
-void HealGeometry (OCCGeometry * geom);
+
OCCGeometry * LoadOCC_IGES (const char * filename);
OCCGeometry * LoadOCC_STEP (const char * filename);
diff --git a/Netgen/libsrc/occ/occmeshsurf.cpp b/Netgen/libsrc/occ/occmeshsurf.cpp
index c8be2c0770..034571c9ae 100644
--- a/Netgen/libsrc/occ/occmeshsurf.cpp
+++ b/Netgen/libsrc/occ/occmeshsurf.cpp
@@ -10,12 +10,24 @@ namespace netgen
{
#include "occmeshsurf.hpp"
+
void OCCSurface :: GetNormalVector (const Point<3> & p,
const PointGeomInfo & geominfo,
Vec<3> & n) const
{
gp_Pnt pnt;
gp_Vec du, dv;
+
+ /*
+ double gu = geominfo.u;
+ double gv = geominfo.v;
+
+ if (fabs (gu) < 1e-3) gu = 0;
+ if (fabs (gv) < 1e-3) gv = 0;
+
+ occface->D1(gu,gv,pnt,du,dv);
+ */
+
occface->D1(geominfo.u,geominfo.v,pnt,du,dv);
n = Cross (Vec<3>(du.X(), du.Y(), du.Z()),
@@ -23,6 +35,7 @@ void OCCSurface :: GetNormalVector (const Point<3> & p,
n.Normalize();
if (orient == TopAbs_REVERSED) n = -1*n;
+ // (*testout) << "GetNormalVector" << endl;
}
@@ -31,40 +44,127 @@ void OCCSurface :: DefineTangentialPlane (const Point<3> & ap1,
const Point<3> & ap2,
const PointGeomInfo & geominfo2)
{
- p1 = ap1; p2 = ap2;
+ if (projecttype == PLANESPACE)
+ {
+ p1 = ap1; p2 = ap2;
+
+ // cout << "p1 = " << p1 << endl;
+ // cout << "p2 = " << p2 << endl;
+
+ GetNormalVector (p1, geominfo1, ez);
+
+ ex = p2 - p1;
+ ex -= (ex * ez) * ez;
+ ex.Normalize();
+ ey = Cross (ez, ex);
+
+ GetNormalVector (p2, geominfo2, n2);
- GetNormalVector (p1, geominfo1, ez);
+ nmid = 0.5*(n2+ez);
+
+ ez = nmid;
+ ez.Normalize();
+
+ ex = (p2 - p1).Normalize();
+ ez -= (ez * ex) * ex;
+ ez.Normalize();
+ ey = Cross (ez, ex);
+ nmid = ez;
+ }
+ else
+ {
+ if ( (geominfo1.u < umin) ||
+ (geominfo1.u > umax) ||
+ (geominfo2.u < umin) ||
+ (geominfo2.u > umax) ||
+ (geominfo1.v < vmin) ||
+ (geominfo1.v > vmax) ||
+ (geominfo2.v < vmin) ||
+ (geominfo2.v > vmax) ) throw UVBoundsException();
+
+
+ p1 = ap1; p2 = ap2;
+ psp1 = Point<2>(geominfo1.u, geominfo1.v);
+ psp2 = Point<2>(geominfo2.u, geominfo2.v);
+
+ Vec<3> n;
+ GetNormalVector (p1, geominfo1, n);
- ex = p2 - p1;
- ex -= (ex * ez) * ez;
- ex.Normalize();
- ey = Cross (ez, ex);
+ gp_Pnt pnt;
+ gp_Vec du, dv;
+ occface->D1 (geominfo1.u, geominfo1.v, pnt, du, dv);
- /*
- double u, v;
- gp_Vec du, dv;
- gp_Pnt pnt(ap2(0), ap2(1), ap2(2));
- GeomAPI_ProjectPointOnSurf proj(pnt, occface);
- proj.LowerDistanceParameters (u, v);
- occface->D1(u, v, pnt, du, dv);
- n2 = Cross (Vec<3>(du.X(), du.Y(), du.Z()),
- Vec<3>(dv.X(), dv.Y(), dv.Z()));
- n2.Normalize();
- if (orient == TopAbs_REVERSED) n2 = -1*n2;
- */
+ DenseMatrix D1(3,2), D1T(2,3), DDTinv(2,2);
+ D1(0,0) = du.X(); D1(1,0) = du.Y(); D1(2,0) = du.Z();
+ D1(0,1) = dv.X(); D1(1,1) = dv.Y(); D1(2,1) = dv.Z();
- GetNormalVector (p2, geominfo2, n2);
-
- nmid = 0.5*(n2+ez);
+ /*
+ (*testout) << "DefineTangentialPlane" << endl
+ << "---------------------" << endl;
+ (*testout) << "D1 = " << endl << D1 << endl;
+ */
- ez = nmid;
- ez.Normalize();
+ Transpose (D1, D1T);
+ DenseMatrix D1TD1(3,3);
- ex = (p2 - p1).Normalize();
- ez -= (ez * ex) * ex;
- ez.Normalize();
- ey = Cross (ez, ex);
- nmid = ez;
+ D1TD1 = D1T*D1;
+ if (D1TD1.Det() == 0) throw SingularMatrixException();
+
+ CalcInverse (D1TD1, DDTinv);
+ DenseMatrix Y(3,2);
+ Vec<3> y1 = (ap2-ap1).Normalize();
+ Vec<3> y2 = Cross(n, y1).Normalize();
+ for (int i = 0; i < 3; i++)
+ {
+ Y(i,0) = y1(i);
+ Y(i,1) = y2(i);
+ }
+
+ DenseMatrix A(2,2);
+ A = DDTinv * D1T * Y;
+ DenseMatrix Ainv(2,2);
+
+ if (A.Det() == 0) throw SingularMatrixException();
+
+ CalcInverse (A, Ainv);
+
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 2; j++)
+ {
+ Amat(i,j) = A(i,j);
+ Amatinv(i,j) = Ainv(i,j);
+ }
+
+ Vec<2> temp = Amatinv * (psp2-psp1);
+
+
+ double r = temp.Length();
+ // double alpha = -acos (temp(0)/r);
+ double alpha = -atan2 (temp(1),temp(0));
+ DenseMatrix R(2,2);
+ R(0,0) = cos (alpha);
+ R(1,0) = -sin (alpha);
+ R(0,1) = sin (alpha);
+ R(1,1) = cos (alpha);
+
+
+ A = A*R;
+
+ if (A.Det() == 0) throw SingularMatrixException();
+
+ CalcInverse (A, Ainv);
+
+
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 2; j++)
+ {
+ Amat(i,j) = A(i,j);
+ Amatinv(i,j) = Ainv(i,j);
+ }
+
+ temp = Amatinv * (psp2-psp1);
+
+ };
}
@@ -74,42 +174,30 @@ void OCCSurface :: ToPlane (const Point<3> & p3d,
Point<2> & pplane,
double h, int & zone) const
{
- Vec<3> p1p, n;
- GetNormalVector (p3d, geominfo, n);
-
- p1p = p3d - p1;
- pplane(0) = (p1p * ex) / h;
- pplane(1) = (p1p * ey) / h;
-
- if (n * nmid < 0)
- zone = -1;
- else
- zone = 0;
-
- /*
- Vec<3> v = p3d - p1;
- Vec<3> n;
- GetNormalVector (p3d, geominfo, n);
-
- if (n * nmid < 0)
- zone = -1;
+ if (projecttype == PLANESPACE)
+ {
+ Vec<3> p1p, n;
+ GetNormalVector (p3d, geominfo, n);
+
+ p1p = p3d - p1;
+ pplane(0) = (p1p * ex) / h;
+ pplane(1) = (p1p * ey) / h;
+
+ if (n * nmid < 0)
+ zone = -1;
+ else
+ zone = 0;
+ }
else
{
- double nom = h*(n(0)*(ex(1)*ey(2)-ex(2)*ey(1)) +
- n(1)*(ex(2)*ey(0)-ex(0)*ey(2)) +
- n(2)*(ex(0)*ey(1)-ex(1)*ey(0)));
-
- pplane(0) = (n(0)*(ey(2)*v(1)-ey(1)*v(2)) +
- n(1)*(ey(0)*v(2)-ey(2)*v(0)) +
- n(2)*(ey(1)*v(0)-ey(0)*v(1)))/nom;
+ pplane = Point<2>(geominfo.u, geominfo.v);
+ // (*testout) << "(u,v) = " << geominfo.u << ", " << geominfo.v << endl;
+ pplane = Point<2> (1/h * (Amatinv * (pplane-psp1)));
+ // pplane = Point<2> (h * (Amatinv * (pplane-psp1)));
+ // pplane = Point<2> (1/h * ((pplane-psp1)));
- pplane(1) = (n(0)*(ex(1)*v(2)-ex(2)*v(1)) +
- n(1)*(ex(2)*v(0)-ex(0)*v(2)) +
- n(2)*(ex(0)*v(1)-ex(1)*v(0)))/nom;
-
zone = 0;
- }
- */
+ };
}
@@ -118,8 +206,25 @@ void OCCSurface :: FromPlane (const Point<2> & pplane,
PointGeomInfo & gi,
double h)
{
- p3d = p1 + (h * pplane(0)) * ex + (h * pplane(1)) * ey;
- Project (p3d, gi);
+ if (projecttype == PLANESPACE)
+ {
+ // cout << "2d : " << pplane << endl;
+ p3d = p1 + (h * pplane(0)) * ex + (h * pplane(1)) * ey;
+ // cout << "3d : " << p3d << endl;
+ Project (p3d, gi);
+ // cout << "proj : " << p3d << endl;
+ }
+ else
+ {
+ // Point<2> pspnew = Point<2>(1/h * (Amat * Vec<2>(pplane)) + Vec<2>(psp1));
+ Point<2> pspnew = Point<2>(h * (Amat * Vec<2>(pplane)) + Vec<2>(psp1));
+ // Point<2> pspnew = Point<2>(h * (Vec<2>(pplane)) + Vec<2>(psp1));
+ gi.u = pspnew(0);
+ gi.v = pspnew(1);
+ gi.trignum = 1;
+ gp_Pnt val = occface->Value (gi.u, gi.v);
+ p3d = Point<3> (val.X(), val.Y(), val.Z());
+ };
}
@@ -130,7 +235,28 @@ void OCCSurface :: Project (Point<3> & p, PointGeomInfo & gi)
// if (cnt++ % 1000 == 0) cout << "********************************************** OCCSurfce :: Project, cnt = " << cnt << endl;
gp_Pnt pnt(p(0), p(1), p(2));
- GeomAPI_ProjectPointOnSurf proj(pnt, occface);
+
+ // cout << "pnt = " << pnt.X() << ", " << pnt.Y() << ", " << pnt.Z() << endl;
+
+ GeomAPI_ProjectPointOnSurf proj(pnt, occface, umin, umax, vmin, vmax);
+
+ if (!proj.NbPoints())
+ {
+ cout << "Project Point on Surface FAIL" << endl;
+ throw UVBoundsException();
+ }
+
+
+ /*
+ cout << "NP = " << proj.NbPoints() << endl;
+
+ for (int i = 1; i <= proj.NbPoints(); i++)
+ {
+ gp_Pnt pnt2 = proj.Point(i);
+ Point<3> p2 = Point<3> (pnt2.X(), pnt2.Y(), pnt2.Z());
+ cout << i << ". p = " << p2 << ", dist = " << (p2-p).Length() << endl;
+ }
+ */
pnt = proj.NearestPoint();
proj.LowerDistanceParameters (gi.u, gi.v);
@@ -141,8 +267,8 @@ void OCCSurface :: Project (Point<3> & p, PointGeomInfo & gi)
Meshing2OCCSurfaces :: Meshing2OCCSurfaces (const TopoDS_Shape & asurf,
- const Box<3> & abb)
- : Meshing2(Box3d(abb.PMin(), abb.PMax())), surface(TopoDS::Face(asurf))
+ const Box<3> & abb, int aprojecttype)
+ : Meshing2(Box3d(abb.PMin(), abb.PMax())), surface(TopoDS::Face(asurf), aprojecttype)
{
;
}
@@ -154,7 +280,7 @@ void Meshing2OCCSurfaces :: DefineTransformation (Point3d & p1, Point3d & p2,
{
((OCCSurface&)surface).DefineTangentialPlane (p1, *geominfo1, p2, *geominfo2);
}
-
+
void Meshing2OCCSurfaces :: TransformToPlain (const Point3d & locpoint,
const MultiPointGeomInfo & geominfo,
Point2d & planepoint,
@@ -208,7 +334,7 @@ void MeshOptimize2dOCCSurfaces :: ProjectPoint2 (INDEX surfind, INDEX surfind2,
Point3d & p) const
{
TopExp_Explorer exp0, exp1;
- int done = 0;
+ bool done = false;
Handle(Geom_Curve) c;
for (exp0.Init(geometry.fmap(surfind), TopAbs_EDGE); !done && exp0.More(); exp0.Next())
@@ -216,7 +342,7 @@ void MeshOptimize2dOCCSurfaces :: ProjectPoint2 (INDEX surfind, INDEX surfind2,
{
if (TopoDS::Edge(exp0.Current()).IsSame(TopoDS::Edge(exp1.Current())))
{
- done = 1;
+ done = true;
double s0, s1;
c = BRep_Tool::Curve(TopoDS::Edge(exp0.Current()), s0, s1);
}
@@ -334,7 +460,66 @@ OCCRefinementSurfaces :: ~OCCRefinementSurfaces ()
{
;
}
+
+/*
+inline double Det3 (double a00, double a01, double a02,
+ double a10, double a11, double a12,
+ double a20, double a21, double a22)
+{
+ return a00*a11*a22 + a01*a12*a20 + a10*a21*a02 - a20*a11*a02 - a10*a01*a22 - a21*a12*a00;
+}
+
+bool ProjectToSurface (gp_Pnt & p, Handle(Geom_Surface) surface, double& u, double& v)
+{
+ 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);
+
+ if (count > 50) return false;
+
+ p = x;
+
+ return true;
+}
+*/
+
void OCCRefinementSurfaces ::
PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
int surfi,
@@ -347,7 +532,16 @@ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
if (surfi > 0)
{
- geometry.Project (surfi, hnewp);
+
+ double u = gi1.u+secpoint*(gi2.u-gi1.u);
+ double v = gi1.v+secpoint*(gi2.v-gi1.v);
+
+ if (!geometry.FastProject (surfi, hnewp, u, v))
+ {
+ cout << "Fast projection to surface fails! Using OCC projection" << endl;
+ geometry.Project (surfi, hnewp);
+ }
+
newgi.trignum = 1;
}
@@ -370,6 +564,7 @@ PointBetween (const Point3d & p1, const Point3d & p2, double secpoint,
pnt = proj.NearestPoint();
hnewp = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
newp = hnewp;
+ newgi = ap1;
};
@@ -379,6 +574,16 @@ void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi)
geometry.Project (surfi, p);
};
+void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi)
+{
+ if (surfi > 0)
+ if (!geometry.FastProject (surfi, p, gi.u, gi.v))
+ {
+ cout << "Fast projection to surface fails! Using OCC projection" << endl;
+ geometry.Project (surfi, p);
+ }
+};
+
}
diff --git a/Netgen/libsrc/occ/occmeshsurf.hpp b/Netgen/libsrc/occ/occmeshsurf.hpp
index aa0399ac23..bda8a05a64 100644
--- a/Netgen/libsrc/occ/occmeshsurf.hpp
+++ b/Netgen/libsrc/occ/occmeshsurf.hpp
@@ -5,14 +5,24 @@
#include "occgeom.hpp"
+#define PARAMETERSPACE -1
+#define PLANESPACE 1
+
class OCCGeometry;
+class SingularMatrixException
+{};
+
+class UVBoundsException
+{};
+
class OCCSurface
{
public:
TopoDS_Face topods_face;
Handle(Geom_Surface) occface;
TopAbs_Orientation orient;
+ int projecttype;
protected:
Point<3> p1;
@@ -38,12 +48,22 @@ protected:
Vec<2> psey;
Mat<2,2> Amat, Amatinv;
+ // UV Bounds
+ double umin, umax, vmin, vmax;
+
public:
- OCCSurface (const TopoDS_Face & aface)
+ OCCSurface (const TopoDS_Face & aface, int aprojecttype)
{
topods_face = aface;
occface = BRep_Tool::Surface(topods_face);
orient = topods_face.Orientation();
+ projecttype = aprojecttype;
+ ShapeAnalysis::GetFaceUVBounds (topods_face, umin, umax, vmin, vmax);
+ umin -= fabs(umax-umin)/100.0;
+ vmin -= fabs(vmax-vmin)/100.0;
+ umax += fabs(umax-umin)/100.0;
+ vmax += fabs(vmax-vmin)/100.0;
+ // projecttype = PLANESPACE;
/*
TopExp_Explorer exp1;
exp1.Init (topods_face, TopAbs_WIRE);
@@ -90,7 +110,11 @@ class Meshing2OCCSurfaces : public Meshing2
public:
///
- Meshing2OCCSurfaces (const TopoDS_Shape & asurf, const Box<3> & aboundingbox);
+ Meshing2OCCSurfaces (const TopoDS_Shape & asurf, const Box<3> & aboundingbox, int aprojecttype);
+
+ ///
+ int GetProjectionType ()
+ { return surface.projecttype; }
protected:
///
@@ -164,6 +188,8 @@ public:
Point3d & newp, EdgePointGeomInfo & newgi);
virtual void ProjectToSurface (Point<3> & p, int surfi);
+
+ virtual void ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi);
};
diff --git a/Netgen/libsrc/stlgeom/meshstlsurface.cpp b/Netgen/libsrc/stlgeom/meshstlsurface.cpp
index b912779237..4e50a908b4 100644
--- a/Netgen/libsrc/stlgeom/meshstlsurface.cpp
+++ b/Netgen/libsrc/stlgeom/meshstlsurface.cpp
@@ -24,9 +24,7 @@ static void STLFindEdges (STLGeometry & geom,
// mark edge points:
int ngp = geom.GetNP();
- cout << "h1(0,0,0) = " << mesh.LocalHFunction().GetH (Point3d (0,0,0)) << endl;
geom.RestrictLocalH(mesh, h);
- cout << "h2(0,0,0) = " << mesh.LocalHFunction().GetH (Point3d (0,0,0)) << endl;
PushStatusF("Mesh Lines");
@@ -324,6 +322,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
optmesh.ImproveMesh (mesh);
}
+ mesh.Compress();
mesh.FindOpenSegments();
nopen = mesh.GetNOpenSegments();
@@ -707,6 +706,8 @@ void STLSurfaceOptimization (STLGeometry & geom,
if (multithread.terminate)
break;
+ (*testout) << "optimize, before, step = " << mparam.optimize2d[j-1] << mesh.Point (3679) << endl;
+
mesh.CalcSurfacesOfNode();
switch (mparam.optimize2d[j-1])
{
@@ -731,6 +732,7 @@ void STLSurfaceOptimization (STLGeometry & geom,
break;
}
}
+ (*testout) << "optimize, after, step = " << mparam.optimize2d[j-1] << mesh.Point (3679) << endl;
}
geom.surfaceoptimized = 1;
@@ -1114,5 +1116,15 @@ void RefinementSTLGeometry :: ProjectToSurface (Point<3> & p, int surfi)
cout << "RefinementSTLGeometry :: ProjectToSurface not implemented!" << endl;
};
+
+void RefinementSTLGeometry :: ProjectToSurface (Point<3> & p, int surfi,
+ PointGeomInfo & gi)
+{
+ ((STLGeometry&)geom).SelectChartOfTriangle (gi.trignum);
+ gi.trignum = geom.Project (p);
+ // if (!gi.trignum)
+ // cout << "projectSTL failed" << endl;
+};
+
}
diff --git a/Netgen/libsrc/stlgeom/meshstlsurface.hpp b/Netgen/libsrc/stlgeom/meshstlsurface.hpp
index 99d2918fd1..f190d107a5 100644
--- a/Netgen/libsrc/stlgeom/meshstlsurface.hpp
+++ b/Netgen/libsrc/stlgeom/meshstlsurface.hpp
@@ -112,6 +112,7 @@ public:
Point3d & newp, EdgePointGeomInfo & newgi);
virtual void ProjectToSurface (Point<3> & p, int surfi);
+ virtual void ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi);
};
diff --git a/Netgen/libsrc/stlgeom/stlgeom.cpp b/Netgen/libsrc/stlgeom/stlgeom.cpp
index d28ac37ff5..2d3a358cfa 100644
--- a/Netgen/libsrc/stlgeom/stlgeom.cpp
+++ b/Netgen/libsrc/stlgeom/stlgeom.cpp
@@ -29,9 +29,8 @@ void STLMeshing (STLGeometry & geom,
geom.AddFaceEdges();
geom.LinkEdges();
- int i;
mesh.ClearFaceDescriptors();
- for (i = 1; i <= geom.GetNOFaces(); i++)
+ for (int i = 1; i <= geom.GetNOFaces(); i++)
mesh.AddFaceDescriptor (FaceDescriptor (i, 1, 0, 0));
}
diff --git a/Netgen/libsrc/stlgeom/stlgeom.hpp b/Netgen/libsrc/stlgeom/stlgeom.hpp
index 2ac1cd1e36..c9bfb1e535 100644
--- a/Netgen/libsrc/stlgeom/stlgeom.hpp
+++ b/Netgen/libsrc/stlgeom/stlgeom.hpp
@@ -54,7 +54,7 @@ namespace netgen
void Store ();
void Restore ();
- void SetSize(int size) { };
+ void SetSize(int /* size */) { };
void Clear() { };
int Size() const { return geom.GetNTE(); }
const STLTopEdge & Get(int i) const { return geom.GetTopEdge(i); }
diff --git a/Netgen/libsrc/stlgeom/stlgeomchart.cpp b/Netgen/libsrc/stlgeom/stlgeomchart.cpp
index 6e3fe8b2d3..c2f64f5f1f 100644
--- a/Netgen/libsrc/stlgeom/stlgeomchart.cpp
+++ b/Netgen/libsrc/stlgeom/stlgeomchart.cpp
@@ -17,7 +17,7 @@ int chartdebug = 0;
-void STLGeometry :: MakeAtlas(class Mesh & mesh)
+void STLGeometry :: MakeAtlas(Mesh & mesh)
{
double h, h2;
diff --git a/Netgen/libsrc/stlgeom/stlgeommesh.cpp b/Netgen/libsrc/stlgeom/stlgeommesh.cpp
index 37656495e7..00ce8fc001 100644
--- a/Netgen/libsrc/stlgeom/stlgeommesh.cpp
+++ b/Netgen/libsrc/stlgeom/stlgeommesh.cpp
@@ -14,7 +14,7 @@ namespace netgen
{
int EdgeUsed(int p1, int p2, ARRAY<INDEX_2>& edges, INDEX_2_HASHTABLE<int>& hashtab)
{
- if (p1 > p2) {Swap (p1,p2);}
+ if (p1 > p2) {swap (p1,p2);}
if (hashtab.Used(INDEX_2(p1,p2)))
{return hashtab.Get(INDEX_2(p1,p2));}
@@ -75,7 +75,7 @@ Point<3> STLGeometry :: PointBetween(const Point<3> & p1, int t1,
int ptn1 = GetTriangle(t1).PNum(i);
int ptn2 = GetTriangle(t1).PNumMod(i+1);
- if (ptn1 > ptn2) {Swap(ptn1,ptn2);}
+ if (ptn1 > ptn2) {swap(ptn1,ptn2);}
Point3d pt1 = GetPoint(ptn1);
Point3d pt2 = GetPoint(ptn2);
@@ -131,7 +131,7 @@ Point<3> STLGeometry :: PointBetween(const Point<3> & p1, int t1,
int pnt1 = GetTriangle(tn).PNum(k);
int pnt2 = GetTriangle(tn).PNumMod(k+1);
- if (pnt1 > pnt2) {Swap(pnt1,pnt2);}
+ if (pnt1 > pnt2) {swap(pnt1,pnt2);}
Point3d pt1 = GetPoint(pnt1);
Point3d pt2 = GetPoint(pnt2);
@@ -1351,8 +1351,8 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
mesh -> SetLocalH (stlgeometry->GetBoundingBox().PMin() - Vec3d(10, 10, 10),
stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10),
mparam.grading);
+ mesh -> LoadLocalMeshSize (mparam.meshsizefilename);
- int i;
success = 0;
//mesh->DeleteMesh();
@@ -1451,7 +1451,7 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
mesh -> SetLocalH (stlgeometry->GetBoundingBox().PMin() - Vec3d(10, 10, 10),
stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10),
mparam.grading);
-
+ mesh -> LoadLocalMeshSize (mparam.meshsizefilename);
mesh -> CalcLocalHFromSurfaceCurvature (stlparam.resthsurfmeshcurvfac);
mparam.optimize2d = "cmsmSm";
STLSurfaceOptimization (*stlgeometry, *mesh, mparam);
@@ -1502,6 +1502,7 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
mesh -> SetLocalH (stlgeometry->GetBoundingBox().PMin() - Vec3d(10, 10, 10),
stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10),
mparam.grading);
+ mesh -> LoadLocalMeshSize (mparam.meshsizefilename);
mesh -> CalcLocalH ();
}
@@ -1566,7 +1567,7 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
}
- OptimizeVolume (mparam, *mesh, NULL);
+ OptimizeVolume (mparam, *mesh);
#ifdef STAT_STREAM
(*statout) << GetTime() << " & " << endl;
diff --git a/Netgen/libsrc/visualization/Makefile b/Netgen/libsrc/visualization/Makefile
index f8e80916e9..a6302092d9 100644
--- a/Netgen/libsrc/visualization/Makefile
+++ b/Netgen/libsrc/visualization/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for visualization library
#
-src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vssolution.cpp meshdoc.cpp
+src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vsocc.cpp vssolution.cpp meshdoc.cpp
#
lib = vis
libpath = libsrc/visualization
diff --git a/Netgen/libsrc/visualization/mvdraw.cpp b/Netgen/libsrc/visualization/mvdraw.cpp
index c166e5aac3..265dc970b4 100644
--- a/Netgen/libsrc/visualization/mvdraw.cpp
+++ b/Netgen/libsrc/visualization/mvdraw.cpp
@@ -5,1536 +5,1331 @@
#include <geometry2d.hpp>
#include <stlgeom.hpp>
-#ifdef OCCGEOMETRY
-#include <occgeom.hpp>
-#include "TopoDS_Shape.hxx"
-#include "TopoDS_Vertex.hxx"
-#include "TopExp_Explorer.hxx"
-#include "BRep_Tool.hxx"
-#include "TopoDS.hxx"
-#include "gp_Pnt.hxx"
-#include "Geom_Curve.hxx"
-#include "Poly_Triangulation.hxx"
-#include "Poly_Array1OfTriangle.hxx"
-#include "TColgp_Array1OfPnt2d.hxx"
-#include "Poly_Triangle.hxx"
-#include "BRepMesh.hxx"
-#endif
-
-
#include "incvis.hpp"
-#ifdef STEP
-#include <stepgeom.hpp>
-#endif
namespace netgen
{
#include "mvdraw.hpp"
-Point3d VisualScene :: center;
-double VisualScene :: rad;
-double VisualScene :: backcolor;
-GLuint VisualScene :: fontbase = 0;
+ Point3d VisualScene :: center;
+ double VisualScene :: rad;
+ GLdouble VisualScene :: backcolor;
+ GLuint VisualScene :: fontbase = 0;
-// texture for color decoding
-GLubyte * VisualScene :: colortexture = NULL;
-GLuint VisualScene :: coltexname = 1;
-int VisualScene :: ntexcols = -1;
- // bool VisualScene :: linear_colors = 1;
+ // texture for color decoding
+ GLubyte * VisualScene :: colortexture = NULL;
+ GLuint VisualScene :: coltexname = 1;
+ int VisualScene :: ntexcols = -1;
-float VisualScene :: lookatmat[16];
-float VisualScene :: transmat[16];
-float VisualScene :: rotmat[16];
-float VisualScene :: centermat[16];
-float VisualScene :: transformationmat[16];
+ float VisualScene :: lookatmat[16];
+ float VisualScene :: transmat[16];
+ float VisualScene :: rotmat[16];
+ float VisualScene :: centermat[16];
+ float VisualScene :: transformationmat[16];
-VisualizationParameters :: VisualizationParameters()
-{
- lightamb = 0.3;
- lightdiff = 0.7;
- lightspec = 1;
- shininess = 50;
- transp = 0.3;
- locviewer = 0;
- showstltrias = 0;
- centerpoint = 0;
- usedispllists = 1;
- strcpy (selectvisual, "cross");
-};
-VisualizationParameters vispar;
-
-
-
-double dist = 0;
- // double dist = 6;
-// vorher: pnear = 2;
-double pnear = 0.1;
-double pfar = 10;
+ VisualizationParameters :: VisualizationParameters()
+ {
+ lightamb = 0.3;
+ lightdiff = 0.7;
+ lightspec = 1;
+ shininess = 50;
+ transp = 0.3;
+ locviewer = 0;
+ showstltrias = 0;
+ centerpoint = 0;
+ usedispllists = 1;
+ strcpy (selectvisual, "cross");
+
+ use_center_coords = false;
+ };
+ VisualizationParameters vispar;
-extern CSGeometry * geometry;
-extern STLGeometry * stlgeometry;
-extern SplineGeometry2d * geometry2d;
-#ifdef OCCGEOMETRY
-extern OCCGeometry * occgeometry;
-#endif
+ double dist = 0;
+ // double dist = 6;
+ // vorher: pnear = 2;
+ double pnear = 0.1;
+ double pfar = 10;
-#ifdef STEP
-using STEP_AP203::STEPGeometry;
-extern STEPGeometry * stepgeometry;
-#endif // STEP
-extern AutoPtr<Mesh> mesh;
-extern ARRAY<SpecialPoint> specpoints;
-//Tcl_Interp * hinterp;
+ extern STLGeometry * stlgeometry;
+ extern AutoPtr<SplineGeometry2d> geometry2d;
+ extern AutoPtr<Mesh> mesh;
+ extern ARRAY<SpecialPoint> specpoints;
-VisualScene :: VisualScene ()
-{
- changeval = -1;
- backcolor = 0;
+ VisualScene :: VisualScene ()
+ {
+ changeval = -1;
+ backcolor = 0;
+ }
-}
+ VisualScene :: ~VisualScene()
+ {
+ ;
+ }
-VisualScene :: ~VisualScene()
-{
- ;
-}
+ void Render ()
+ {
+ multithread.redraw = 1;
+ }
-void Render ()
-{
- multithread.redraw = 1;
- // while (multithread.redraw);
- // Tcl_Eval (hinterp, ".ndraw render");
-}
-void VisualScene :: BuildScene (int zoomall)
-{
- center = Point3d (0,0,0);
- rad = 1;
+ void VisualScene :: BuildScene (int zoomall)
+ {
+ center = Point3d (0,0,0);
+ rad = 1;
- CalcTransformationMatrices();
+ CalcTransformationMatrices();
- glEnable(GL_DEPTH_TEST);
- glDisable (GL_DITHER);
+ glEnable(GL_DEPTH_TEST);
+ glDisable (GL_DITHER);
- GLfloat ambvals[] = { 0.4f, 0.4f, 0.4f, 1.0f };
- GLfloat diffvals[] = { 0.5f, 0.5f, 0.5f, 1.0f };
- GLfloat specvals[] = { 0.7f, 0.7f, 0.7f, 1.0f };
- glLightfv(GL_LIGHT0, GL_AMBIENT, ambvals);
- glLightfv(GL_LIGHT0, GL_DIFFUSE, diffvals);
- glLightfv(GL_LIGHT0, GL_SPECULAR, specvals);
+ GLfloat ambvals[] = { 0.4f, 0.4f, 0.4f, 1.0f };
+ GLfloat diffvals[] = { 0.5f, 0.5f, 0.5f, 1.0f };
+ GLfloat specvals[] = { 0.7f, 0.7f, 0.7f, 1.0f };
+ glLightfv(GL_LIGHT0, GL_AMBIENT, ambvals);
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, diffvals);
+ glLightfv(GL_LIGHT0, GL_SPECULAR, specvals);
- GLfloat light_position[] = { 1, 3, 3, 0 };
- glLightfv(GL_LIGHT0, GL_POSITION, light_position);
+ GLfloat light_position[] = { 1, 3, 3, 0 };
+ glLightfv(GL_LIGHT0, GL_POSITION, light_position);
- glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, 0);
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
-}
+ glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, 0);
+ glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHT0);
+ }
-void VisualScene :: DrawScene ()
-{
- if (changeval == -1)
- BuildScene();
- changeval = 0;
+ void VisualScene :: DrawScene ()
+ {
+ if (changeval == -1)
+ BuildScene();
+ changeval = 0;
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glEnable (GL_COLOR_MATERIAL);
- glColor3f (1.0f, 1.0f, 1.0f);
- glLineWidth (1.0f);
+ glEnable (GL_COLOR_MATERIAL);
+ glColor3f (1.0f, 1.0f, 1.0f);
+ glLineWidth (1.0f);
- /*
- glPushMatrix();
- // glLoadIdentity();
- glMultMatrixf (transformationmat);
+ DrawCoordinateCross ();
+ DrawNetgenLogo ();
+ glFinish();
+ }
+
+
+ void VisualScene :: CalcTransformationMatrices()
+ {
+
+ // prepare model view matrix
- glBegin(GL_LINES);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (1.0f, 0.0f, 0.0f);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (0.0f, 1.0f, 0.0f);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (0.0f, 0.0f, 1.0f);
- glEnd ();
+ glPushMatrix();
+
+ glLoadIdentity();
+ gluLookAt (0, 0, 6, 0, 0, 0, 0, 1, 0);
+ glGetFloatv (GL_MODELVIEW_MATRIX, lookatmat);
+
+ glLoadIdentity();
+ glTranslatef(0.0f, 0.0f, -dist);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
- glPopMatrix();
- */
+ glLoadIdentity();
+ glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
- DrawCoordinateCross ();
- DrawNetgenLogo ();
- glFinish();
-}
+ glScalef (1/rad, 1/rad, 1/rad);
+ glTranslated (-center.X(), -center.Y(), -center.Z());
+ glGetFloatv (GL_MODELVIEW_MATRIX, centermat);
+ glLoadIdentity();
+ glMultMatrixf (lookatmat);
+ glMultMatrixf (transmat);
+ glMultMatrixf (rotmat);
+ glMultMatrixf (centermat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
-void VisualScene :: CalcTransformationMatrices()
-{
+ glPopMatrix();
+ }
- // prepare model view matrix
-
- glPushMatrix();
- glLoadIdentity();
- gluLookAt (0, 0, 6, 0, 0, 0, 0, 1, 0);
- glGetFloatv (GL_MODELVIEW_MATRIX, lookatmat);
+ void VisualScene :: ArbitraryRotation (const ARRAY<double> & alpha, const ARRAY<Vec3d> & vec)
+ {
+ glPushMatrix();
+
+ glLoadIdentity();
- glLoadIdentity();
- glTranslatef(0.0f, 0.0f, -dist);
- glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
+ for(int i=0; i<alpha.Size() && i<vec.Size(); i++)
+ {
+ glRotatef(alpha[i], vec[i].X(), vec[i].Y(), vec[i].Z());
+ }
+
+ glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
+
+ glLoadIdentity();
+ glMultMatrixf (lookatmat);
+ glMultMatrixf (transmat);
+ glMultMatrixf (rotmat);
+ glMultMatrixf (centermat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
- glLoadIdentity();
- glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
+ glPopMatrix();
+ }
- glScalef (1/rad, 1/rad, 1/rad);
- glTranslated (-center.X(), -center.Y(), -center.Z());
- glGetFloatv (GL_MODELVIEW_MATRIX, centermat);
- glLoadIdentity();
- glMultMatrixf (lookatmat);
- glMultMatrixf (transmat);
- glMultMatrixf (rotmat);
- glMultMatrixf (centermat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
- glPopMatrix();
-}
+ void VisualScene :: ArbitraryRotation (const double alpha, const Vec3d & vec)
+ {
+ ARRAY<double> a(1); a[0] = alpha;
+ ARRAY<Vec3d> v(1); v[0] = vec;
-void VisualScene :: StandardRotation (const char * dir)
-{
- glPushMatrix();
+ ArbitraryRotation(a,v);
+ }
+
+ void VisualScene :: StandardRotation (const char * dir)
+ {
+ glPushMatrix();
- glLoadIdentity();
+ glLoadIdentity();
- if (strcmp (dir, "xy") == 0)
- ;
- else if (strcmp (dir, "yx") == 0)
- glRotatef(180.0, 1.0f, 1.0f, 0.0f);
- else if (strcmp (dir, "xz") == 0)
- glRotatef(-90.0, 1.0f, 0.0f, 0.0f);
- else if (strcmp (dir, "zx") == 0)
- {
+ if (strcmp (dir, "xy") == 0)
+ ;
+ else if (strcmp (dir, "yx") == 0)
glRotatef(180.0, 1.0f, 1.0f, 0.0f);
+ else if (strcmp (dir, "xz") == 0)
glRotatef(-90.0, 1.0f, 0.0f, 0.0f);
- }
- else if (strcmp (dir, "yz") == 0)
- {
- glRotatef(-90.0, 0.0f, 0.0f, 1.0f);
- glRotatef(-90.0, 0.0f, 1.0f, 0.0f);
- }
- else if (strcmp (dir, "zy") == 0)
- glRotatef(90.0, 0.0f, 1.0f, 0.0f);
-
+ else if (strcmp (dir, "zx") == 0)
+ {
+ glRotatef(180.0, 1.0f, 1.0f, 0.0f);
+ glRotatef(-90.0, 1.0f, 0.0f, 0.0f);
+ }
+ else if (strcmp (dir, "yz") == 0)
+ {
+ glRotatef(-90.0, 0.0f, 0.0f, 1.0f);
+ glRotatef(-90.0, 0.0f, 1.0f, 0.0f);
+ }
+ else if (strcmp (dir, "zy") == 0)
+ glRotatef(90.0, 0.0f, 1.0f, 0.0f);
+
- glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
- glLoadIdentity();
- glMultMatrixf (lookatmat);
- glMultMatrixf (transmat);
- glMultMatrixf (rotmat);
- glMultMatrixf (centermat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
+ glLoadIdentity();
+ glMultMatrixf (lookatmat);
+ glMultMatrixf (transmat);
+ glMultMatrixf (rotmat);
+ glMultMatrixf (centermat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
- glPopMatrix();
-}
+ glPopMatrix();
+ }
-void VisualScene :: MouseMove(int oldx, int oldy,
- int newx, int newy,
- char mode)
-{
- int deltax = newx - oldx;
- int deltay = newy - oldy;
+ void VisualScene :: MouseMove(int oldx, int oldy,
+ int newx, int newy,
+ char mode)
+ {
+ int deltax = newx - oldx;
+ int deltay = newy - oldy;
- glPushMatrix();
- glLoadIdentity ();
+ glPushMatrix();
+ glLoadIdentity ();
- switch (mode)
- {
- case 'r':
- {
- glRotatef(float(deltax)/2, 0.0f, 1.0f, 0.0f);
- glRotatef(float(deltay)/2, 1.0f, 0.0f, 0.0f);
- glMultMatrixf (rotmat);
- glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
- break;
- }
- case 'm':
+ switch (mode)
{
- GLdouble projmat[16], modelviewmat[16];
- GLint viewport[4];
- glGetDoublev (GL_PROJECTION_MATRIX, projmat);
- glGetDoublev (GL_MODELVIEW_MATRIX, modelviewmat);
- glGetIntegerv (GL_VIEWPORT, viewport);
+ case 'r':
+ {
+ glRotatef(float(deltax)/2, 0.0f, 1.0f, 0.0f);
+ glRotatef(float(deltay)/2, 1.0f, 0.0f, 0.0f);
+ glMultMatrixf (rotmat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, rotmat);
+ break;
+ }
+ case 'm':
+ {
+ GLdouble projmat[16], modelviewmat[16];
+ GLint viewport[4];
+ glGetDoublev (GL_PROJECTION_MATRIX, projmat);
+ glGetDoublev (GL_MODELVIEW_MATRIX, modelviewmat);
+ glGetIntegerv (GL_VIEWPORT, viewport);
- // vorher pvz1/2 = 0
- GLdouble pvx1 = 0, pvy1 = 0, pvz1 = 0.95;
- GLdouble pvx2 = deltax, pvy2 = -deltay, pvz2 = 0.95;
+ // vorher pvz1/2 = 0
+ GLdouble pvx1 = 0, pvy1 = 0, pvz1 = 0.95;
+ GLdouble pvx2 = deltax, pvy2 = -deltay, pvz2 = 0.95;
- GLdouble px1, py1, pz1;
- GLdouble px2, py2, pz2;
+ GLdouble px1, py1, pz1;
+ GLdouble px2, py2, pz2;
- gluUnProject (pvx1, pvy1, pvz1,
- modelviewmat, projmat, viewport,
- &px1, &py1, &pz1);
- gluUnProject (pvx2, pvy2, pvz2,
- modelviewmat, projmat, viewport,
- &px2, &py2, &pz2);
- /*
- gluUnProject (oldx, oldy, 1,
- modelviewmat, projmat, viewport,
- &px1, &py1, &pz1);
- gluUnProject (newx, newy, 1,
- modelviewmat, projmat, viewport,
- &px2, &py2, &pz2);
- */
-
- /*
- cout << "pv1 = " << pvx1 << ", " << pvy1 << ", " << pvz1 << endl;
- cout << "p1 = " << px1 << ", " << py1 << ", " << pz1 << endl;
- */
-
- glTranslated (px2-px1, py2-py1, pz2-pz1);
+ gluUnProject (pvx1, pvy1, pvz1,
+ modelviewmat, projmat, viewport,
+ &px1, &py1, &pz1);
+ gluUnProject (pvx2, pvy2, pvz2,
+ modelviewmat, projmat, viewport,
+ &px2, &py2, &pz2);
+ /*
+ gluUnProject (oldx, oldy, 1,
+ modelviewmat, projmat, viewport,
+ &px1, &py1, &pz1);
+ gluUnProject (newx, newy, 1,
+ modelviewmat, projmat, viewport,
+ &px2, &py2, &pz2);
+ */
+
+ /*
+ cout << "pv1 = " << pvx1 << ", " << pvy1 << ", " << pvz1 << endl;
+ cout << "p1 = " << px1 << ", " << py1 << ", " << pz1 << endl;
+ */
+
+ glTranslated (px2-px1, py2-py1, pz2-pz1);
- glMultMatrixf (transmat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
- break;
- }
- case 'z':
- {
- // glTranslatef(0.0f, 0.0f, -dist);
- glScaled (exp (float (-deltay)/100),
- exp (float (-deltay)/100),
- exp (float (-deltay)/100));
- // glTranslatef(0.0f, 0.0f, dist);
- glMultMatrixf (transmat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
- break;
+ glMultMatrixf (transmat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
+ break;
+ }
+ case 'z':
+ {
+ // glTranslatef(0.0f, 0.0f, -dist);
+ glScaled (exp (float (-deltay)/100),
+ exp (float (-deltay)/100),
+ exp (float (-deltay)/100));
+ // glTranslatef(0.0f, 0.0f, dist);
+ glMultMatrixf (transmat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transmat);
+ break;
+ }
}
- }
- glLoadIdentity();
- glMultMatrixf (lookatmat);
- glMultMatrixf (transmat);
- glMultMatrixf (rotmat);
- glMultMatrixf (centermat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
+ glLoadIdentity();
+ glMultMatrixf (lookatmat);
+ glMultMatrixf (transmat);
+ glMultMatrixf (rotmat);
+ glMultMatrixf (centermat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
- glPopMatrix();
-}
+ glPopMatrix();
+ }
-void VisualScene :: LookAt (const Point<3> & cam, const Point<3> & obj,
- const Point<3> & camup)
-{
- glPushMatrix();
- glLoadIdentity ();
- gluLookAt (cam(0), cam(1), cam(2),
- obj(0), obj(1), obj(2),
- camup(0), camup(1), camup(2));
- glMultMatrixf (centermat);
- glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
- glPopMatrix();
-}
+ void VisualScene :: LookAt (const Point<3> & cam, const Point<3> & obj,
+ const Point<3> & camup)
+ {
+ glPushMatrix();
+ glLoadIdentity ();
+ gluLookAt (cam(0), cam(1), cam(2),
+ obj(0), obj(1), obj(2),
+ camup(0), camup(1), camup(2));
+ glMultMatrixf (centermat);
+ glGetFloatv (GL_MODELVIEW_MATRIX, transformationmat);
+ glPopMatrix();
+ }
-void VisualScene :: SetClippingPlane ()
-{
- if (vispar.clipenable)
- {
- Vec3d n = vispar.clipnormal;
- n /= (n.Length()+1e-10);
- clipplane[0] = n.X();
- clipplane[1] = n.Y();
- clipplane[2] = n.Z();
- clipplane[3] = -(Vec3d(center) * n) + rad * vispar.clipdist;
-
- glClipPlane(GL_CLIP_PLANE0, clipplane);
- glEnable(GL_CLIP_PLANE0);
- }
- else
- glDisable (GL_CLIP_PLANE0);
-}
+ void VisualScene :: SetClippingPlane ()
+ {
+ if (vispar.clipenable)
+ {
+ Vec3d n = vispar.clipnormal;
+ n /= (n.Length()+1e-10);
+ clipplane[0] = n.X();
+ clipplane[1] = n.Y();
+ clipplane[2] = n.Z();
+ clipplane[3] = -(Vec3d(center) * n) + rad * vispar.clipdist;
+
+ glClipPlane(GL_CLIP_PLANE0, clipplane);
+ glEnable(GL_CLIP_PLANE0);
+ }
+ else
+ glDisable (GL_CLIP_PLANE0);
+ }
-void VisualScene :: MouseDblClick (int px, int py)
-{
- ;
-}
+ void VisualScene :: MouseDblClick (int /* px */, int /* py */)
+ {
+ ;
+ }
-void VisualScene :: SetLight()
-{
- GLfloat vals[3];
- double lightamb = vispar.lightamb;
- vals[0] = vals[1] = vals[2] = lightamb;
- glLightfv(GL_LIGHT0, GL_AMBIENT, vals);
+ void VisualScene :: SetLight()
+ {
+ GLfloat vals[3];
+ double lightamb = vispar.lightamb;
+ vals[0] = vals[1] = vals[2] = lightamb;
+ glLightfv(GL_LIGHT0, GL_AMBIENT, vals);
- double lightdiff = vispar.lightdiff;
- vals[0] = vals[1] = vals[2] = lightdiff;
- glLightfv(GL_LIGHT0, GL_DIFFUSE, vals);
+ double lightdiff = vispar.lightdiff;
+ vals[0] = vals[1] = vals[2] = lightdiff;
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, vals);
- double lightspec = vispar.lightspec;
- vals[0] = vals[1] = vals[2] = lightspec;
- glLightfv(GL_LIGHT0, GL_SPECULAR, vals);
+ double lightspec = vispar.lightspec;
+ vals[0] = vals[1] = vals[2] = lightspec;
+ glLightfv(GL_LIGHT0, GL_SPECULAR, vals);
- glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, vispar.shininess);
- glLightModeli (GL_LIGHT_MODEL_LOCAL_VIEWER, vispar.locviewer);
+ glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, vispar.shininess);
+ glLightModeli (GL_LIGHT_MODEL_LOCAL_VIEWER, vispar.locviewer);
- float mat_spec_col[] = { 1, 1, 1, 1 };
- glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, mat_spec_col);
+ float mat_spec_col[] = { 1, 1, 1, 1 };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, mat_spec_col);
- glEnable (GL_LIGHTING);
- glEnable (GL_LIGHT0);
-}
+ glEnable (GL_LIGHTING);
+ glEnable (GL_LIGHT0);
+ }
-void VisualScene :: SetOpenGlColor(double h, double hmin, double hmax,
- int logscale)
-{
- double value;
+ void VisualScene :: SetOpenGlColor(double h, double hmin, double hmax,
+ int logscale)
+ {
+ double value;
- if (!logscale)
- value = (h - hmin) / (hmax - hmin);
- else
- {
- if (hmax <= 0) hmax = 1;
- if (hmin <= 0) hmin = 1e-4 * hmax;
- value = (log(fabs(h)) - log(hmin)) / (log(hmax) - log(hmin));
- }
+ if (!logscale)
+ value = (h - hmin) / (hmax - hmin);
+ else
+ {
+ if (hmax <= 0) hmax = 1;
+ if (hmin <= 0) hmin = 1e-4 * hmax;
+ value = (log(fabs(h)) - log(hmin)) / (log(hmax) - log(hmin));
+ }
- if (!invcolor)
- value = 1 - value;
+ if (!invcolor)
+ value = 1 - value;
- glTexCoord1f ( 0.999 * value + 0.001);
+ glTexCoord1f ( 0.999 * value + 0.001);
+ // glTexCoord1f ( value );
- if (value > 1) value = 1;
- if (value < 0) value = 0;
+ if (value > 1) value = 1;
+ if (value < 0) value = 0;
- value *= 4;
+ value *= 4;
- const double colp[][3] =
- {
- { 1, 0, 0 },
- { 1, 1, 0 },
- { 0, 1, 0 },
- { 0, 1, 1 },
- { 0, 0, 1 },
- { 1, 0, 1 },
- { 1, 0, 0 },
- };
+ static const double colp[][3] =
+ {
+ { 1, 0, 0 },
+ { 1, 1, 0 },
+ { 0, 1, 0 },
+ { 0, 1, 1 },
+ { 0, 0, 1 },
+ // { 1, 0, 1 },
+ // { 1, 0, 0 },
+ };
- int i = int(value);
- double r = value - i;
+ int i = int(value);
+ double r = value - i;
- GLdouble col[3];
- int j;
- for (j = 0; j < 3; j++)
- col[j] = (1-r) * colp[i][j] + r * colp[i+1][j];
+ GLdouble col[3];
+ for (int j = 0; j < 3; j++)
+ col[j] = (1-r) * colp[i][j] + r * colp[i+1][j];
- glColor3d (col[0], col[1], col[2]);
-}
-
-
-void VisualScene :: CreateTexture (int ncols, int linear)
-{
- int i;
+ glColor3d (col[0], col[1], col[2]);
+ }
- if (ncols < 2) ncols = 2;
- ncols = 8;
- if (ntexcols != ncols)
- {
- if (colortexture)
- {
- glDeleteTextures (1, &coltexname);
- delete colortexture;
- }
-
- ntexcols = ncols;
-
- colortexture = new GLubyte[4*ncols+4];
+ /*
+ void VisualScene :: CreateTexture (int ncols, int linear, int typ)
+ {
- const double colp[][3] =
+ static const double colp[][3] =
{
{ 1, 0, 0 },
{ 1, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 1 },
{ 0, 0, 1 },
- { 1, 0, 1 },
- { 1, 0, 0 },
};
- for (i = 0; i < ncols; i++)
- {
- double value = 4.0 * i / (ncols-1);
-
- int iv = int(value);
- double r = value - iv;
- GLdouble col[3];
- int j;
- for (j = 0; j < 3; j++)
- col[j] = (1-r) * colp[iv][j] + r * colp[iv+1][j];
-
- glColor3d (col[0], col[1], col[2]);
- colortexture[4*i] = GLubyte (255 * col[0]);
- colortexture[4*i+1] = GLubyte (255 * col[1]);
- colortexture[4*i+2] = GLubyte (255 * col[2]);
- colortexture[4*i+3] = GLubyte(255);
- }
+ if (ntexcols != 1024)
+ {
+ ntexcols = 1024;
+
+ // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ glGenTextures (1, &coltexname);
+ glBindTexture (GL_TEXTURE_1D, coltexname);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+
+ for (int level = 0; level <= 11; level++)
+ {
+ ncols = 2048 >> level;
+ cout << "ncols = " << ncols << endl;
- // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ colortexture = new GLubyte[4*ncols+12];
-
- glGenTextures (1, &coltexname);
+ for (int i = 0; i < ncols; i++)
+ {
+ double value = 4.0 * i / (ncols-1);
+
+ int iv = int(value);
+ double r = value - iv;
+
+ GLdouble col[3];
+ for (int j = 0; j < 3; j++)
+ col[j] = (1-r) * colp[iv][j] + r * colp[iv+1][j];
+
+ colortexture[4*i] = GLubyte (255 * col[0]);
+ colortexture[4*i+1] = GLubyte (255 * col[1]);
+ colortexture[4*i+2] = GLubyte (255 * col[2]);
+ colortexture[4*i+3] = GLubyte(255);
+
+ if (ncols > 20)
+ if ( i % (ncols / 10) == 0)
+ {
+ colortexture[4*i] = GLubyte (0);
+ colortexture[4*i+1] = GLubyte (0);
+ colortexture[4*i+2] = GLubyte (0);
+ colortexture[4*i+4] = GLubyte (0);
+ colortexture[4*i+5] = GLubyte (0);
+ colortexture[4*i+6] = GLubyte (0);
+ }
+ }
+
+ glTexImage1D (GL_TEXTURE_1D, level, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture);
+ }
+ }
+
+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, typ); // DECAL or MODULATE
+ glBindTexture (GL_TEXTURE_1D, coltexname);
+ }
+ */
- glBindTexture (GL_TEXTURE_1D, coltexname);
+ void VisualScene :: CreateTexture (int ncols, int linear, int typ)
+ {
+ if (ncols < 2) ncols = 2;
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP);
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ if (linear) ncols = 32;
+ else ncols = 8;
- glTexImage1D (GL_TEXTURE_1D, 0, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture);
- glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-
- }
+ if (ntexcols != ncols)
+ {
+ if (colortexture)
+ {
+ glDeleteTextures (1, &coltexname);
+ delete colortexture;
+ }
+
+ ntexcols = ncols;
+
+ colortexture = new GLubyte[4*ncols+12];
+ const double colp[][3] =
+ {
+ { 1, 0, 0 },
+ { 1, 1, 0 },
+ { 0, 1, 0 },
+ { 0, 1, 1 },
+ { 0, 0, 1 },
+ };
+
+ for (int i = 0; i < ncols; i++)
+ {
+ double value = 4.0 * i / (ncols-1);
- glBindTexture (GL_TEXTURE_1D, coltexname);
- if (linear)
- {
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- }
- else
- {
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- }
-}
+ int iv = int(value);
+ double r = value - iv;
+ GLdouble col[3];
+ for (int j = 0; j < 3; j++)
+ col[j] = (1-r) * colp[iv][j] + r * colp[iv+1][j];
+
+ colortexture[4*i] = GLubyte (255 * col[0]);
+ colortexture[4*i+1] = GLubyte (255 * col[1]);
+ colortexture[4*i+2] = GLubyte (255 * col[2]);
+ colortexture[4*i+3] = GLubyte(255);
+ }
+ // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+ glGenTextures (1, &coltexname);
+ glBindTexture (GL_TEXTURE_1D, coltexname);
-void VisualScene :: DrawColorBar (double minval, double maxval,
- int logscale)
-{
- int i;
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- if (!vispar.drawcolorbar) return;
+ glTexImage1D (GL_TEXTURE_1D, 0, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture);
+ }
- CreateTexture (8, 1);
+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, typ); // DECAL or MODULATE
- if (logscale && maxval <= 0) maxval = 1;
- if (logscale && minval <= 0) minval = 1e-4 * maxval;
+ glBindTexture (GL_TEXTURE_1D, coltexname);
+ if (linear)
+ {
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ }
+ else
+ {
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ }
+ }
- double minx = -1;
- double maxx = 1;
- double miny = 0.75;
- double maxy = 0.8;
-
- double x;
- glEnable (GL_COLOR_MATERIAL);
- glEnable (GL_TEXTURE_1D);
- glNormal3d (0, 0, 1);
- glBegin (GL_LINES);
- for (x = minx; x <= maxx; x += (maxx - minx) / 1000)
- {
- SetOpenGlColor (x, minx, maxx);
- glVertex3d (x, miny,-5);
- glVertex3d (x, maxy,-5);
- }
- glEnd();
- glDisable (GL_TEXTURE_1D);
+ /*
+ void VisualScene :: CreateTexture (int ncols, int linear, int typ)
+ {
+ if (ncols < 2) ncols = 2;
- glEnable (GL_COLOR_MATERIAL);
- GLfloat textcol[3] = { 1 - backcolor,
- 1 - backcolor,
- 1 - backcolor };
- glColor3fv (textcol);
- glPushAttrib (GL_LIST_BIT);
- glListBase (fontbase);
+ if (linear) ncols = 32;
+ else ncols = 8;
- char buf[20];
- for (i = 0; i <= 4; i++)
- {
- x = minx + i * (maxx-minx) / 4;
- glRasterPos3d (x, 0.7,-5);
+ if (ntexcols != ncols)
+ {
+ if (colortexture)
+ {
+ glDeleteTextures (1, &coltexname);
+ delete colortexture;
+ }
- double val;
- if (logscale)
- val = minval * pow (maxval / minval, i / 4.0);
- else
- val = minval + i * (maxval-minval) / 4;
-
- sprintf (buf, "%8.3e", val);
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- }
-
- glPopAttrib ();
-}
-
-
-void VisualScene :: DrawCoordinateCross ()
-{
- if (!vispar.drawcoordinatecross) return;
-
- glMatrixMode (GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
-
- glMatrixMode (GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-
- GLint viewport[4];
- glGetIntegerv (GL_VIEWPORT, viewport);
-
- glTranslatef (-1, -1, 0.0);
- glScalef (40.0 / viewport[2], 40.0 / viewport[3], 1);
- glTranslatef (2.0, 2.0, 0.0);
- glMultMatrixf (rotmat);
-
- glEnable (GL_COLOR_MATERIAL);
- glDisable (GL_LIGHTING);
-
- GLfloat textcol[3] = { 1 - backcolor,
- 1 - backcolor,
- 1 - backcolor };
- glColor3fv (textcol);
-
- glLineWidth (1.0f);
-
- float len = 1;
- glBegin(GL_LINES);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (len, 0.0f, 0.0f);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (0.0f, len, 0.0f);
- glVertex3f (0.0f, 0.0f, 0.0f);
- glVertex3f (0.0f, 0.0f, len);
- glEnd ();
-
-
- glPushAttrib (GL_LIST_BIT);
- glListBase (fontbase);
-
- char buf[20];
-
- glRasterPos3d (len, 0.0f, 0.0f);
- sprintf (buf, "x");
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- glRasterPos3d (0.0f, len, 0.0f);
- sprintf (buf, "y");
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- glRasterPos3d (0.0f, 0.0f, len);
- sprintf (buf, "z");
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
-
- glPopAttrib ();
- glEnable (GL_LIGHTING);
-
- glMatrixMode (GL_PROJECTION);
- glPopMatrix();
- glMatrixMode (GL_MODELVIEW);
- glPopMatrix();
-}
-
-
-void VisualScene :: DrawNetgenLogo ()
-{
- if (!vispar.drawnetgenlogo) return;
-
- glMatrixMode (GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
-
- glMatrixMode (GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-
- GLint viewport[4];
- glGetIntegerv (GL_VIEWPORT, viewport);
-
+ ntexcols = ncols;
+
+ colortexture = new GLubyte[4*ncols+12];
+ const double colp[][3] =
+ {
+ { 1, 0, 0 },
+ { 1, 1, 0 },
+ { 0, 1, 0 },
+ { 0, 1, 1 },
+ { 0, 0, 1 },
+ };
+
+ for (int i = 0; i < ncols; i++)
+ {
+ double value = 4.0 * i / (ncols-1);
- glTranslatef (1, -1, 0.0);
- glScalef (40.0 / viewport[2], 40.0 / viewport[3], 1);
- glTranslatef (-6.0, 2.0, 0.0);
- // glMultMatrixf (rotmat);
+ int iv = int(value);
+ double r = value - iv;
- glEnable (GL_COLOR_MATERIAL);
- GLfloat textcol[3] = { 1 - backcolor,
- 1 - backcolor,
- 1 - backcolor };
- glColor3fv (textcol);
+ GLdouble col[3];
+ for (int j = 0; j < 3; j++)
+ col[j] = (1-r) * colp[iv][j] + r * colp[iv+1][j];
+
+ colortexture[4*i+4] = GLubyte (255 * col[0]);
+ colortexture[4*i+5] = GLubyte (255 * col[1]);
+ colortexture[4*i+6] = GLubyte (255 * col[2]);
+ colortexture[4*i+7] = GLubyte(255);
+ }
+ for (int j = 0; j < 4; j++)
+ {
+ colortexture[j] = colortexture[4+j];
+ colortexture[ncols*4+4+j] = colortexture[ncols*4+j];
+ }
- glLineWidth (1.0f);
+ // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
- glPushAttrib (GL_LIST_BIT);
- glListBase (fontbase);
+ glGenTextures (1, &coltexname);
+ glBindTexture (GL_TEXTURE_1D, coltexname);
- char buf[20];
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glRasterPos3d (0.0f, 0.0f, 0.0f);
- sprintf (buf, "Netgen 4.3.1");
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- glPopAttrib ();
+ glTexImage1D (GL_TEXTURE_1D, 0, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture+4);
+ int bcol[] = { 0, 0, -1, -1 };
+ glTexParameteriv (GL_TEXTURE_1D, GL_TEXTURE_BORDER_COLOR, bcol);
+ }
- glMatrixMode (GL_PROJECTION);
- glPopMatrix();
- glMatrixMode (GL_MODELVIEW);
- glPopMatrix();
-}
+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, typ); // DECAL or MODULATE
+ glBindTexture (GL_TEXTURE_1D, coltexname);
+ if (linear)
+ {
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ }
+ else
+ {
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri (GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ }
+ }
+ */
+ void VisualScene :: DrawColorBar (double minval, double maxval, int logscale, bool linear)
+ {
+ if (!vispar.drawcolorbar) return;
+ CreateTexture (8, linear, GL_DECAL);
-VisualSceneGeometry2d :: VisualSceneGeometry2d ()
- : VisualScene()
-{
- ;
-}
+ if (logscale && maxval <= 0) maxval = 1;
+ if (logscale && minval <= 0) minval = 1e-4 * maxval;
-VisualSceneGeometry2d :: ~VisualSceneGeometry2d ()
-{
- ;
-}
+ double minx = -1;
+ double maxx = 1;
+ double miny = 0.75;
+ double maxy = 0.8;
+ glEnable (GL_COLOR_MATERIAL);
+ glEnable (GL_TEXTURE_1D);
+ glNormal3d (0, 0, 1);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+ glDisable (GL_DEPTH_TEST);
+ glBegin (GL_QUAD_STRIP);
+ for (double x = minx; x <= maxx; x += (maxx - minx) / 50)
+ {
+ SetOpenGlColor (x, minx, maxx);
+ // glTexCoord1f ( 0.999 * (x-minx) / (maxx-minx) + 0.001);
+ glVertex3d (x, miny, -5);
+ glVertex3d (x, maxy, -5);
+ }
+ glEnd();
+ glDisable (GL_TEXTURE_1D);
-void VisualSceneGeometry2d :: DrawScene ()
-{
- int i, j;
+ glEnable (GL_COLOR_MATERIAL);
+ GLfloat textcol[3] = { 1 - backcolor, 1 - backcolor, 1 - backcolor };
+ glColor3fv (textcol);
- if (changeval != geometry2d->GetSplines().Size())
- BuildScene();
- changeval = geometry2d->GetSplines().Size();
+ glPushAttrib (GL_LIST_BIT);
+ glListBase (fontbase);
-
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ char buf[20];
+ for (int i = 0; i <= 4; i++)
+ {
+ double x = minx + i * (maxx-minx) / 4;
+ glRasterPos3d (x, 0.7,-5);
+
+ double val;
+ if (logscale)
+ val = minval * pow (maxval / minval, i / 4.0);
+ else
+ val = minval + i * (maxval-minval) / 4;
+
+ sprintf (buf, "%8.3e", val);
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
+ }
- SetLight();
+ glPopAttrib ();
+ glEnable (GL_DEPTH_TEST);
+ }
- // glEnable (GL_LIGHT0);
- glDisable (GL_LIGHTING);
- glPushMatrix();
- glMultMatrixf (transformationmat);
- // SetClippingPlane ();
+ void VisualScene :: DrawCoordinateCross ()
+ {
+ if (!vispar.drawcoordinatecross) return;
- glShadeModel (GL_SMOOTH);
- glEnable (GL_COLOR_MATERIAL);
- glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-
- // float mat_col[] = { 0, 0, 1, 1 };
- // glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
- glColor3f (0, 0, 1);
-
+ glDisable (GL_DEPTH_TEST);
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
- ARRAY<Point<2> > points, otherpoints;
+ glMatrixMode (GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
- for (i = 1; i <= geometry2d->GetSplines().Size(); i++)
- {
- geometry2d->GetSplines().Get(i)->GetPoints (20, points);
-
- glBegin (GL_LINE_STRIP);
- for (j = 0; j < points.Size(); j++)
- glVertex3f (points[j](0), points[j](1), 0);
- glEnd();
- }
+ GLint viewport[4];
+ glGetIntegerv (GL_VIEWPORT, viewport);
- glColor3f (1, 0, 0);
+ glTranslatef (-1, -1, 0.0);
+ glScalef (40.0 / viewport[2], 40.0 / viewport[3], 1);
+ glTranslatef (2.0, 2.0, 0.0);
+ glMultMatrixf (rotmat);
- for (i = 1; i <= geometry2d->GetSplines().Size(); i++)
- {
- int other = geometry2d->GetSplines().Get(i)->copyfrom;
- if (other != -1)
- {
- geometry2d->GetSplines().Get(i)->GetPoints (6, points);
- geometry2d->GetSplines().Get(other)->GetPoints (6, otherpoints);
- glBegin (GL_LINES);
- for (j = 1; j < 5; j++)
- {
- glVertex3f (points[j](0), points[j](1), 0);
- glVertex3f (otherpoints[j](0), otherpoints[j](1), 0);
- }
- glEnd ();
- }
- }
+ glEnable (GL_COLOR_MATERIAL);
+ glDisable (GL_LIGHTING);
+ GLfloat textcol[3] = { 1 - backcolor,
+ 1 - backcolor,
+ 1 - backcolor };
+ glColor3fv (textcol);
+ glLineWidth (1.0f);
- glPopMatrix();
-
- DrawCoordinateCross ();
- DrawNetgenLogo ();
+ float len = 1;
+ glBegin(GL_LINES);
+ glVertex3f (0.0f, 0.0f, 0.0f);
+ glVertex3f (len, 0.0f, 0.0f);
+ glVertex3f (0.0f, 0.0f, 0.0f);
+ glVertex3f (0.0f, len, 0.0f);
+ glVertex3f (0.0f, 0.0f, 0.0f);
+ glVertex3f (0.0f, 0.0f, len);
+ glEnd ();
- glFinish();
-}
+ glPushAttrib (GL_LIST_BIT);
+ glListBase (fontbase);
-void VisualSceneGeometry2d :: BuildScene (int zoomall)
-{
- Box<2> bbox;
+ char buf[20];
- geometry2d->GetBoundingBox (bbox);
-
- Point<2> c = Center (bbox.PMin(), bbox.PMax());
+ glRasterPos3d (len, 0.0f, 0.0f);
+ sprintf (buf, "x");
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
+ glRasterPos3d (0.0f, len, 0.0f);
+ sprintf (buf, "y");
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
+ glRasterPos3d (0.0f, 0.0f, len);
+ sprintf (buf, "z");
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- center = Point3d (c(0), c(1), 0);
- rad = Dist (bbox.PMin(), bbox.PMax()) / 2;
-
- CalcTransformationMatrices();
-}
+ glPopAttrib ();
+ glEnable (GL_LIGHTING);
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix();
+ glMatrixMode (GL_MODELVIEW);
+ glPopMatrix();
+ glEnable (GL_DEPTH_TEST);
+ }
+ void VisualScene :: DrawNetgenLogo ()
+ {
+ if (!vispar.drawnetgenlogo) return;
+ glDisable (GL_DEPTH_TEST);
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glMatrixMode (GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+ GLint viewport[4];
+ glGetIntegerv (GL_VIEWPORT, viewport);
+ glTranslatef (1, -1, 0.0);
+ glScalef (40.0 / viewport[2], 40.0 / viewport[3], 1);
+ glTranslatef (-6.0, 2.0, 0.0);
-/* *********************** Draw STL Geometry **************** */
+ glDisable (GL_CLIP_PLANE0);
+ // glDisable (GL_LIGHTING);
+ glEnable (GL_COLOR_MATERIAL);
+ GLfloat textcol[3] = { 1 - backcolor,
+ 1 - backcolor,
+ 1 - backcolor };
+ glColor3fv (textcol);
-VisualSceneSTLGeometry :: VisualSceneSTLGeometry ()
- : VisualScene()
-{
- ;
-}
+ glLineWidth (1.0f);
-VisualSceneSTLGeometry :: ~VisualSceneSTLGeometry ()
-{
- ;
-}
+ glPushAttrib (GL_LIST_BIT);
+ glListBase (fontbase);
-void VisualSceneSTLGeometry :: DrawScene ()
-{
- int i, j, k;
+ char buf[20];
- if (changeval != stlgeometry->GetNT())
- BuildScene();
+ glRasterPos3d (0.0f, 0.0f, 0.0f);
+ sprintf (buf, "Netgen 4.4");
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- changeval = stlgeometry->GetNT();
+ glPopAttrib ();
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix();
+ glMatrixMode (GL_MODELVIEW);
+ glPopMatrix();
+ glEnable (GL_DEPTH_TEST);
+ }
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- SetLight();
- glPushMatrix();
- glMultMatrixf (transformationmat);
+ /* *********************** Draw 2D Geometry **************** */
+ VisualSceneGeometry2d :: VisualSceneGeometry2d ()
+ : VisualScene()
+ {
+ ;
+ }
- glShadeModel (GL_SMOOTH);
- glDisable (GL_COLOR_MATERIAL);
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+ VisualSceneGeometry2d :: ~VisualSceneGeometry2d ()
+ {
+ ;
+ }
- glEnable (GL_BLEND);
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- double shine = vispar.shininess;
- double transp = vispar.transp;
+ void VisualSceneGeometry2d :: DrawScene ()
+ {
+ if (changeval != geometry2d->GetSplines().Size())
+ BuildScene();
+ changeval = geometry2d->GetSplines().Size();
- glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
- glLogicOp (GL_COPY);
+
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ SetLight();
- float mat_col[] = { 0.2, 0.2, 0.8, 1 };
- glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+ // glEnable (GL_LIGHT0);
+ glDisable (GL_LIGHTING);
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
- glPolygonOffset (1, 1);
- glEnable (GL_POLYGON_OFFSET_FILL);
+ // SetClippingPlane ();
- glCallList (trilists.Get(1));
+ glShadeModel (GL_SMOOTH);
+ glEnable (GL_COLOR_MATERIAL);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
+
+ // float mat_col[] = { 0, 0, 1, 1 };
+ // glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+ glColor3f (0, 0, 1);
+
- glDisable (GL_POLYGON_OFFSET_FILL);
+ ARRAY<Point<2> > points, otherpoints;
+ for (int i = 1; i <= geometry2d->GetSplines().Size(); i++)
+ {
+ geometry2d->GetSplines().Get(i)->GetPoints (20, points);
+
+ glBegin (GL_LINE_STRIP);
+ for (int j = 0; j < points.Size(); j++)
+ glVertex3f (points[j](0), points[j](1), 0);
+ glEnd();
+ }
- int showtrias = vispar.showstltrias;
+ glColor3f (1, 0, 0);
- if (showtrias)
- {
- float mat_coll[] = { 0.2, 0.2, 0.2, 1 };
- glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_coll);
- glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-
- glCallList (trilists.Get(1));
- }
+ for (int i = 1; i <= geometry2d->GetSplines().Size(); i++)
+ {
+ int other = geometry2d->GetSplines().Get(i)->copyfrom;
+ if (other != -1)
+ {
+ geometry2d->GetSplines().Get(i)->GetPoints (6, points);
+ geometry2d->GetSplines().Get(other)->GetPoints (6, otherpoints);
+ glBegin (GL_LINES);
+ for (int j = 1; j < 5; j++)
+ {
+ glVertex3f (points[j](0), points[j](1), 0);
+ glVertex3f (otherpoints[j](0), otherpoints[j](1), 0);
+ }
+ glEnd ();
+ }
+ }
- /*
- glBegin (GL_TRIANGLES);
- for (j = 1; j <= stlgeometry -> GetNT(); j++)
- {
- const STLTriangle & tria = stlgeometry -> GetTriangle(j);
- glNormal3f (tria.normal.X(),
- tria.normal.Y(),
- tria.normal.Z());
-
- for (k = 0; k < 3; k++)
- {
- glVertex3f (tria.pts[k].X(),
- tria.pts[k].Y(),
- tria.pts[k].Z());
- }
- }
- glEnd ();
- */
+ glPopMatrix();
+
+ DrawCoordinateCross ();
+ DrawNetgenLogo ();
+ glFinish();
+ }
-
- glPopMatrix();
- glFinish();
-}
+ void VisualSceneGeometry2d :: BuildScene (int zoomall)
+ {
+ Box<2> bbox;
-void VisualSceneSTLGeometry :: BuildScene (int zoomall)
-{
- int i, j, k;
+ geometry2d->GetBoundingBox (bbox);
- // cout << "rebuild stl geometry scene" << endl;
+ Point<2> c = Center (bbox.PMin(), bbox.PMax());
- center = stlgeometry -> GetBoundingBox().Center();
- rad = stlgeometry -> GetBoundingBox().Diam() / 2;
+ center = Point3d (c(0), c(1), 0);
+ rad = Dist (bbox.PMin(), bbox.PMax()) / 2;
+ CalcTransformationMatrices();
+ }
- CalcTransformationMatrices();
- for (i = 1; i <= trilists.Size(); i++)
- glDeleteLists (trilists.Elem(i), 1);
- trilists.SetSize(0);
- trilists.Append (glGenLists (1));
- glNewList (trilists.Last(), GL_COMPILE);
- glEnable (GL_NORMALIZE);
- glBegin (GL_TRIANGLES);
- for (j = 1; j <= stlgeometry -> GetNT(); j++)
- {
- const Vec3d & n = stlgeometry->GetTriangle(j).Normal();
- glNormal3f (n.X(), n.Y(), n.Z());
-
- for (k = 1; k <= 3; k++)
- {
- const Point3d & p =
- stlgeometry->GetPoint (stlgeometry -> GetTriangle(j).PNum(k));
- glVertex3f (p.X(),p.Y(), p.Z());
-
- // int pi = ta.GetTriangle(j).PNum(k);
- // glNormal3f (ta.GetNormal (pi).X(),
- // ta.GetNormal (pi).Y(),
- // ta.GetNormal (pi).Z());
- // glVertex3f (ta.GetPoint(pi).X(),
- // ta.GetPoint(pi).Y(),
- // ta.GetPoint(pi).Z());
- }
- }
- glEnd ();
-
- glEndList ();
-}
-#ifdef OCCGEOMETRY
-/* *********************** Draw OCC Geometry **************** */
+ /* *********************** Draw STL Geometry **************** */
-VisualSceneOCCGeometry :: VisualSceneOCCGeometry ()
- : VisualScene()
-{
- trilists.SetSize(0);
- linelists.SetSize(1);
-}
+ VisualSceneSTLGeometry :: VisualSceneSTLGeometry ()
+ : VisualScene()
+ {
+ ;
+ }
-VisualSceneOCCGeometry :: ~VisualSceneOCCGeometry ()
-{
- ;
-}
+ VisualSceneSTLGeometry :: ~VisualSceneSTLGeometry ()
+ {
+ ;
+ }
-void VisualSceneOCCGeometry :: DrawScene ()
-{
- int i, j, k;
+ void VisualSceneSTLGeometry :: DrawScene ()
+ {
+ if (changeval != stlgeometry->GetNT())
+ BuildScene();
+ changeval = stlgeometry->GetNT();
- if ( occgeometry->changed )
- {
- BuildScene();
- occgeometry -> changed = 0;
- }
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- SetLight();
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- // glEnable (GL_COLOR_MATERIAL);
+ SetLight();
- // glDisable (GL_SHADING);
- // glColor3f (0.0f, 1.0f, 1.0f);
- // glLineWidth (1.0f);
- // glShadeModel (GL_SMOOTH);
- // glCallList (linelists.Get(1));
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
- // SetLight();
- glPushMatrix();
- glMultMatrixf (transformationmat);
- glShadeModel (GL_SMOOTH);
- glDisable (GL_COLOR_MATERIAL);
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- glEnable (GL_BLEND);
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glShadeModel (GL_SMOOTH);
+ glDisable (GL_COLOR_MATERIAL);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- // glEnable (GL_LIGHTING);
+ glEnable (GL_BLEND);
+ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- double shine = vispar.shininess;
- double transp = vispar.transp;
- glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
- glLogicOp (GL_COPY);
+ double shine = vispar.shininess;
+ // double transp = vispar.transp;
+ glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
+ glLogicOp (GL_COPY);
- float mat_col[] = { 0.2, 0.2, 0.8, 1 };
- glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
- glPolygonOffset (1, 1);
- glEnable (GL_POLYGON_OFFSET_FILL);
+ float mat_col[] = { 0.2f, 0.2f, 0.8f, 1.0f};
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
- glCallList (linelists.Get(1));
+ glPolygonOffset (1, 1);
+ glEnable (GL_POLYGON_OFFSET_FILL);
- glDisable (GL_POLYGON_OFFSET_FILL);
-
- glPopMatrix();
- DrawCoordinateCross ();
- DrawNetgenLogo ();
- glFinish();
+ glCallList (trilists.Get(1));
- glDisable (GL_POLYGON_OFFSET_FILL);
+ glDisable (GL_POLYGON_OFFSET_FILL);
-}
+ int showtrias = vispar.showstltrias;
-void VisualSceneOCCGeometry :: BuildScene (int zoomall)
-{
- int i = 0, j, k;
-
- Box3d box;
+ if (showtrias)
+ {
+ float mat_coll[] = { 0.2f, 0.2f, 0.2f, 1.0f };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_coll);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
+
+ glCallList (trilists.Get(1));
+ }
- TopExp_Explorer ex, ex_edge;
+ /*
- for (ex.Init(occgeometry -> shape, TopAbs_VERTEX); ex.More(); ex.Next())
+ glBegin (GL_TRIANGLES);
+ for (j = 1; j <= stlgeometry -> GetNT(); j++)
{
- i++;
- gp_Pnt p = BRep_Tool::Pnt (TopoDS::Vertex(ex.Current()));
-
- if (i == 1)
- box.SetPoint (Point<3>(p.X(), p.Y(), p.Z()));
- else
- box.AddPoint (Point<3>(p.X(), p.Y(), p.Z()));
+ const STLTriangle & tria = stlgeometry -> GetTriangle(j);
+ glNormal3f (tria.normal.X(),
+ tria.normal.Y(),
+ tria.normal.Z());
+
+ for (k = 0; k < 3; k++)
+ {
+ glVertex3f (tria.pts[k].X(),
+ tria.pts[k].Y(),
+ tria.pts[k].Z());
}
+ }
+ glEnd ();
+ */
- center = box.CalcCenter();
- rad = box.CalcDiam() / 2;
-
- CalcTransformationMatrices();
-
-
- linelists.Elem(1) = glGenLists (1);
- glNewList (linelists.Last(), GL_COMPILE);
- for (ex_edge.Init(occgeometry -> shape, TopAbs_EDGE);
- ex_edge.More(); ex_edge.Next())
- {
- if (BRep_Tool::Degenerated(TopoDS::Edge(ex_edge.Current()))) continue;
- glBegin (GL_LINE_STRIP);
+
+ glPopMatrix();
+ glFinish();
+ }
- double s0, s1, s;
- Handle(Geom_Curve) c = BRep_Tool::Curve(TopoDS::Edge(ex_edge.Current()), s0, s1);
- double d = s1-s0;
- int i;
-
- for (i = 0; i<=50; i++)
- {
- s = s0 + i*d/50;
- gp_Pnt p = c->Value (s);
- glVertex3f (p.X(),p.Y(), p.Z());
- }
- glEnd ();
- }
+ void VisualSceneSTLGeometry :: BuildScene (int zoomall)
+ {
+ // cout << "rebuild stl geometry scene" << endl;
- // glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
+ center = stlgeometry -> GetBoundingBox().Center();
+ rad = stlgeometry -> GetBoundingBox().Diam() / 2;
- glBegin (GL_TRIANGLES);
- // int nfaces = occgeometry -> fmap.Extent();
- i = 0;
+ CalcTransformationMatrices();
- TopExp_Explorer exp0, exp1, exp2, exp3;
+ for (int i = 1; i <= trilists.Size(); i++)
+ glDeleteLists (trilists.Elem(i), 1);
+ trilists.SetSize(0);
- // BRepMesh::Mesh (occgeometry -> shape, occgeometry -> MaxSize()/100);
- for (exp0.Init(occgeometry -> shape, TopAbs_SOLID); exp0.More(); exp0.Next())
- for (exp1.Init(exp0.Current(), TopAbs_SHELL); exp1.More(); exp1.Next())
- for (exp2.Init(exp1.Current().Composed(exp0.Current().Orientation()), TopAbs_FACE); exp2.More(); exp2.Next())
- {
- TopoDS_Face face = TopoDS::Face (exp2.Current().Composed(exp1.Current().Orientation()));
+ trilists.Append (glGenLists (1));
+ glNewList (trilists.Last(), GL_COMPILE);
- TopLoc_Location loc;
- Handle(Geom_Surface) surf = BRep_Tool::Surface (face);
- BRepAdaptor_Surface sf(face, Standard_False);
- BRepLProp_SLProps prop(sf, 1, 1e-5);
+ glEnable (GL_NORMALIZE);
- // BRepMesh::Mesh (face, 1e-3);
- (*testout) << "meshing face " << ++i << endl;
+ glBegin (GL_TRIANGLES);
+ for (int j = 1; j <= stlgeometry -> GetNT(); j++)
+ {
+ const Vec3d & n = stlgeometry->GetTriangle(j).Normal();
+ glNormal3f (n.X(), n.Y(), n.Z());
+
+ for (int k = 1; k <= 3; k++)
{
- int edges = 0;
- for (exp3.Init (face, TopAbs_EDGE); exp3.More(); exp3.Next())
- {
- edges++;
- (*testout) << "edge " << edges;
- if (BRep_Tool::Degenerated(TopoDS::Edge(exp3.Current())))
- (*testout) << " degenerated";
- (*testout) << endl;
- }
+ const Point3d & p =
+ stlgeometry->GetPoint (stlgeometry -> GetTriangle(j).PNum(k));
+ glVertex3f (p.X(),p.Y(), p.Z());
}
- BRepMesh::Mesh (face, occgeometry -> MaxSize()/100);
- (*testout) << "done" << endl;
- // cout << "Warning: mvdraw fixed meshing size for visualization" << endl;
- // cout << "face " << ++i << endl;
-
- Handle(Poly_Triangulation) triangulation = BRep_Tool::Triangulation (face, loc);
- if (!triangulation) continue;
-
- int ntriangles = triangulation -> NbTriangles();
- // cout << "nbtriangles = " << ntriangles << endl;
- for (j = 1; j <= ntriangles; j++)
- {
- // (*testout) << "drawing trig " << j << "/" << ntriangles << " " << flush;
- // cout << "j = " << j << endl;
- Poly_Triangle triangle = (triangulation -> Triangles())(j);
- for (k = 1; k <= 3; k++)
- {
- (*testout) << "." << flush;
- gp_Pnt2d uv = (triangulation -> UVNodes())(triangle(k));
- gp_Pnt pnt;
- gp_Vec du, dv;
- prop.SetParameters (uv.X(), uv.Y());
- surf->D0 (uv.X(), uv.Y(), pnt);
- gp_Vec n;
-
- if (prop.IsNormalDefined())
- {
- n = prop.Normal();
- }
- else
- n = gp_Vec (0,0,0);
-
-
- // surf->D1 (uv.X(), uv.Y(), pnt, du, dv);
- // gp_Vec n = du.Crossed(dv).Normalized();
- if (face.Orientation() == TopAbs_REVERSED) n *= -1;
- glNormal3f (n.X(), n.Y(), n.Z());
- glVertex3f (pnt.X(), pnt.Y(), pnt.Z());
- }
- (*testout) << endl;
- }
- }
-
- glEnd ();
+ }
+ glEnd ();
+
+ glEndList ();
+ }
- glEndList ();
-}
-#endif
-#ifdef STEP
-/* *********************** Draw STEP Geometry **************** */
-VisualSceneSTEPGeometry :: VisualSceneSTEPGeometry ()
- : VisualScene ()
-{
- gllists.SetSize(0);
-}
+ VisualSceneSpecPoints :: VisualSceneSpecPoints ()
+ : VisualScene()
+ {
+ ;
+ }
-VisualSceneSTEPGeometry :: ~VisualSceneSTEPGeometry ()
-{
- cout << "VisualSceneSTEPGeometry::~VisualSceneSTEPGeometry called "
- << "but not implemented" << endl;
-}
-
+ VisualSceneSpecPoints :: ~VisualSceneSpecPoints ()
+ {
+ ;
+ }
-void VisualSceneSTEPGeometry :: BuildScene (int zoomall)
-{
- cout << "VisualSceneSTEPGeometry::BuildScene called" << endl;
- const VisualApproximation & visapprox =
- stepgeometry->GetVisualApproximation();
+ void VisualSceneSpecPoints :: DrawScene ()
+ {
+ if (!mesh)
+ {
+ VisualScene::DrawScene();
+ return;
+ }
- INDEX i, k, pi;
+ if (changeval != specpoints.Size())
+ BuildScene();
+ changeval = specpoints.Size();
- Box3d box;
- int hasp = 0;
- for (i = 1; i <= visapprox.GetNP(); i++)
- {
- if (hasp)
- box.AddPoint (visapprox.GetPoint(i));
- else
- {
- hasp = 1;
- box.SetPoint (visapprox.GetPoint(i));
- }
- }
- if (hasp)
- {
- center = box.CalcCenter();
- rad = box.CalcDiam() / 2;
- }
-
- cout << "center " << center << endl
- << "radius " << rad << endl;
- CalcTransformationMatrices();
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- for (i = 1; i <= gllists.Size(); i++)
- glDeleteLists (gllists.Elem(i), 1);
- gllists.SetSize(0);
+ glEnable (GL_COLOR_MATERIAL);
+ glColor3f (1.0f, 1.0f, 1.0f);
+ glLineWidth (1.0f);
- // build list of points
- gllists.Append (glGenLists (1));
- glNewList (gllists.Last(), GL_COMPILE);
-
- glPointSize( 3.0 );
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
- glBegin( GL_POINTS );
- for (i = 1; i <= visapprox.GetNP(); i++)
+ // glEnable (GL_COLOR);
+ // glDisable (GL_COLOR_MATERIAL);
+ if (vispar.drawedtangents)
{
- const Point3d & p = visapprox.GetPoint(i);
- glVertex3f( p.X(), p.Y(), p.Z());
+ glColor3d (1, 0, 0);
+ glBegin (GL_LINES);
+ for (int i = 1; i <= specpoints.Size(); i++)
+ {
+ const Point3d p1 = specpoints.Get(i).p;
+ const Point3d p2 = specpoints.Get(i).p + len * specpoints.Get(i).v;
+ glVertex3d (p1.X(), p1.Y(), p1.Z());
+ glVertex3d (p2.X(), p2.Y(), p2.Z());
+ }
+ glEnd();
}
- glEnd();
-
- glEndList();
- // build list of segments
- gllists.Append (glGenLists (1));
- glNewList (gllists.Last(), GL_COMPILE);
-
- glLineWidth( 1.0f );
-
- glBegin(GL_LINES);
- for (i = 1; i <= visapprox.GetNSeg(); i++)
+ if (vispar.drawededges)
{
- for (k = 1; k <= 2; k++)
+ glColor3d (1, 0, 0);
+ glBegin (GL_LINES);
+ for (int i = 1; i <= mesh->GetNSeg(); i++)
{
- pi = visapprox.GetSegment(i).PNum(k);
- glVertex3f(visapprox.GetPoint(pi).X(),
- visapprox.GetPoint(pi).Y(),
- visapprox.GetPoint(pi).Z());
+ const Segment & seg = mesh -> LineSegment (i);
+ glVertex3dv ( &(*mesh)[seg.p1].X() );
+ glVertex3dv ( &(*mesh)[seg.p2].X() );
}
- }
- glEnd();
-
- glEndList();
-}
-
-
-void VisualSceneSTEPGeometry :: DrawScene ()
-{
- if (! stepgeometry)
- {
- cerr << "VisualSceneSTEPGeometry::DrawScene: no STEP geometry" << endl;
- return;
- }
-
- const VisualApproximation & visapprox =
- stepgeometry -> GetVisualApproximation();
- if (changeval != visapprox.GetNP())
- BuildScene();
-
- changeval = visapprox.GetNP();
-
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- glPushMatrix();
- glMultMatrixf (transformationmat);
-
- // draw segments
-// float mat_coll[] = { 0.2, 0.2, 0.2, 1 };
-// glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_coll);
-// glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
-
- glEnable (GL_COLOR_MATERIAL);
- glColor3f(0.0, 1.0, 0.0);
- glCallList (gllists.Get(2));
- glColor3f (1.0, 0.0, 0.0);
- glCallList (gllists.Get(1));
-
- glPopMatrix();
- glFinish();
-}
-
-#endif
-
-
-
-
-
-
-
-
-
-
-VisualSceneSpecPoints :: VisualSceneSpecPoints ()
- : VisualScene()
-{
- ;
-}
-
-VisualSceneSpecPoints :: ~VisualSceneSpecPoints ()
-{
- ;
-}
-
-
-void VisualSceneSpecPoints :: DrawScene ()
-{
- int i, j, k;
-
-
- if (!mesh)
- {
- VisualScene::DrawScene();
- return;
- }
-
- if (changeval != specpoints.Size())
- BuildScene();
- changeval = specpoints.Size();
-
-
-
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- glEnable (GL_COLOR_MATERIAL);
- glColor3f (1.0f, 1.0f, 1.0f);
- glLineWidth (1.0f);
-
- glPushMatrix();
- glMultMatrixf (transformationmat);
-
- // glEnable (GL_COLOR);
- // glDisable (GL_COLOR_MATERIAL);
- if (vispar.drawedtangents)
- {
- glColor3d (1, 0, 0);
- glBegin (GL_LINES);
- for (i = 1; i <= specpoints.Size(); i++)
- {
- const Point3d p1 = specpoints.Get(i).p;
- const Point3d p2 = specpoints.Get(i).p + len * specpoints.Get(i).v;
- glVertex3d (p1.X(), p1.Y(), p1.Z());
- glVertex3d (p2.X(), p2.Y(), p2.Z());
- }
- glEnd();
- }
-
- if (vispar.drawededges)
- {
- glColor3d (1, 0, 0);
- glBegin (GL_LINES);
- for (i = 1; i <= mesh->GetNSeg(); i++)
- {
- const Segment & seg = mesh -> LineSegment (i);
- const Point3d p1 = mesh -> Point (seg.p1);
- const Point3d p2 = mesh -> Point (seg.p2);
- glVertex3d (p1.X(), p1.Y(), p1.Z());
- glVertex3d (p2.X(), p2.Y(), p2.Z());
- }
- glEnd();
- }
+ glEnd();
+ }
- if (vispar.drawededgenrs)
- {
- glEnable (GL_COLOR_MATERIAL);
- GLfloat textcol[3] = { 1 - backcolor,
+ if (vispar.drawededgenrs)
+ {
+ glEnable (GL_COLOR_MATERIAL);
+ GLfloat textcol[3] = { 1 - backcolor,
1 - backcolor,
1 - backcolor };
- glColor3fv (textcol);
- glNormal3d (0, 0, 1);
- glPushAttrib (GL_LIST_BIT);
- glListBase (fontbase);
+ glColor3fv (textcol);
+ glNormal3d (0, 0, 1);
+ glPushAttrib (GL_LIST_BIT);
+ glListBase (fontbase);
- char buf[20];
- for (i = 1; i <= mesh->GetNSeg(); i++)
- {
- const Segment & seg = mesh -> LineSegment (i);
- const Point3d p1 = mesh -> Point (seg.p1);
- const Point3d p2 = mesh -> Point (seg.p2);
+ char buf[20];
+ for (int i = 1; i <= mesh->GetNSeg(); i++)
+ {
+ const Segment & seg = mesh -> LineSegment (i);
+ const Point3d p1 = mesh -> Point (seg.p1);
+ const Point3d p2 = mesh -> Point (seg.p2);
- const Point3d p = Center (p1, p2);
- glRasterPos3d (p.X(), p.Y(), p.Z());
+ const Point3d p = Center (p1, p2);
+ glRasterPos3d (p.X(), p.Y(), p.Z());
- sprintf (buf, "%d", seg.edgenr);
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- }
+ sprintf (buf, "%d", seg.edgenr);
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
+ }
- glPopAttrib ();
- glDisable (GL_COLOR_MATERIAL);
- }
+ glPopAttrib ();
+ glDisable (GL_COLOR_MATERIAL);
+ }
- if (vispar.drawedpoints)
- {
- glColor3d (0, 0, 1);
- glPointSize( 3.0 );
+ if (vispar.drawedpoints)
+ {
+ glColor3d (0, 0, 1);
+ glPointSize( 3.0 );
- glBegin( GL_POINTS );
- for (i = 1; i <= mesh -> GetNP(); i++)
- {
- const Point3d & p = mesh -> Point(i);
- glVertex3f( p.X(), p.Y(), p.Z());
- }
- glEnd();
- }
+ /*
+ float range[2];
+ glGetFloatv(GL_POINT_SIZE_RANGE, &range[0]);
+ cout << "max ptsize = " << range[0] << "-" << range[1] << endl;
+ */
+
- if (vispar.drawedpointnrs)
- {
- glEnable (GL_COLOR_MATERIAL);
- GLfloat textcol[3] = { 1 - backcolor,
+ glBegin( GL_POINTS );
+ for (int i = 1; i <= mesh -> GetNP(); i++)
+ {
+ const Point3d & p = mesh -> Point(i);
+ if (i % 2)
+ glVertex3f( p.X(), p.Y(), p.Z());
+ }
+ glEnd();
+
+ static GLubyte knoedel[] =
+ {
+ 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
+ };
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+ glDisable (GL_COLOR_MATERIAL);
+ glDisable (GL_LIGHTING);
+ glDisable (GL_CLIP_PLANE0);
+
+ for (int i = 1; i <= mesh -> GetNP(); i++)
+ {
+ const Point3d & p = mesh -> Point(i);
+ glRasterPos3d (p.X(), p.Y(), p.Z());
+ glBitmap (7, 7, 3, 3, 0, 0, &knoedel[0]);
+ }
+
+ }
+
+ if (vispar.drawedpointnrs)
+ {
+ glEnable (GL_COLOR_MATERIAL);
+ GLfloat textcol[3] = { 1 - backcolor,
1 - backcolor,
1 - backcolor };
- glColor3fv (textcol);
- glNormal3d (0, 0, 1);
- glPushAttrib (GL_LIST_BIT);
- glListBase (fontbase);
+ glColor3fv (textcol);
+ glNormal3d (0, 0, 1);
+ glPushAttrib (GL_LIST_BIT);
+ glListBase (fontbase);
- char buf[20];
- for (i = 1; i <= mesh->GetNP(); i++)
- {
- const Point3d & p = mesh->Point(i);
- glRasterPos3d (p.X(), p.Y(), p.Z());
+ char buf[20];
+ for (int i = 1; i <= mesh->GetNP(); i++)
+ {
+ const Point3d & p = mesh->Point(i);
+ glRasterPos3d (p.X(), p.Y(), p.Z());
- sprintf (buf, "%d", i);
- glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
- }
+ sprintf (buf, "%d", i);
+ glCallLists (strlen (buf), GL_UNSIGNED_BYTE, buf);
+ }
- glPopAttrib ();
- glDisable (GL_COLOR_MATERIAL);
- }
+ glPopAttrib ();
+ glDisable (GL_COLOR_MATERIAL);
+ }
- glPopMatrix();
+ glPopMatrix();
- if (vispar.drawcoordinatecross)
- DrawCoordinateCross ();
- DrawNetgenLogo ();
+ if (vispar.drawcoordinatecross)
+ DrawCoordinateCross ();
+ DrawNetgenLogo ();
- glFinish();
-}
+ glFinish();
+ }
-void VisualSceneSpecPoints :: BuildScene (int zoomall)
-{
- int i, j, k;
+ void VisualSceneSpecPoints :: BuildScene (int zoomall)
+ {
+ if (!mesh)
+ {
+ VisualScene::BuildScene(zoomall);
+ return;
+ }
- if (!mesh)
- {
- VisualScene::BuildScene(zoomall);
- return;
- }
-
- Box3d box;
-
- if (mesh->GetNSeg())
- {
- box.SetPoint (mesh->Point (mesh->LineSegment(1).p1));
- for (i = 1; i <= mesh->GetNSeg(); i++)
- {
- box.AddPoint (mesh->Point (mesh->LineSegment(i).p1));
- box.AddPoint (mesh->Point (mesh->LineSegment(i).p2));
- }
- }
- else if (specpoints.Size() >= 2)
- {
- box.SetPoint (specpoints.Get(1).p);
- for (i = 2; i <= specpoints.Size(); i++)
- box.AddPoint (specpoints.Get(i).p);
- }
- else
- {
- box = Box3d (Point3d (0,0,0), Point3d (1,1,1));
- }
+ Box3d box;
- if (zoomall == 2 && vispar.centerpoint >= 1 && vispar.centerpoint <= mesh->GetNP())
- center = mesh->Point (vispar.centerpoint);
- else
- center = Center (box.PMin(), box.PMax());
-
- rad = 0.5 * Dist (box.PMin(), box.PMax());
+ if (mesh->GetNSeg())
+ {
+ box.SetPoint (mesh->Point (mesh->LineSegment(1).p1));
+ for (int i = 1; i <= mesh->GetNSeg(); i++)
+ {
+ box.AddPoint (mesh->Point (mesh->LineSegment(i).p1));
+ box.AddPoint (mesh->Point (mesh->LineSegment(i).p2));
+ }
+ }
+ else if (specpoints.Size() >= 2)
+ {
+ box.SetPoint (specpoints.Get(1).p);
+ for (int i = 2; i <= specpoints.Size(); i++)
+ box.AddPoint (specpoints.Get(i).p);
+ }
+ else
+ {
+ box = Box3d (Point3d (0,0,0), Point3d (1,1,1));
+ }
+ if (zoomall == 2 && ((vispar.centerpoint >= 1 && vispar.centerpoint <= mesh->GetNP()) ||
+ vispar.use_center_coords))
+ {
+ if (vispar.use_center_coords)
+ {
+ center.X() = vispar.centerx; center.Y() = vispar.centery; center.Z() = vispar.centerz;
+ }
+ else
+ center = mesh->Point (vispar.centerpoint);
+ }
+ else
+ center = Center (box.PMin(), box.PMax());
+
- CalcTransformationMatrices();
-}
+ rad = 0.5 * Dist (box.PMin(), box.PMax());
+
+
+ CalcTransformationMatrices();
+ }
}
diff --git a/Netgen/libsrc/visualization/mvdraw.hpp b/Netgen/libsrc/visualization/mvdraw.hpp
index 691ac246cb..5665533979 100644
--- a/Netgen/libsrc/visualization/mvdraw.hpp
+++ b/Netgen/libsrc/visualization/mvdraw.hpp
@@ -1,6 +1,10 @@
#ifndef FILE_MVDRAW
#define FILE_MVDRAW
+#include "vispar.hpp"
+
+/*
+
class VisualizationParameters
{
public:
@@ -61,6 +65,13 @@ public:
int stlchartnumber;
int stlchartnumberoffset;
+ // occ:
+ int occshowvolumenr;
+ bool occshowsurfaces;
+ bool occshowedges;
+ bool occvisproblemfaces;
+ bool occzoomtohighlightedentity;
+
bool whitebackground;
int stereo;
bool usedispllists;
@@ -73,6 +84,10 @@ public:
VisualizationParameters();
};
extern VisualizationParameters vispar;
+*/
+
+
+
@@ -100,7 +115,7 @@ protected:
GLdouble clipplane[4];
int changeval;
- static double backcolor;
+ static GLdouble backcolor;
public:
static GLuint fontbase;
@@ -120,6 +135,8 @@ public:
void CalcTransformationMatrices();
void StandardRotation (const char * dir);
+ void ArbitraryRotation (const ARRAY<double> & alpha, const ARRAY<Vec3d> & vec);
+ void ArbitraryRotation (const double alpha, const Vec3d & vec);
void MouseMove(int oldx, int oldy,
int newx, int newy,
@@ -136,8 +153,8 @@ public:
static void SetBackGroundColor (double col)
{ backcolor = col; }
- void CreateTexture (int ncols, int linear);
- void DrawColorBar (double minval, double maxval, int logscale = 0);
+ void CreateTexture (int ncols, int linear, int typ = GL_DECAL);
+ void DrawColorBar (double minval, double maxval, int logscale = 0, bool linear = 1);
void DrawCoordinateCross ();
void DrawNetgenLogo ();
void SetOpenGlColor(double val, double valmin, double valmax, int logscale = 0);
@@ -195,6 +212,7 @@ public:
virtual void BuildScene (int zoomall = 0);
virtual void DrawScene ();
+ virtual void MouseDblClick (int px, int py);
};
#endif
diff --git a/Netgen/libsrc/visualization/soldata.hpp b/Netgen/libsrc/visualization/soldata.hpp
index b2c11cfbd0..44e0d0a56e 100644
--- a/Netgen/libsrc/visualization/soldata.hpp
+++ b/Netgen/libsrc/visualization/soldata.hpp
@@ -2,18 +2,20 @@
#define FILE_SOLDATA
+using namespace std;
class SolutionData
{
protected:
- std::string name;
+
+ string name;
int components;
bool iscomplex;
- // int dist;
- // int order;
+ int multidimcomponent;
+
public:
- SolutionData (const std::string & aname,
+ SolutionData (const string & aname,
int acomponents = 1, bool aiscomplex = 0)
: name(aname), components(acomponents), iscomplex(aiscomplex)
{ ; }
@@ -24,16 +26,18 @@ public:
int GetComponents() { return components; }
bool IsComplex() { return iscomplex; }
- virtual bool GetValue (int elnr,
- double lam1, double lam2, double lam3,
- double * values)
- { return 0; }
+ virtual bool GetValue (int /* elnr */,
+ double /* lam1 */, double /* lam2 */, double /* lam3 */,
+ double * /* values */)
+ { return false; }
- virtual bool GetSurfValue (int selnr,
- double lam1, double lam2,
- double * values)
- { return 0; }
+ virtual bool GetSurfValue (int /* selnr */,
+ double /* lam1 */, double /* lam2 */,
+ double * /* values */)
+ { return false; }
+ void SetMultiDimComponent (int mc)
+ { multidimcomponent = mc; }
};
diff --git a/Netgen/libsrc/visualization/stlmeshing.cpp b/Netgen/libsrc/visualization/stlmeshing.cpp
index 3fdbbadaf7..45adac9d75 100644
--- a/Netgen/libsrc/visualization/stlmeshing.cpp
+++ b/Netgen/libsrc/visualization/stlmeshing.cpp
@@ -102,33 +102,33 @@ void VisualSceneSTLMeshing :: DrawScene ()
glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
glLogicOp (GL_COPY);
- float mat_colred[] = { 0.9, 0.0, 0.0, 1 };
- float mat_colgreen[] = { 0.0, 0.9, 0.0, 1 };
- float mat_colblue[] = { 0.1, 0.1, 1., 1 };
+ float mat_colred[] = { 0.9f, 0.0f, 0.0f, 1.0f };
+ float mat_colgreen[] = { 0.0f, 0.9f, 0.0f, 1.0f };
+ float mat_colblue[] = { 0.1f, 0.1f, 1.0f, 1.0f };
- float mat_colbluegreen[] = { 0.1, 0.5, 0.9, 1 };
- float mat_colpink[] = { 1., 0.1, 0.5, 1 };
- float mat_colviolet[] = { 1., 0.1, 1., 1 };
- float mat_colbrown[] = { 0.8, 0.6, 0.1, 1 };
- float mat_colorange[] = { 0.9, 0.7, 0.1, 1 };
- float mat_colturquis[] = { 0.0, 1., 0.8, 1 };
+ float mat_colbluegreen[] = { 0.1f, 0.5f, 0.9f, 1.0f };
+ float mat_colpink[] = { 1.0f, 0.1f, 0.5f, 1.0f };
+ float mat_colviolet[] = { 1.0f, 0.1f, 1.0f, 1.0f };
+ float mat_colbrown[] = { 0.8f, 0.6f, 0.1f, 1.0f };
+ float mat_colorange[] = { 0.9f, 0.7f, 0.1f, 1.0f };
+ float mat_colturquis[] = { 0.0f, 1.0f, 0.8f, 1.0f };
- float mat_colgrey[] = { 0.3, 0.3, 0.3, 1 };
+ float mat_colgrey[] = { 0.3f, 0.3f, 0.3f, 1.0f };
- float mat_collred[] = { 1., 0.5, 0.5, 1 };
- float mat_collgreen[] = { 0.2, 1., 0.2, 1 };
- float mat_collbrown[] = { 1., 0.8, 0.3, 1 };
+ float mat_collred[] = { 1.0f, 0.5f, 0.5f, 1.0f };
+ float mat_collgreen[] = { 0.2f, 1.9f, 0.2f, 1.0f };
+ float mat_collbrown[] = { 1.0f, 0.8f, 0.3f, 1.0f };
- float mat_collgrey[] = { 0.8, 0.8, 0.8, 1 };
- float mat_colmgrey[] = { 0.4, 0.4, 0.4, 1 };
+ float mat_collgrey[] = { 0.8f, 0.8f, 0.8f, 1.0f };
+ float mat_colmgrey[] = { 0.4f, 0.4f, 0.4f, 1.0f };
- float mat_colstlbody[] = { 0., 0., 0.8, 1 };
- float mat_colseltrig[] = { 0.7, 0.7, 0.3, 1 };
- float mat_colseledge[] = { 0.7, 0.7, 1., 1 };
+ float mat_colstlbody[] = { 0.0f, 0.0f, 0.8f, 1.0f };
+ float mat_colseltrig[] = { 0.7f, 0.7f, 0.3f, 1.0f };
+ float mat_colseledge[] = { 0.7f, 0.7f, 1.0f, 1.0f };
glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_colblue);
- float pgoff = 0.5;
+ float pgoff = 0.5f;
glPolygonOffset (pgoff*1, pgoff*1);
glEnable (GL_POLYGON_OFFSET_FILL);
@@ -809,14 +809,11 @@ void VisualSceneSTLMeshing :: DrawScene ()
void VisualSceneSTLMeshing :: BuildScene (int zoomall)
{
- int i, j, k;
-
if (selecttrig && zoomall == 2)
- {
- center = stlgeometry -> GetPoint ( stlgeometry->GetTriangle(selecttrig).PNum(nodeofseltrig));
- }
+ center = stlgeometry -> GetPoint ( stlgeometry->GetTriangle(selecttrig).PNum(nodeofseltrig));
else
center = stlgeometry -> GetBoundingBox().Center();
+
rad = stlgeometry -> GetBoundingBox().Diam() / 2;
CalcTransformationMatrices();
@@ -1067,9 +1064,6 @@ void VisualSceneSTLMeshing :: MouseDblClick (int px, int py)
-
-
-
VisualSceneSTLMeshing vsstlmeshing;
#endif
diff --git a/Netgen/libsrc/visualization/vispar.hpp b/Netgen/libsrc/visualization/vispar.hpp
new file mode 100644
index 0000000000..3a35294182
--- /dev/null
+++ b/Netgen/libsrc/visualization/vispar.hpp
@@ -0,0 +1,89 @@
+#ifndef FILE_VISPAR
+#define FILE_VISPAR
+
+class VisualizationParameters
+{
+public:
+ double lightamb;
+ double lightdiff;
+ double lightspec;
+ double shininess;
+ double transp;
+ int locviewer;
+ char selectvisual[20];
+ int showstltrias;
+
+ Vec3d clipnormal;
+ double clipdist;
+ int clipenable;
+ int clipplanetimestamp;
+
+ int colormeshsize;
+
+ int drawfilledtrigs;
+ int drawbadels;
+ int drawoutline;
+ int drawedges;
+ int subdivisions;
+
+ int drawprisms;
+ int drawpyramids;
+ int drawhexes;
+ double shrink;
+ int drawidentified;
+ int drawpointnumbers;
+ int drawedgenumbers;
+ int drawfacenumbers;
+ int drawelementnumbers;
+ int drawdomainsurf;
+ int drawtets;
+ int drawtetsdomain;
+
+ int drawededges;
+ int drawedpoints;
+ int drawedpointnrs;
+ int drawedtangents;
+ int drawededgenrs;
+ int drawmetispartition;
+
+ int drawcurveproj;
+ int drawcurveprojedge;
+
+
+ int centerpoint;
+ int drawelement;
+
+ // stl:
+ int stlshowtrias;
+ int stlshowfilledtrias;
+ int stlshowedges;
+ int stlshowmarktrias;
+ int stlshowactivechart;
+ int stlchartnumber;
+ int stlchartnumberoffset;
+
+ // occ:
+ int occshowvolumenr;
+ bool occshowsurfaces;
+ bool occshowedges;
+ bool occvisproblemfaces;
+ bool occzoomtohighlightedentity;
+ double occdeflection;
+
+ bool whitebackground;
+ int stereo;
+ bool usedispllists;
+ bool drawcoordinatecross;
+ bool drawcolorbar;
+ bool drawnetgenlogo;
+
+ bool use_center_coords;
+ double centerx,centery,centerz;
+
+
+public:
+ VisualizationParameters();
+};
+extern VisualizationParameters vispar;
+
+#endif
diff --git a/Netgen/libsrc/visualization/vscsg.cpp b/Netgen/libsrc/visualization/vscsg.cpp
index 42891f0a63..d17c0c38e2 100644
--- a/Netgen/libsrc/visualization/vscsg.cpp
+++ b/Netgen/libsrc/visualization/vscsg.cpp
@@ -16,7 +16,7 @@ namespace netgen
-extern CSGeometry * geometry;
+extern AutoPtr<CSGeometry> geometry;
VisualSceneGeometry :: VisualSceneGeometry ()
diff --git a/Netgen/libsrc/visualization/vsmesh.cpp b/Netgen/libsrc/visualization/vsmesh.cpp
index f88cb55284..c53e5223be 100644
--- a/Netgen/libsrc/visualization/vsmesh.cpp
+++ b/Netgen/libsrc/visualization/vsmesh.cpp
@@ -66,28 +66,16 @@ namespace netgen
;
}
-
-
- ARRAY<Point3d> drawel;
+ // ARRAY<Point3d> drawel;
+
void VisualSceneMesh :: DrawScene ()
{
- /*
- if (multithread.running)
- {
- VisualScene::DrawScene();
- return;
- }
- */
- int i;
-
-
if (!mesh)
{
VisualScene::DrawScene();
return;
}
-
lock = NULL;
@@ -137,14 +125,19 @@ namespace netgen
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- glPolygonOffset (1,1);
+ // glPolygonOffset (1,10);
+ glPolygonOffset (2,2);
glEnable (GL_POLYGON_OFFSET_FILL);
SetClippingPlane ();
if (vispar.drawfilledtrigs)
{
- BuildFilledList ();
+ if (filledtimestamp < mesh->GetTimeStamp () ||
+ filledtimestamp < selecttimestamp)
+ {
+ BuildFilledList ();
+ }
glCallList (filledlist);
}
@@ -178,8 +171,6 @@ namespace netgen
glCallList (hexlist);
}
-
-
if (vispar.drawtets)
{
BuildTetList ();
@@ -188,11 +179,13 @@ namespace netgen
glLineWidth (1.0f);
glCallList (tetlist);
}
+
if (vispar.drawdomainsurf)
{
BuildDomainSurfList();
glCallList (domainsurflist);
}
+
glDisable (GL_POLYGON_OFFSET_FILL);
// draw lines
@@ -210,38 +203,19 @@ namespace netgen
if (vispar.drawoutline)
{
- glPolygonOffset (1, -1);
+ glPolygonOffset (1, 1);
glEnable (GL_POLYGON_OFFSET_LINE);
- BuildLineList ();
+ if (linetimestamp < mesh->GetTimeStamp ())
+ BuildLineList ();
+
glCallList (linelist);
-
glDisable (GL_POLYGON_OFFSET_LINE);
}
- /*
- // not drawing subdivision mesh
-
- if (vispar.drawtets)
- {
- glCallList (tetlist);
- }
-
- if (vispar.drawprisms)
- {
- glCallList (prismlist);
- }
-
- if (vispar.drawpyramids)
- {
- glCallList (pyramidlist);
- }
-
- */
-
if (vispar.drawidentified)
{
- glPolygonOffset (-1, -1);
+ glPolygonOffset (1, -1);
glEnable (GL_POLYGON_OFFSET_LINE);
glCallList (identifiedlist);
glDisable (GL_POLYGON_OFFSET_LINE);
@@ -262,17 +236,17 @@ namespace netgen
GLfloat matcolsingedge[] = { 1, 0, 1, 1 };
glEnable (GL_POLYGON_OFFSET_LINE);
- glPolygonOffset (-1, -1);
+ glPolygonOffset (1, -1);
glLineWidth (2);
- for (i = 1; i <= mesh->GetNSeg(); i++)
+ for (int i = 1; i <= mesh->GetNSeg(); i++)
{
const Segment & seg = mesh->LineSegment(i);
const Point3d & p1 = (*mesh)[seg.p1];
const Point3d & p2 = (*mesh)[seg.p2];
- if (seg.singedge)
+ if (seg.singedge_left || seg.singedge_right)
glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE,
matcolsingedge);
else
@@ -293,15 +267,16 @@ namespace netgen
Point<3> x;
glBegin (GL_LINE_STRIP);
- for (j = 0; j <= hoplotn; j++) {
- mesh->GetCurvedElements().CalcSegmentTransformation ((double) j/hoplotn, i-1, x);
- glVertex3d (x(0), x(1), x(2));
- }
-
+ for (int j = 0; j <= hoplotn; j++)
+ {
+ mesh->GetCurvedElements().CalcSegmentTransformation ((double) j/hoplotn, i-1, x);
+ glVertex3d (x(0), x(1), x(2));
+ }
+
glEnd();
-
+
} else {
-
+
glBegin (GL_LINES);
glVertex3f (p1.X(), p1.Y(), p1.Z());
glVertex3f (p2.X(), p2.Y(), p2.Z());
@@ -363,17 +338,23 @@ namespace netgen
ARRAY<Element2d> faces;
- if (mesh->GetTimeStamp() > vstimestamp || zoomall)
+ int meshtimestamp = mesh->GetTimeStamp();
+ if (meshtimestamp > vstimestamp || zoomall)
{
mesh->GetBox (pmin, pmax, SURFACEPOINT);
+
if (selpoint >= 1 && zoomall == 2)
center = mesh->Point (selpoint);
+ else if (vispar.use_center_coords && zoomall == 2)
+ {
+ center.X() = vispar.centerx; center.Y() = vispar.centery; center.Z() = vispar.centerz;
+ }
else if (vispar.centerpoint >= 1 && zoomall == 2)
center = mesh->Point (vispar.centerpoint);
else
center = Center (pmin, pmax);
-
+
rad = 0.5 * Dist (pmin, pmax);
@@ -384,7 +365,6 @@ namespace netgen
CalcTransformationMatrices();
oldrad = rad;
}
- vstimestamp = mesh->GetTimeStamp();
}
glEnable (GL_NORMALIZE);
@@ -400,21 +380,25 @@ namespace netgen
glDeleteLists (badellist, 1);
badellist = 0;
}
- if (prismlist)
+ /*
+ if (prismlist)
{
- glDeleteLists (prismlist, 1);
- prismlist = 0;
+ glDeleteLists (prismlist, 1);
+ prismlist = 0;
}
- if (pyramidlist)
+
+ if (pyramidlist)
{
- glDeleteLists (pyramidlist, 1);
- pyramidlist = 0;
+ glDeleteLists (pyramidlist, 1);
+ pyramidlist = 0;
}
- if (hexlist)
+
+ if (hexlist)
{
- glDeleteLists (hexlist, 1);
- hexlist = 0;
+ glDeleteLists (hexlist, 1);
+ hexlist = 0;
}
+ */
if (identifiedlist)
{
glDeleteLists (identifiedlist, 1);
@@ -743,7 +727,7 @@ namespace netgen
}
default:
PrintSysError ("Cannot draw surface element of type ",
- int(el.GetType()));
+ int(el.GetType()));
}
}
glLoadName (0);
@@ -791,6 +775,8 @@ namespace netgen
glEndList ();
}
+
+ vstimestamp = meshtimestamp;
}
@@ -798,16 +784,9 @@ namespace netgen
void VisualSceneMesh :: BuildFilledList()
{
- clock_t starttime, endtime;
- starttime = clock();
-
- int i, j;
- SurfaceElementIndex sei;
+ // clock_t starttime, endtime;
+ // starttime = clock();
- if (filledtimestamp > mesh->GetTimeStamp () &&
- filledtimestamp > selecttimestamp)
- return;
-
if (!lock)
{
lock = new NgLock (mesh->Mutex());
@@ -819,13 +798,12 @@ namespace netgen
if (filledlist)
glDeleteLists (filledlist, 1);
-
- int checkvicinity = (stlgeometry != NULL) && stldoctor.showvicinity;
-
filledlist = glGenLists (1);
glNewList (filledlist, GL_COMPILE);
+ bool checkvicinity = (stlgeometry != NULL) && stldoctor.showvicinity;
+
glEnable (GL_NORMALIZE);
glLineWidth (1.0f);
@@ -838,15 +816,13 @@ namespace netgen
locms.SetSize (mesh->GetNP());
double maxh = -1;
double minh = 1e99;
- for (i = 1; i <= locms.Size(); i++)
+ for (int i = 1; i <= locms.Size(); i++)
{
Point3d p = mesh->Point(i);
locms.Elem(i) = mesh->GetH (p);
if (locms.Elem(i) > maxh) maxh = locms.Elem(i);
if (locms.Elem(i) < minh) minh = locms.Elem(i);
}
- // minh = locms.Min();
- // maxh = locms.Max();
if (!locms.Size())
{ minh = 1; maxh = 10; }
}
@@ -856,6 +832,10 @@ namespace netgen
GLfloat matcol[] = { 0, 1, 0, 1 };
GLfloat matcolsel[] = { 1, 0, 0, 1 };
+
+ CurvedElements & curv = mesh->GetCurvedElements();
+ int hoplotn = 1 << vispar.subdivisions;
+
for (int col = 1; col <= 2; col++)
{
@@ -865,17 +845,16 @@ namespace netgen
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, matcol);
- for (sei = 0; sei < mesh->GetNSE(); sei++)
+ for (SurfaceElementIndex sei = 0; sei < mesh->GetNSE(); sei++)
{
const Element2d & el = (*mesh)[sei];
-
+
bool drawel = !el.IsDeleted();
- for (j = 0; j < el.GetNP(); j++)
- {
- if (checkvicinity && !stlgeometry->Vicinity(el.GeomInfoPi(j+1).trignum))
+ if (checkvicinity)
+ for (int j = 0; j < el.GetNP(); j++)
+ if (!stlgeometry->Vicinity(el.GeomInfoPi(j+1).trignum))
drawel = 0;
- }
if (!drawel)
continue;
@@ -892,12 +871,8 @@ namespace netgen
{
case TRIG:
{
- CurvedElements & curv = mesh->GetCurvedElements();
if (curv.IsHighOrder() && curv.IsSurfaceElementCurved(sei))
{
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
Point<2> xr[3];
Point<3> xg;
Vec<3> dx, dy, n;
@@ -913,14 +888,15 @@ namespace netgen
xr[0](0) = (double) i/hoplotn; xr[0](1) = (double) j/hoplotn;
xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double) j/hoplotn;
xr[2](0) = (double) i/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
- } else
- {
- if (j == hoplotn-i-1) continue;
- xr[0](0) = (double)(i+1)/hoplotn; xr[0](1) = (double) j/hoplotn;
- xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double)(j+1)/hoplotn;
- xr[2](0) = (double) i/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
- };
-
+ }
+ else
+ {
+ if (j == hoplotn-i-1) continue;
+ xr[0](0) = (double)(i+1)/hoplotn; xr[0](1) = (double) j/hoplotn;
+ xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double)(j+1)/hoplotn;
+ xr[2](0) = (double) i/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
+ };
+
for (int l=0; l<3; l++)
{
Mat<3,2> dxdxi;
@@ -937,50 +913,47 @@ namespace netgen
glVertex3d (xg(0), xg(1), xg(2));
}
}
-
+
glEnd();
+ }
+ else // not high order
+ {
+ glBegin (GL_TRIANGLES);
+
+ const Point<3> & lp0 = (*mesh) [el[0]];
+ const Point<3> & lp1 = (*mesh) [el[1]];
+ const Point<3> & lp2 = (*mesh) [el[2]];
+
+ Vec<3> n = Cross (lp1-lp0, lp2-lp0);
+ glNormal3dv (n);
+
+ if (vispar.colormeshsize)
+ {
+ SetOpenGlColor (locms.Get(el[0]), minh, maxh, 1);
+ glVertex3dv (lp0);
+ SetOpenGlColor (locms.Get(el[1]), minh, maxh, 1);
+ glVertex3dv (lp1);
+ SetOpenGlColor (locms.Get(el[2]), minh, maxh, 1);
+ glVertex3dv (lp2);
+ }
+ else
+ {
+ glVertex3dv (lp0);
+ glVertex3dv (lp1);
+ glVertex3dv (lp2);
+ }
-
- } else // not high order
- {
-
- glBegin (GL_TRIANGLES);
-
- Point<3> lp0 = (*mesh) [el.PNum(1)];
- Point<3> lp1 = (*mesh) [el.PNum(2)];
- Point<3> lp2 = (*mesh) [el.PNum(3)];
-
- Vec<3> n = Cross (lp1-lp0, lp2-lp0);
- n.Normalize();
-
- glNormal3d (n(0), n(1), n(2));
-
-
- if (vispar.colormeshsize)
- SetOpenGlColor (locms.Get(el.PNum(1)), minh, maxh, 1);
- glVertex3d (lp0(0), lp0(1), lp0(2));
- if (vispar.colormeshsize)
- SetOpenGlColor (locms.Get(el.PNum(2)), minh, maxh, 1);
- glVertex3d (lp1(0), lp1(1), lp1(2));
- if (vispar.colormeshsize)
- SetOpenGlColor (locms.Get(el.PNum(3)), minh, maxh, 1);
- glVertex3d (lp2(0), lp2(1), lp2(2));
-
- glEnd();
- }
-
+ glEnd();
+ }
+
break;
-
}
case QUAD:
{
// cout << "BuildFilledList: QUAD" << endl;
- CurvedElements & curv = mesh->GetCurvedElements();
+ // CurvedElements & curv = mesh->GetCurvedElements();
if (curv.IsHighOrder() && curv.IsSurfaceElementCurved(sei))
{
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
Point<2> xr[4];
Point<3> xg;
Vec<3> dx, dy, n;
@@ -1015,31 +988,31 @@ namespace netgen
}
glEnd();
+ }
+ else // not high order
- } else // not high order
- {
-
- glBegin (GL_QUADS);
-
- const Point3d & lp1 = mesh->Point (el.PNum(1));
- const Point3d & lp2 = mesh->Point (el.PNum(2));
- const Point3d & lp3 = mesh->Point (el.PNum(4));
- const Point3d & lp4 = mesh->Point (el.PNum(3));
- Vec3d n = Cross (Vec3d (lp1, lp2),
- Vec3d (lp1, Center (lp3, lp4)));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp4.X(), lp4.Y(), lp4.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
-
- glEnd ();
-
- }
+ {
+ glBegin (GL_QUADS);
+
+ const Point<3> & lp1 = mesh->Point (el.PNum(1));
+ const Point<3> & lp2 = mesh->Point (el.PNum(2));
+ const Point<3> & lp3 = mesh->Point (el.PNum(4));
+ const Point<3> & lp4 = mesh->Point (el.PNum(3));
+
+ Vec<3> n = Cross (lp2-lp1, Center (lp3, lp4)-lp1);
+ glNormal3dv (n);
+
+ glVertex3dv (lp1);
+ glVertex3dv (lp2);
+ glVertex3dv (lp4);
+ glVertex3dv (lp3);
+
+ glEnd ();
+ }
break;
}
+
case TRIG6:
{
glBegin (GL_TRIANGLES);
@@ -1050,14 +1023,14 @@ namespace netgen
{ 3, 5, 4 },
{ 4, 5, 6 } };
- for (j = 0; j < 4; j++)
+ for (int j = 0; j < 4; j++)
{
Point3d & lp1 = mesh->Point (el.PNum(trigs[j][0]));
Point3d & lp2 = mesh->Point (el.PNum(trigs[j][1]));
Point3d & lp3 = mesh->Point (el.PNum(trigs[j][2]));
Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
- n /= (n.Length() + 1e-12);
glNormal3dv (&n.X());
+
glVertex3dv (&lp1.X());
glVertex3dv (&lp2.X());
glVertex3dv (&lp3.X());
@@ -1065,6 +1038,7 @@ namespace netgen
glEnd();
break;
}
+
case QUAD6:
{
glBegin (GL_QUADS);
@@ -1072,7 +1046,7 @@ namespace netgen
{ 1, 5, 6, 4 },
{ 5, 2, 3, 6 } };
- for (j = 0; j < 2; j++)
+ for (int j = 0; j < 2; j++)
{
Point3d & lp1 = mesh->Point (el.PNum(quads[j][0]));
Point3d & lp2 = mesh->Point (el.PNum(quads[j][1]));
@@ -1089,30 +1063,64 @@ namespace netgen
glEnd();
break;
}
+
+ case QUAD8:
+ {
+ glBegin (GL_TRIANGLES);
+ static int boundary[] =
+ { 1, 5, 2, 8, 3, 6, 4, 7, 1 };
+
+ Point3d c(0,0,0);
+ for (int j = 0; j < 4; j++)
+ {
+ Point3d & hp = mesh->Point (el[j]);
+ c.X() -= 0.25 * hp.X();
+ c.Y() -= 0.25 * hp.Y();
+ c.Z() -= 0.25 * hp.Z();
+ }
+ for (int j = 4; j < 8; j++)
+ {
+ Point3d & hp = mesh->Point (el[j]);
+ c.X() += 0.5 * hp.X();
+ c.Y() += 0.5 * hp.Y();
+ c.Z() += 0.5 * hp.Z();
+ }
+
+ for (int j = 0; j < 8; j++)
+ {
+ Point3d & lp1 = mesh->Point (el.PNum(boundary[j]));
+ Point3d & lp2 = mesh->Point (el.PNum(boundary[j+1]));
+
+ Vec3d n = Cross (Vec3d (c, lp1), Vec3d (c, lp2));
+ n /= (n.Length() + 1e-12);
+ glNormal3dv (&n.X());
+ glVertex3dv (&lp1.X());
+ glVertex3dv (&lp2.X());
+ glVertex3dv (&c.X());
+ }
+ glEnd();
+ break;
+ }
+
+
default:
PrintSysError ("Cannot draw (2) surface element of type ",
- int(el.GetType()));
+ int(el.GetType()));
}
}
}
glLoadName (0);
glEndList ();
- endtime = clock();
-
+ // endtime = clock();
// cout << "BuildFillList time = " << double(endtime - starttime)/CLOCKS_PER_SEC << endl;
}
void VisualSceneMesh :: BuildLineList()
{
- int j;
SurfaceElementIndex sei;
- if (linetimestamp > mesh->GetTimeStamp () &&
- linetimestamp > selecttimestamp)
- return;
-
if (!lock)
{
lock = new NgLock (mesh->Mutex());
@@ -1122,241 +1130,76 @@ namespace netgen
linetimestamp = NextTimeStamp();
- int checkvicinity = (stlgeometry != NULL) && stldoctor.showvicinity;
+ bool checkvicinity = (stlgeometry != NULL) && stldoctor.showvicinity;
if (linelist)
glDeleteLists (linelist, 1);
-
linelist = glGenLists (1);
glNewList (linelist, GL_COMPILE);
glLineWidth (1.0f);
+
+ int hoplotn = 1 << vispar.subdivisions;
for (sei = 0; sei < mesh->GetNSE(); sei++)
{
const Element2d & el = (*mesh)[sei];
bool drawel = !el.IsDeleted();
- for (j = 0; j < el.GetNP(); j++)
- {
- if (checkvicinity && !stlgeometry->Vicinity(el.GeomInfoPi(j+1).trignum))
+ if (checkvicinity)
+ for (int j = 0; j < el.GetNP(); j++)
+ if (!stlgeometry->Vicinity(el.GeomInfoPi(j+1).trignum))
drawel = 0;
- }
if (!drawel)
continue;
switch (el.GetType())
{
- /*
- case TRIG:
- {
- CurvedElements & curv = mesh->GetCurvedElements();
- if (curv.IsHighOrder() && curv.IsSurfaceElementCurved(sei))
- {
- const MeshTopology & top = mesh->GetTopology();
-
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
- Point<2> xr[3];
- Point<3> xg;
- Vec<3> dx, dy, n;
-
- glBegin (GL_TRIANGLES);
-
- for (int i = 0; i < hoplotn; i++)
- for (int j = 0; j < hoplotn-i; j++)
- for (int k = 0; k < 2; k++)
- {
- if (k == 0)
- {
- xr[0](0) = (double) i/hoplotn; xr[0](1) = (double) j/hoplotn;
- xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double) j/hoplotn;
- xr[2](0) = (double) i/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
- } else
- {
- if (j == hoplotn-i-1) continue;
- xr[0](0) = (double)(i+1)/hoplotn; xr[0](1) = (double) j/hoplotn;
- xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double)(j+1)/hoplotn;
- xr[2](0) = (double) i/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
- };
-
- for (int l=0; l<3; l++)
- {
- Mat<3,2> dxdxi;
-
- curv.CalcSurfaceTransformation (xr[l], sei, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- }
- n = Cross (dx, dy);
- n.Normalize();
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
- }
-
- glEnd();
-
-
- } else // not high order
- {
- glBegin (GL_TRIANGLES);
-
- Point<3> lp0 = mesh->Point (el.PNum(1));
- Point<3> lp1 = mesh->Point (el.PNum(2));
- Point<3> lp2 = mesh->Point (el.PNum(3));
-
- Vec<3> n = Cross (lp1-lp0, lp2-lp0);
- n.Normalize();
-
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (lp0(0), lp0(1), lp0(2));
- glVertex3d (lp1(0), lp1(1), lp1(2));
- glVertex3d (lp2(0), lp2(1), lp2(2));
-
- glEnd();
- }
-
- break;
-
- }
-
- case QUAD:
- {
- // cout << "BuildFilledList: QUAD" << endl;
- CurvedElements & curv = mesh->GetCurvedElements();
- if (curv.IsHighOrder() && curv.IsSurfaceElementCurved(sei))
- {
- const MeshTopology & top = mesh->GetTopology();
-
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
- Point<2> xr[4];
- Point<3> xg;
- Vec<3> dx, dy, n;
-
- glBegin (GL_QUADS);
-
- for (int i = 0; i < hoplotn; i++)
- for (int j = 0; j < hoplotn; j++)
- {
- xr[0](0) = (double) i/hoplotn; xr[0](1) = (double) j/hoplotn;
- xr[1](0) = (double)(i+1)/hoplotn; xr[1](1) = (double) j/hoplotn;
- xr[2](0) = (double)(i+1)/hoplotn; xr[2](1) = (double)(j+1)/hoplotn;
- xr[3](0) = (double) i/hoplotn; xr[3](1) = (double)(j+1)/hoplotn;
-
- for (int l=0; l<4; l++)
- {
- Mat<3,2> dxdxi;
-
- curv.CalcSurfaceTransformation (xr[l], sei, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- }
-
- n = Cross (dx, dy);
- n.Normalize();
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
-
- }
-
- glEnd();
-
-
- } else // not high order
- {
-
- glBegin (GL_QUADS);
-
- const Point3d & lp1 = mesh->Point (el.PNum(1));
- const Point3d & lp2 = mesh->Point (el.PNum(2));
- const Point3d & lp3 = mesh->Point (el.PNum(4));
- const Point3d & lp4 = mesh->Point (el.PNum(3));
- Vec3d n = Cross (Vec3d (lp1, lp2),
- Vec3d (lp1, Center (lp3, lp4)));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp4.X(), lp4.Y(), lp4.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
-
- glEnd ();
-
- }
- break;
- }
- */
-
case TRIG:
{
CurvedElements & curv = mesh->GetCurvedElements();
if (curv.IsHighOrder() && curv.IsSurfaceElementCurved(sei))
{
- Point<2> xr;
Point<3> xg;
- Vec<3> n;
-
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
- glBegin (GL_LINE_STRIP);
+ glBegin (GL_LINE_LOOP);
- for (int side = 0; side < 3; side++)
+ for (int i = 0; i < hoplotn; i++)
{
- for (int i = 0; i <= hoplotn; i++)
- {
- switch (side)
- {
- case 0:
- xr(0) = (double) i/hoplotn;
- xr(1) = 0.;
- break;
- case 1:
- xr(0) = (double) (hoplotn-i)/hoplotn;
- xr(1) = (double) i/hoplotn;
- break;
- case 2:
- xr(0) = 0.;
- xr(1) = (double) (hoplotn-i)/hoplotn;
- break;
- }
-
- Mat<3,2> dxdxi;
-
- curv.CalcSurfaceTransformation (xr, sei, xg, dxdxi);
- glVertex3d (xg(0), xg(1), xg(2));
-
- }
+ Point<2> xr (double(i) / hoplotn, 0);
+ curv.CalcSurfaceTransformation (xr, sei, xg);
+ glVertex3dv (xg);
+ }
+ for (int i = 0; i < hoplotn; i++)
+ {
+ Point<2> xr (double(hoplotn-i) / hoplotn, double(i)/hoplotn);
+ curv.CalcSurfaceTransformation (xr, sei, xg);
+ glVertex3dv (xg);
+ }
+ for (int i = 0; i < hoplotn; i++)
+ {
+ Point<2> xr (0, double(hoplotn-i) / hoplotn);
+ curv.CalcSurfaceTransformation (xr, sei, xg);
+ glVertex3dv (xg);
+ }
- }
glEnd();
-
- } else {
-
+ }
+ else
+ {
glBegin (GL_TRIANGLES);
- Point<3> lp0 = (*mesh) [el.PNum(1)];
- Point<3> lp1 = (*mesh) [el.PNum(2)];
- Point<3> lp2 = (*mesh) [el.PNum(3)];
+ const Point<3> & lp0 = (*mesh) [el[0]];
+ const Point<3> & lp1 = (*mesh) [el[1]];
+ const Point<3> & lp2 = (*mesh) [el[2]];
glVertex3dv (lp0);
- glVertex3d (lp1(0), lp1(1), lp1(2));
- glVertex3d (lp2(0), lp2(1), lp2(2));
+ glVertex3dv (lp1);
+ glVertex3dv (lp2);
glEnd();
-
}
break;
@@ -1371,9 +1214,6 @@ namespace netgen
Point<2> xr;
Point<3> xg;
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
glBegin (GL_LINE_STRIP);
for (int side = 0; side < 4; side++)
@@ -1400,9 +1240,7 @@ namespace netgen
break;
}
- Mat<3,2> dxdxi;
-
- curv.CalcSurfaceTransformation (xr, sei, xg, dxdxi);
+ curv.CalcSurfaceTransformation (xr, sei, xg);
glVertex3d (xg(0), xg(1), xg(2));
}
@@ -1420,7 +1258,6 @@ namespace netgen
const Point3d & lp4 = mesh->Point (el.PNum(3));
Vec3d n = Cross (Vec3d (lp1, lp2),
Vec3d (lp1, Center (lp3, lp4)));
- n /= (n.Length() + 1e-12);
glNormal3d (n.X(), n.Y(), n.Z());
glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
@@ -1442,7 +1279,7 @@ namespace netgen
{ 2, 4 }, { 3, 4 } };
glBegin (GL_LINES);
- for (j = 0; j < 6; j++)
+ for (int j = 0; j < 6; j++)
{
const Point3d & lp1 = mesh->Point (el.PNum(lines[j][0]));
const Point3d & lp2 = mesh->Point (el.PNum(lines[j][1]));
@@ -1464,7 +1301,28 @@ namespace netgen
glBegin (GL_LINES);
- for (j = 0; j < 6; j++)
+ for (int j = 0; j < 6; j++)
+ {
+ const Point3d & lp1 = mesh->Point (el.PNum(lines[j][0]));
+ const Point3d & lp2 = mesh->Point (el.PNum(lines[j][1]));
+
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ }
+ glEnd ();
+ break;
+ }
+
+ case QUAD8:
+ {
+ int lines[8][2] = {
+ { 1, 5 }, { 2, 5 }, { 3, 6 }, { 4, 6 },
+ { 1, 7 }, { 4, 7 }, { 2, 8 }, { 3, 8 }
+ };
+
+ glBegin (GL_LINES);
+
+ for (int j = 0; j < 8; j++)
{
const Point3d & lp1 = mesh->Point (el.PNum(lines[j][0]));
const Point3d & lp2 = mesh->Point (el.PNum(lines[j][1]));
@@ -1476,20 +1334,85 @@ namespace netgen
break;
}
- default:
- PrintSysError ("Cannot draw (4) surface element of type ",
- int(el.GetType()));
- }
- }
-
- glEndList ();
- }
+
+
+ default:
+ PrintSysError ("Cannot draw (4) surface element of type ",
+ int(el.GetType()));
+ }
+ }
+
+ glEndList ();
+ }
void VisualSceneMesh :: BuildPointNumberList()
{
;
}
+
+
+
+
+
+ inline long int Fact (int n)
+ {
+ long int res = 1;
+ for (int i = 2; i <= n; i++)
+ res *= i;
+ return res;
+ }
+ inline int Binom (int n, int i)
+ {
+ return Fact(n) / Fact(i) / Fact(n-i);
+ }
+
+ void ToBernstein (int order, Point<3> * pts, int stride)
+ {
+ static DenseMatrix mat, inv;
+ static Vector vec1, vec2;
+
+ if (mat.Height () != order+1)
+ {
+ mat.SetSize (order+1);
+ inv.SetSize (order+1);
+ vec1.SetSize (order+1);
+ vec2.SetSize (order+1);
+ for (int i = 0; i <= order; i++)
+ {
+ double x = double(i) / order;
+ for (int j = 0; j <= order; j++)
+ mat(i,j) = Binom (order, j) * pow (x, j) * pow (1-x, order-j);
+ }
+
+ CalcInverse (mat, inv);
+ }
+
+ for (int i = 0; i < 3; i++)
+ {
+ for (int j = 0; j <= order; j++)
+ vec1(j) = pts[j*stride](i);
+
+ inv.Mult (vec1, vec2);
+
+ for (int j = 0; j <= order; j++)
+ pts[j*stride](i) = vec2(j);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
void VisualSceneMesh :: BuildTetList()
{
@@ -1613,6 +1536,9 @@ namespace netgen
if (!drawtet) continue;
int ind = el.GetIndex() % 4;
+ if (vispar.drawmetispartition && (el.GetPartition()!=-1))
+ ind = el.GetPartition() % 4;
+ (*testout) << "ind = " << ind << endl;
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, tetcols[ind]);
@@ -1627,455 +1553,560 @@ namespace netgen
Element2d & face = faces.Elem(j+1);
if (curv.IsHighOrder() && curv.IsElementCurved(i-1))
- {
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
+ {
+ int hoplotn = 1 << vispar.subdivisions;
+ // int hoplotn = curv.GetNVisualSubsecs();
- const Point3d * facepoint = MeshTopology :: GetVertices (TET);
- const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TET);
+ const Point3d * facepoint = MeshTopology :: GetVertices (TET);
+ const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TET);
- Vec<3> x0,x1,d0,d1;
- Point<3> xg;
- x0 = facepoint[face.PNum(3)-1] - facepoint[face.PNum(1)-1];
- x1 = facepoint[face.PNum(2)-1] - facepoint[face.PNum(1)-1];
- x0.Normalize();
- x1.Normalize();
-
- for (int m0 = 0; m0 < hoplotn; m0++)
- for (int m1 = 0; m1 < hoplotn-m0; m1++)
- for (int k = 0; k < 2; k++)
- {
- Vec<3> dx, dy, dz, n;
- Point<4> la[3];
- int l;
- for (l = 0; l<3; l++) la[l] = Point<4>(0.,0.,0.,0.);
-
- if (k == 0)
+ Vec<3> x0,x1,d0,d1;
+ Point<3> xg;
+ x0 = facepoint[face.PNum(3)-1] - facepoint[face.PNum(1)-1];
+ x1 = facepoint[face.PNum(2)-1] - facepoint[face.PNum(1)-1];
+ x0.Normalize();
+ x1.Normalize();
+
+ for (int m0 = 0; m0 < hoplotn; m0++)
+ for (int m1 = 0; m1 < hoplotn-m0; m1++)
+ for (int k = 0; k < 2; k++)
{
- la[0](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[0](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+ Vec<3> dx, dy, dz, n;
+ Point<4> la[3];
+ int l;
+ for (l = 0; l<3; l++) la[l] = Point<4>(0.,0.,0.,0.);
- la[1](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[1](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
-
- la[2](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[2](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
- } else
- {
- if (m1 == hoplotn-m0-1) continue;
- la[0](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[0](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
-
- la[1](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[1](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
-
- la[2](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[2](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
- }
+ if (k == 0)
+ {
+ la[0](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[0](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+
+ la[1](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[1](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
+
+ la[2](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[2](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
+ } else
+ {
+ if (m1 == hoplotn-m0-1) continue;
+ la[0](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[0](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+
+ la[1](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[1](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
+
+ la[2](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[2](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
+ }
- for (l = 0; l<3; l++)
- {
- Mat<3,3> dxdxi;
- Point<3> xr( la[l](0), la[l](1), la[l](2) );
- curv.CalcElementTransformation (xr, i-1, xg, dxdxi);
- for (int i = 0; i < 3; i++)
+ for (l = 0; l<3; l++)
{
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- dz(i) = dxdxi(i,2);
+ Mat<3,3> dxdxi;
+ Point<3> xr( la[l](0), la[l](1), la[l](2) );
+ curv.CalcElementTransformation (xr, i-1, xg, dxdxi);
+ for (int i = 0; i < 3; i++)
+ {
+ dx(i) = dxdxi(i,0);
+ dy(i) = dxdxi(i,1);
+ dz(i) = dxdxi(i,2);
+ }
+
+ d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
+ d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
+ n = Cross (d0, d1);
+ glNormal3d ( n(0), n(1), n(2));
+ glVertex3d (xg(0), xg(1), xg(2));
}
-
- d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
- d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
- n = Cross (d0, d1);
- glNormal3d ( n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
}
- }
- } else {
- const Point3d & lp1 = mesh->Point (el.PNum(face.PNum(1)));
- const Point3d & lp2 = mesh->Point (el.PNum(face.PNum(2)));
- const Point3d & lp3 = mesh->Point (el.PNum(face.PNum(3)));
- Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ } else {
+ const Point3d & lp1 = mesh->Point (el.PNum(face.PNum(1)));
+ const Point3d & lp2 = mesh->Point (el.PNum(face.PNum(2)));
+ const Point3d & lp3 = mesh->Point (el.PNum(face.PNum(3)));
+ Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
+ n /= (n.Length()+1e-12);
+ glNormal3d (n.X(), n.Y(), n.Z());
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
}
- }
- glEnd();
- }
+ glEnd();
+ }
+ }
}
- }
- glEndList ();
+ glEndList ();
#else
+ if (tettimestamp > mesh->GetTimeStamp () &&
+ tettimestamp > vispar.clipplanetimestamp )
+ return;
+
+ if (!lock)
+ {
+ lock = new NgLock (mesh->Mutex());
+ lock -> Lock();
+ }
- int i, j, k, l;
- ARRAY<Element2d> faces;
+ tettimestamp = NextTimeStamp();
- if (tettimestamp > mesh->GetTimeStamp () &&
- tettimestamp > vispar.clipplanetimestamp )
- return;
+ if (tetlist)
+ glDeleteLists (tetlist, 1);
- if (!lock)
- {
- lock = new NgLock (mesh->Mutex());
- lock -> Lock();
- }
- tettimestamp = NextTimeStamp();
+ tetlist = glGenLists (1);
+ glNewList (tetlist, GL_COMPILE);
- if (tetlist)
- glDeleteLists (tetlist, 1);
- tetlist = glGenLists (1);
- glNewList (tetlist, GL_COMPILE);
+ int i, j, k, l;
+ ARRAY<Element2d> faces;
- BitArray shownode(mesh->GetNP());
- if (vispar.clipenable)
- {
- shownode.Clear();
- for (i = 1; i <= shownode.Size(); i++)
+ BitArray shownode(mesh->GetNP());
+ if (vispar.clipenable)
{
- Point3d p = mesh->Point(i);
+ shownode.Clear();
+ for (i = 1; i <= shownode.Size(); i++)
+ {
+ Point3d p = mesh->Point(i);
- double val =
- p.X() * clipplane[0] +
- p.Y() * clipplane[1] +
- p.Z() * clipplane[2] +
- clipplane[3];
+ double val =
+ p.X() * clipplane[0] +
+ p.Y() * clipplane[1] +
+ p.Z() * clipplane[2] +
+ clipplane[3];
- if (val > 0)
- shownode.Set (i);
+ if (val > 0)
+ shownode.Set (i);
+ }
}
- }
- else
- shownode.Set();
+ else
+ shownode.Set();
- static float tetcols[][4] =
- {
- { 1.0f, 1.0f, 0.0f, 1.0f },
- { 1.0f, 0.0f, 0.0f, 1.0f },
- { 0.0f, 1.0f, 0.0f, 1.0f },
- { 0.0f, 0.0f, 1.0f, 1.0f }
- };
+ static float tetcols[][4] =
+ {
+ { 1.0f, 1.0f, 0.0f, 1.0f },
+ { 1.0f, 0.0f, 0.0f, 1.0f },
+ { 0.0f, 1.0f, 0.0f, 1.0f },
+ { 0.0f, 0.0f, 1.0f, 1.0f }
+ };
- // ARRAY<int> elfaces;
+ CurvedElements & curv = mesh->GetCurvedElements();
- // const MeshTopology & top = mesh->GetTopology();
- CurvedElements & curv = mesh->GetCurvedElements();
-
+ for (ElementIndex ei = 0; ei < mesh->GetNE(); ei++)
+ {
+ i = ei + 1;
- for (i = 1; i <= mesh->GetNE(); i++)
- {
- if (vispar.drawtetsdomain > 0 &&
- vispar.drawtetsdomain != mesh->VolumeElement(i).GetIndex())
- continue;
+ if (vispar.drawtetsdomain > 0 &&
+ vispar.drawtetsdomain != mesh->VolumeElement(i).GetIndex())
+ continue;
- if (mesh->VolumeElement(i).GetType() == TET)
- {
- // copy to be thread-safe
- Element el = mesh->VolumeElement (i);
- el.GetSurfaceTriangles (faces);
+ const Element & el = (*mesh)[ei];
- if (el.PNum(1))
+ if (el.GetType() == TET && !el.IsDeleted())
{
- int drawtet = 1;
- for (j = 1; j <= el.GetNP(); j++)
- if (!shownode.Test(el.PNum(j)))
+
+ bool drawtet = 1;
+ for (j = 0; j < 4; j++)
+ if (!shownode.Test(el[j]))
drawtet = 0;
if (!drawtet) continue;
-
- Point3d c;
- if (vispar.shrink < 1)
- c = Center (Center (mesh->Point (el.PNum(1)),
- mesh->Point (el.PNum(2))),
- Center (mesh->Point (el.PNum(3)),
- mesh->Point (el.PNum(4))));
-
-
-
+
+
int ind = el.GetIndex() % 4;
+ if (vispar.drawmetispartition && (el.GetPartition()!=-1))
+ ind = el.GetPartition() % 4;
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, tetcols[ind]);
+
+
+ if (curv.IsHighOrder() && curv.IsElementCurved(ei))
+ {
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (TET);
+ const Point3d * vertices = MeshTopology :: GetVertices (TET);
+
+ Point<3> grid[11][11];
+ Point<3> fpts[3];
+ int order = vispar.subdivisions+1;
+
+ for (int trig = 0; trig < 4; trig++)
+ {
+ for (int j = 0; j < 3; j++)
+ fpts[j] = vertices[faces[trig][j]-1];
+
+ static Point<3> c(0.25, 0.25, 0.25);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 3; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[3] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ double(iy)/order };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) = lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l);
+
+ curv.CalcElementTransformation (xl, i-1, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 0.999, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
+ }
+ }
- // top.GetElementFaces (i, elfaces);
-
- glBegin (GL_TRIANGLES);
+ else
- for (j = 0; j < faces.Size(); j++)
{
- Element2d & face = faces.Elem(j+1);
+ el.GetSurfaceTriangles (faces);
+
+ Point3d c;
+ if (vispar.shrink < 1)
+ c = Center (Center (mesh->Point (el.PNum(1)),
+ mesh->Point (el.PNum(2))),
+ Center (mesh->Point (el.PNum(3)),
+ mesh->Point (el.PNum(4))));
+
- if (curv.IsHighOrder() && curv.IsElementCurved(i-1))
+ glBegin (GL_TRIANGLES);
+
+ for (j = 0; j < faces.Size(); j++)
{
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
+ const Element2d & face = faces[j];
+
+ /*
+ if (curv.IsHighOrder() && curv.IsElementCurved(i-1))
+ {
+ int hoplotn = 1 << vispar.subdivisions;
+ // int hoplotn = curv.GetNVisualSubsecs();
- const Point3d * facepoint = MeshTopology :: GetVertices (TET);
- const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TET);
+ const Point3d * facepoint = MeshTopology :: GetVertices (TET);
+ const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TET);
- Vec<3> x0,x1,d0,d1;
- Point<3> xg;
- x0 = facepoint[face.PNum(3)-1] - facepoint[face.PNum(1)-1];
- x1 = facepoint[face.PNum(2)-1] - facepoint[face.PNum(1)-1];
- x0.Normalize();
- x1.Normalize();
+ Vec<3> x0,x1,d0,d1;
+ Point<3> xg;
+ x0 = facepoint[face.PNum(3)-1] - facepoint[face.PNum(1)-1];
+ x1 = facepoint[face.PNum(2)-1] - facepoint[face.PNum(1)-1];
+ x0.Normalize();
+ x1.Normalize();
- for (int m0 = 0; m0 < hoplotn; m0++)
+ for (int m0 = 0; m0 < hoplotn; m0++)
for (int m1 = 0; m1 < hoplotn-m0; m1++)
- for (k = 0; k < 2; k++)
- {
- Vec<3> dx, dy, dz, n;
- Point<4> la[3];
+ for (k = 0; k < 2; k++)
+ {
+ Vec<3> dx, dy, dz, n;
+ Point<4> la[3];
- for (l = 0; l<3; l++) la[l] = Point<4>(0.,0.,0.,0.);
+ for (l = 0; l<3; l++) la[l] = Point<4>(0.,0.,0.,0.);
- if (k == 0)
- {
- la[0](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[0](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+ if (k == 0)
+ {
+ la[0](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[0](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+
+ la[1](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[1](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
+
+ la[2](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[2](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
+ } else
+ {
+ if (m1 == hoplotn-m0-1) continue;
+ la[0](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[0](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
+
+ la[1](face.PNum(1)-1) = (m0 )/(double)hoplotn;
+ la[1](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
+ la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
+
+ la[2](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
+ la[2](face.PNum(2)-1) = (m1 )/(double)hoplotn;
+ la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
+ }
- la[1](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[1](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
+ for (l = 0; l<3; l++)
+ {
+ Mat<3,3> dxdxi;
+ Point<3> xr( la[l](0), la[l](1), la[l](2) );
+ curv.CalcElementTransformation (xr, i-1, xg, dxdxi);
+ for (int i = 0; i < 3; i++)
+ {
+ dx(i) = dxdxi(i,0);
+ dy(i) = dxdxi(i,1);
+ dz(i) = dxdxi(i,2);
+ }
- la[2](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[2](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
- } else
- {
- if (m1 == hoplotn-m0-1) continue;
- la[0](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[0](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
-
- la[1](face.PNum(1)-1) = (m0 )/(double)hoplotn;
- la[1](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
- la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
-
- la[2](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
- la[2](face.PNum(2)-1) = (m1 )/(double)hoplotn;
- la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
- }
+ d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
+ d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
+ n = Cross (d0, d1);
+ glNormal3d ( n(0), n(1), n(2));
+ glVertex3d (xg(0), xg(1), xg(2));
+ }
+ }
- for (l = 0; l<3; l++)
- {
- Mat<3,3> dxdxi;
- Point<3> xr( la[l](0), la[l](1), la[l](2) );
- curv.CalcElementTransformation (xr, i-1, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- dz(i) = dxdxi(i,2);
- }
+ } else
+ */
+ {
+ Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
+ Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
+ Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
+ Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
+ n /= (n.Length()+1e-12);
+ glNormal3d (n.X(), n.Y(), n.Z());
+
+ if (vispar.shrink < 1)
+ {
+ lp1 = c + vispar.shrink * (lp1 - c);
+ lp2 = c + vispar.shrink * (lp2 - c);
+ lp3 = c + vispar.shrink * (lp3 - c);
+ }
- d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
- d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
- n = Cross (d0, d1);
- glNormal3d ( n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
- }
-
- } else {
- Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
- Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
- Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
- Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
-
- if (vispar.shrink < 1)
- {
- lp1 = c + vispar.shrink * (lp1 - c);
- lp2 = c + vispar.shrink * (lp2 - c);
- lp3 = c + vispar.shrink * (lp3 - c);
- }
-
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- }
- }
-
- glEnd();
- }
- }
- }
- glEndList ();
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
+ }
+
+ glEnd();
+ }
+ }
+ }
+
+ glEndList ();
+
+#endif
+ }
-#endif
-}
-
-void VisualSceneMesh :: BuildPrismList()
-{
- int i, j;
+ void VisualSceneMesh :: BuildPrismList()
+ {
+ if (prismtimestamp > mesh->GetTimeStamp () &&
+ prismtimestamp > vispar.clipplanetimestamp )
+ return;
- prismlist = glGenLists (1);
- glNewList (prismlist, GL_COMPILE);
+ if (!lock)
+ {
+ lock = new NgLock (mesh->Mutex());
+ lock -> Lock();
+ }
- static float prismcol[] = { 0.0f, 1.0f, 1.0f, 1.0f };
- glLineWidth (1.0f);
+ prismtimestamp = NextTimeStamp();
- ARRAY<Element2d> faces;
- for (i = 1; i <= mesh->GetNE(); i++)
- {
- if (mesh->VolumeElement(i).GetType() == PRISM)
- {
- // copy to be thread-safe
- Element el = mesh->VolumeElement (i);
- el.GetSurfaceTriangles (faces);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, prismcol);
- if (el.PNum(1))
- {
- CurvedElements & curv = mesh->GetCurvedElements();
- if (curv.IsHighOrder() && curv.IsElementCurved(i-1))
- {
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
+ if (prismlist)
+ glDeleteLists (prismlist, 1);
- const Point3d * facepoint = MeshTopology :: GetVertices (TRIG);
- const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TRIG);
+ prismlist = glGenLists (1);
+ glNewList (prismlist, GL_COMPILE);
- glBegin (GL_TRIANGLES);
+ static float prismcol[] = { 0.0f, 1.0f, 1.0f, 1.0f };
+ glLineWidth (1.0f);
- for (int trig = 0; trig<2; trig++)
- {
-
- Vec<3> x0,x1,d0,d1;
- x0 = facepoint[1] - facepoint[2];
- x1 = facepoint[0] - facepoint[2];
- x0.Normalize();
- x1.Normalize();
- if (trig == 1) Swap (x0,x1);
+ ARRAY<Element2d> faces;
- Point<3> xr[3];
- Point<3> xg;
- Vec<3> dx, dy, dz, n;
+
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, prismcol);
- for (int i1 = 0; i1 < hoplotn; i1++)
- for (int j1 = 0; j1 < hoplotn-i1; j1++)
- for (int k = 0; k < 2; k++)
- {
- if (k == 0)
- {
- xr[0](0) = (double) i1/hoplotn; xr[0](1) = (double) j1/hoplotn;
- xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double) j1/hoplotn;
- xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
- } else
- {
- if (j1 == hoplotn-i1-1) continue;
- xr[0](0) = (double)(i1+1)/hoplotn; xr[0](1) = (double) j1/hoplotn;
- xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double)(j1+1)/hoplotn;
- xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
- };
-
- for (int l=0; l<3; l++)
- {
- Mat<3,3> dxdxi;
- xr[l](2) = (double) trig;
- curv.CalcElementTransformation (xr[l], i-1, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- dz(i) = dxdxi(i,2);
- }
+ for (ElementIndex ei = 0; ei < mesh->GetNE(); ei++)
+ {
+ const Element & el = (*mesh)[ei];
+ if (el.GetType() == PRISM && !el.IsDeleted())
+ {
+ int j;
+ int i = ei + 1;
- Vec<3> d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
- Vec<3> d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
- n = Cross (d1, d0);
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
- }
+ CurvedElements & curv = mesh->GetCurvedElements();
+ if (curv.IsHighOrder() && curv.IsElementCurved(ei))
+ {
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (PRISM);
+ const Point3d * vertices = MeshTopology :: GetVertices (PRISM);
+
+ Point<3> grid[11][11];
+ Point<3> fpts[4];
+ int order = vispar.subdivisions+1;
+
+ for (int trig = 0; trig < 2; trig++)
+ {
+ for (int j = 0; j < 3; j++)
+ fpts[j] = vertices[faces[trig][j]-1];
+
+ static Point<3> c(1.0/3.0, 1.0/3.0, 0.5);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 3; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
- }
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[3] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ double(iy)/order };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) = lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l);
+
+ curv.CalcElementTransformation (xl, i-1, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 0.999, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
+ }
+
+ for (int quad = 2; quad < 5; quad++)
+ {
+ for (int j = 0; j < 4; j++)
+ fpts[j] = vertices[faces[quad][j]-1];
+
+ static Point<3> c(1.0/3.0, 1.0/3.0, 0.5);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 4; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[4] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * ( double(iy)/order),
+ (1-double(ix)/order) * ( double(iy)/order) };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) =
+ lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l) + lami[3] * fpts[3](l);
+
+ curv.CalcElementTransformation (xl, ei, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 1.0, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
+ }
- glEnd ();
- glBegin (GL_QUADS);
- for (int quad = 0; quad<3; quad++)
- {
- const Point3d * facepoint = MeshTopology :: GetVertices (PRISM);
- Vec<3> x0,x1;
- int xyz;
- switch (quad)
- {
- case 0:
- x0 = facepoint[5] - facepoint[2];
- x1 = facepoint[0] - facepoint[2];
- xyz = 0;
- break;
- case 1:
- x0 = facepoint[4] - facepoint[0];
- x1 = facepoint[1] - facepoint[0];
- xyz = 0;
- break;
- case 2:
- x0 = facepoint[1] - facepoint[2];
- x1 = facepoint[5] - facepoint[2];
- xyz = 1;
- break;
- }
+ /*
+ int hoplotn = 1 << vispar.subdivisions;
+ // int hoplotn = curv.GetNVisualSubsecs();
- x0.Normalize();
- x1.Normalize();
+ const Point3d * facepoint = MeshTopology :: GetVertices (TRIG);
+ const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TRIG);
- Swap (x0,x1);
+ glBegin (GL_TRIANGLES);
- Point<3> xr[4];
- Point<3> xg;
- Vec<3> dx, dy, dz, n;
+ for (int trig = 0; trig<2; trig++)
+ {
+
+ Vec<3> x0,x1,d0,d1;
+ x0 = facepoint[1] - facepoint[2];
+ x1 = facepoint[0] - facepoint[2];
+ x0.Normalize();
+ x1.Normalize();
+ if (trig == 1) swap (x0,x1);
+
+ Point<3> xr[3];
+ Point<3> xg;
+ Vec<3> dx, dy, dz, n;
- for (int i1 = 0; i1 < hoplotn; i1++)
- for (int j1 = 0; j1 < hoplotn; j1++)
+ for (int i1 = 0; i1 < hoplotn; i1++)
+ for (int j1 = 0; j1 < hoplotn-i1; j1++)
+ for (int k = 0; k < 2; k++)
{
- xr[0](xyz) = (double) i1/hoplotn; xr[0](2) = (double) j1/hoplotn;
- xr[1](xyz) = (double)(i1+1)/hoplotn; xr[1](2) = (double) j1/hoplotn;
- xr[2](xyz) = (double)(i1+1)/hoplotn; xr[2](2) = (double)(j1+1)/hoplotn;
- xr[3](xyz) = (double) i1/hoplotn; xr[3](2) = (double)(j1+1)/hoplotn;
+ if (k == 0)
+ {
+ xr[0](0) = (double) i1/hoplotn; xr[0](1) = (double) j1/hoplotn;
+ xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double) j1/hoplotn;
+ xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
+ } else
+ {
+ if (j1 == hoplotn-i1-1) continue;
+ xr[0](0) = (double)(i1+1)/hoplotn; xr[0](1) = (double) j1/hoplotn;
+ xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double)(j1+1)/hoplotn;
+ xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
+ };
- for (int l=0; l<4; l++)
+ for (int l=0; l<3; l++)
{
- switch (quad)
- {
- case 0: xr[l](1) = 0; break;
- case 1: xr[l](1) = 1-xr[l](0); break;
- case 2: xr[l](0) = 0; break;
- }
-
Mat<3,3> dxdxi;
+ xr[l](2) = (double) trig;
curv.CalcElementTransformation (xr[l], i-1, xg, dxdxi);
for (int i = 0; i < 3; i++)
{
@@ -2091,461 +2122,803 @@ void VisualSceneMesh :: BuildPrismList()
glVertex3d (xg(0), xg(1), xg(2));
}
}
- }
- glEnd ();
- } else
- {
- Point3d c(0,0,0);
- if (vispar.shrink < 1)
+
+ }
+
+ glEnd ();
+
+ glBegin (GL_QUADS);
+
+ for (int quad = 0; quad<3; quad++)
+ {
+ const Point3d * facepoint = MeshTopology :: GetVertices (PRISM);
+
+ Vec<3> x0,x1;
+ int xyz;
+
+ switch (quad)
{
- for (j = 1; j <= 6; j++)
- {
- Point3d p = mesh->Point(el.PNum(j));
- c.X() += p.X() / 6;
- c.Y() += p.Y() / 6;
- c.Z() += p.Z() / 6;
- }
+ case 0:
+ x0 = facepoint[5] - facepoint[2];
+ x1 = facepoint[0] - facepoint[2];
+ xyz = 0;
+ break;
+ case 1:
+ x0 = facepoint[4] - facepoint[0];
+ x1 = facepoint[1] - facepoint[0];
+ xyz = 0;
+ break;
+ case 2:
+ x0 = facepoint[1] - facepoint[2];
+ x1 = facepoint[5] - facepoint[2];
+ xyz = 1;
+ break;
}
- glBegin (GL_TRIANGLES);
+ x0.Normalize();
+ x1.Normalize();
- for (j = 1; j <= faces.Size(); j++)
+ swap (x0,x1);
+
+ Point<3> xr[4];
+ Point<3> xg;
+ Vec<3> dx, dy, dz, n;
+
+ for (int i1 = 0; i1 < hoplotn; i1++)
+ for (int j1 = 0; j1 < hoplotn; j1++)
+ {
+ xr[0](xyz) = (double) i1/hoplotn; xr[0](2) = (double) j1/hoplotn;
+ xr[1](xyz) = (double)(i1+1)/hoplotn; xr[1](2) = (double) j1/hoplotn;
+ xr[2](xyz) = (double)(i1+1)/hoplotn; xr[2](2) = (double)(j1+1)/hoplotn;
+ xr[3](xyz) = (double) i1/hoplotn; xr[3](2) = (double)(j1+1)/hoplotn;
+
+ for (int l=0; l<4; l++)
+ {
+ switch (quad)
+ {
+ case 0: xr[l](1) = 0; break;
+ case 1: xr[l](1) = 1-xr[l](0); break;
+ case 2: xr[l](0) = 0; break;
+ }
+
+ Mat<3,3> dxdxi;
+ curv.CalcElementTransformation (xr[l], i-1, xg, dxdxi);
+ for (int i = 0; i < 3; i++)
+ {
+ dx(i) = dxdxi(i,0);
+ dy(i) = dxdxi(i,1);
+ dz(i) = dxdxi(i,2);
+ }
+
+ Vec<3> d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
+ Vec<3> d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
+ n = Cross (d1, d0);
+ glNormal3d (n(0), n(1), n(2));
+ glVertex3d (xg(0), xg(1), xg(2));
+ }
+ }
+ }
+ glEnd ();
+ */
+ }
+ else
+ {
+ Point3d c(0,0,0);
+ if (vispar.shrink < 1)
+ {
+ for (j = 1; j <= 6; j++)
{
- Element2d & face = faces.Elem(j);
- Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
- Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
- Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
- Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
- if (vispar.shrink < 1)
- {
- lp1 = c + vispar.shrink * (lp1 - c);
- lp2 = c + vispar.shrink * (lp2 - c);
- lp3 = c + vispar.shrink * (lp3 - c);
- }
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ Point3d p = mesh->Point(el.PNum(j));
+ c.X() += p.X() / 6;
+ c.Y() += p.Y() / 6;
+ c.Z() += p.Z() / 6;
+ }
+ }
+
+ el.GetSurfaceTriangles (faces);
+ glBegin (GL_TRIANGLES);
+ for (j = 1; j <= faces.Size(); j++)
+ {
+ Element2d & face = faces.Elem(j);
+ Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
+ Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
+ Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
+ Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
+ n /= (n.Length()+1e-12);
+ glNormal3d (n.X(), n.Y(), n.Z());
+ if (vispar.shrink < 1)
+ {
+ lp1 = c + vispar.shrink * (lp1 - c);
+ lp2 = c + vispar.shrink * (lp2 - c);
+ lp3 = c + vispar.shrink * (lp3 - c);
}
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
- glEnd();
+ glEnd();
+ }
+ }
+ }
+ glEndList ();
+ }
+
+
+
+
+ void VisualSceneMesh :: BuildHexList()
+ {
+ if (hextimestamp > mesh->GetTimeStamp () &&
+ hextimestamp > vispar.clipplanetimestamp )
+ return;
+
+ if (!lock)
+ {
+ lock = new NgLock (mesh->Mutex());
+ lock -> Lock();
+ }
+
+ hextimestamp = NextTimeStamp();
+
+ if (hexlist) glDeleteLists (hexlist, 1);
+
+ hexlist = glGenLists (1);
+ glNewList (hexlist, GL_COMPILE);
+
+
+ static float hexcol[] = { 1.0f, 1.0f, 0.0f, 1.0f };
+ glLineWidth (1.0f);
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, hexcol);
+
+ ARRAY<Element2d> faces;
+ int hoplotn = 1 << vispar.subdivisions;
+
+ for (ElementIndex ei = 0; ei < mesh->GetNE(); ei++)
+ {
+ const Element & el = (*mesh)[ei];
+ if (el.GetType() == HEX && !el.IsDeleted())
+ {
+ CurvedElements & curv = mesh->GetCurvedElements();
+ if (curv.IsHighOrder() && curv.IsElementCurved(ei))
+ {
+ /* // classical
+ glBegin (GL_QUADS);
+
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (HEX);
+ const Point3d * vertices = MeshTopology :: GetVertices (HEX);
+
+ Point<3> grid[33][33];
+ Vec<3> gridn[33][33];
+ Point<3> fpts[4];
+ for (int quad = 0; quad<6; quad++)
+ {
+ for (int j = 0; j < 4; j++)
+ fpts[j] = vertices[faces[quad][j]-1];
+
+ static Point<3> c(0.5, 0.5, 0.5);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 4; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ Vec<3> taux = fpts[1]-fpts[0];
+ Vec<3> tauy = fpts[3]-fpts[0];
+
+ for (int ix = 0; ix <= hoplotn; ix++)
+ for (int iy = 0; iy <= hoplotn; iy++)
+ {
+ Point<3> xl;
+ Mat<3,3> dxdxi;
+ double lami[4] =
+ { (1-double(ix)/hoplotn) * (1-double(iy)/hoplotn),
+ ( double(ix)/hoplotn) * (1-double(iy)/hoplotn),
+ ( double(ix)/hoplotn) * ( double(iy)/hoplotn),
+ (1-double(ix)/hoplotn) * ( double(iy)/hoplotn) };
+ for (int l = 0; l < 3; l++)
+ xl(l) = lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l) + lami[3] * fpts[3](l);
+
+ curv.CalcElementTransformation (xl, ei, grid[ix][iy], dxdxi);
+
+ Vec<3> gtaux = dxdxi * taux;
+ Vec<3> gtauy = dxdxi * tauy;
+ gridn[ix][iy] = Cross (gtauy, gtaux).Normalize();
+ }
+
+ for (int ix = 0; ix < hoplotn; ix++)
+ for (int iy = 0; iy < hoplotn; iy++)
+ {
+ glNormal3dv (gridn[ix][iy]);
+ glVertex3dv (grid[ix][iy]);
+
+ glNormal3dv (gridn[ix+1][iy]);
+ glVertex3dv (grid[ix+1][iy]);
+
+ glNormal3dv (gridn[ix+1][iy+1]);
+ glVertex3dv (grid[ix+1][iy+1]);
+
+ glNormal3dv (gridn[ix][iy+1]);
+ glVertex3dv (grid[ix][iy+1]);
+ }
+ }
+
+ glEnd ();
+ */
+
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (HEX);
+ const Point3d * vertices = MeshTopology :: GetVertices (HEX);
+
+ Point<3> grid[11][11];
+ Point<3> fpts[4];
+ int order = vispar.subdivisions+1;
+
+ for (int quad = 0; quad<6; quad++)
+ {
+ for (int j = 0; j < 4; j++)
+ fpts[j] = vertices[faces[quad][j]-1];
+
+ static Point<3> c(0.5, 0.5, 0.5);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 4; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[4] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * ( double(iy)/order),
+ (1-double(ix)/order) * ( double(iy)/order) };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) = lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l) + lami[3] * fpts[3](l);
+
+ curv.CalcElementTransformation (xl, ei, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 1.0, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
}
- }
- }
- }
- glEndList ();
-}
+ }
+ else
+ {
+ Point3d c(0,0,0);
+ if (vispar.shrink < 1)
+ {
+ for (int j = 1; j <= 8; j++)
+ {
+ Point3d p = mesh->Point(el.PNum(j));
+ c.X() += p.X();
+ c.Y() += p.Y();
+ c.Z() += p.Z();
+ }
+ c.X() /= 8;
+ c.Y() /= 8;
+ c.Z() /= 8;
+ }
+
+ glBegin (GL_TRIANGLES);
+
+ el.GetSurfaceTriangles (faces);
+ for (int j = 1; j <= faces.Size(); j++)
+ {
+ Element2d & face = faces.Elem(j);
+ Point<3> lp1 = mesh->Point (el.PNum(face.PNum(1)));
+ Point<3> lp2 = mesh->Point (el.PNum(face.PNum(2)));
+ Point<3> lp3 = mesh->Point (el.PNum(face.PNum(3)));
+ Vec<3> n = Cross (lp3-lp1, lp2-lp1);
+ n.Normalize();
+ glNormal3dv (n);
+
+ if (vispar.shrink < 1)
+ {
+ lp1 = c + vispar.shrink * (lp1 - c);
+ lp2 = c + vispar.shrink * (lp2 - c);
+ lp3 = c + vispar.shrink * (lp3 - c);
+ }
+
+ glVertex3dv (lp1);
+ glVertex3dv (lp2);
+ glVertex3dv (lp3);
+ }
+
+ glEnd();
+ }
+ }
+ }
+ glEndList ();
+ }
+
+
+
+
+
+
+
+
+ void VisualSceneMesh :: BuildPyramidList()
+ {
+ if (pyramidtimestamp > mesh->GetTimeStamp () &&
+ pyramidtimestamp > vispar.clipplanetimestamp )
+ return;
+
+ if (!lock)
+ {
+ lock = new NgLock (mesh->Mutex());
+ lock -> Lock();
+ }
+ pyramidtimestamp = NextTimeStamp();
+ if (pyramidlist)
+ glDeleteLists (pyramidlist, 1);
-void VisualSceneMesh :: BuildHexList()
-{
- int i, j;
- hexlist = glGenLists (1);
- glNewList (hexlist, GL_COMPILE);
+ pyramidlist = glGenLists (1);
+ glNewList (pyramidlist, GL_COMPILE);
+
+ static float pyramidcol[] = { 1.0f, 0.0f, 1.0f, 1.0f };
+ glLineWidth (1.0f);
+ ARRAY<Element2d> faces;
+
+ for (ElementIndex ei = 0; ei < mesh->GetNE(); ei++)
+ {
+ const Element & el = (*mesh)[ei];
+ if (el.GetType() == PYRAMID && !el.IsDeleted())
+ {
+ int j;
+ int i = ei + 1;
+
+ CurvedElements & curv = mesh->GetCurvedElements();
+ if (curv.IsHighOrder() && curv.IsElementCurved(ei))
+ {
- static float hexcol[] = { 1.0f, 1.0f, 0.0f, 1.0f };
- glLineWidth (1.0f);
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, hexcol);
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (PYRAMID);
+ const Point3d * vertices = MeshTopology :: GetVertices (PYRAMID);
+
+ Point<3> grid[11][11];
+ Point<3> fpts[4];
+ int order = vispar.subdivisions+1;
+
+ for (int trig = 0; trig < 4; trig++)
+ {
+ for (int j = 0; j < 3; j++)
+ fpts[j] = vertices[faces[trig][j]-1];
+
+ static Point<3> c(0.375, 0.375, 0.25);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 3; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[3] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ double(iy)/order };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) = lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l);
+
+ curv.CalcElementTransformation (xl, i-1, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 0.999, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
+ }
+
+ for (int quad = 4; quad < 5; quad++)
+ {
+ for (int j = 0; j < 4; j++)
+ fpts[j] = vertices[faces[quad][j]-1];
+
+ static Point<3> c(0.375, 0.375, 0.25);
+ if (vispar.shrink < 1)
+ for (int j = 0; j < 4; j++)
+ fpts[j] += (1-vispar.shrink) * (c-fpts[j]);
+
+ for (int ix = 0; ix <= order; ix++)
+ for (int iy = 0; iy <= order; iy++)
+ {
+ double lami[4] =
+ { (1-double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * (1-double(iy)/order),
+ ( double(ix)/order) * ( double(iy)/order),
+ (1-double(ix)/order) * ( double(iy)/order) };
+
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) =
+ lami[0] * fpts[0](l) + lami[1] * fpts[1](l) +
+ lami[2] * fpts[2](l) + lami[3] * fpts[3](l);
+
+ curv.CalcElementTransformation (xl, ei, grid[ix][iy]);
+ }
+
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[j][0], &grid[0][1]-&grid[0][0]);
+ for (int j = 0; j <= order; j++)
+ ToBernstein (order, &grid[0][j], &grid[1][0]-&grid[0][0]);
+
+ glMap2d(GL_MAP2_VERTEX_3,
+ 0.0, 1.0, &grid[0][1](0)-&grid[0][0](0), order+1,
+ 0.0, 1.0, &grid[1][0](0)-&grid[0][0](0), order+1,
+ &grid[0][0](0));
+ glEnable(GL_MAP2_VERTEX_3);
+ glEnable(GL_AUTO_NORMAL);
+
+ glMapGrid2f(8, 0.0, 1.0, 8, 0.0, 1.0);
+ glEvalMesh2(GL_FILL, 0, 8, 0, 8);
+
+ glDisable (GL_AUTO_NORMAL);
+ glDisable (GL_MAP2_VERTEX_3);
+ }
- ARRAY<Element2d> faces;
- for (i = 1; i <= mesh->GetNE(); i++)
- {
- Element el = mesh->VolumeElement (i);
- if (el.GetType() == HEX &&
- el.PNum(1))
- {
- el.GetSurfaceTriangles (faces);
- CurvedElements & curv = mesh->GetCurvedElements();
- if (curv.IsHighOrder() && curv.IsElementCurved(i-1))
- {
- cerr << "draw curved hex not implemented" << endl;
- int hoplotn = 1 << vispar.subdivisions;
- // int hoplotn = curv.GetNVisualSubsecs();
-
- const Point3d * facepoint = MeshTopology :: GetVertices (TRIG);
- const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TRIG);
-
- glBegin (GL_TRIANGLES);
-
- for (int trig = 0; trig<2; trig++)
- {
- Vec<3> x0,x1,d0,d1;
- x0 = facepoint[1] - facepoint[2];
- x1 = facepoint[0] - facepoint[2];
- x0.Normalize();
- x1.Normalize();
- if (trig == 1) Swap (x0,x1);
- Point<3> xr[3];
- Point<3> xg;
- Vec<3> dx, dy, dz, n;
- for (int i1 = 0; i1 < hoplotn; i1++)
- for (int j1 = 0; j1 < hoplotn-i1; j1++)
- for (int k = 0; k < 2; k++)
- {
- if (k == 0)
- {
- xr[0](0) = (double) i1/hoplotn; xr[0](1) = (double) j1/hoplotn;
- xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double) j1/hoplotn;
- xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
- } else
- {
- if (j1 == hoplotn-i1-1) continue;
- xr[0](0) = (double)(i1+1)/hoplotn; xr[0](1) = (double) j1/hoplotn;
- xr[1](0) = (double)(i1+1)/hoplotn; xr[1](1) = (double)(j1+1)/hoplotn;
- xr[2](0) = (double) i1/hoplotn; xr[2](1) = (double)(j1+1)/hoplotn;
- };
-
- for (int l=0; l<3; l++)
- {
- Mat<3,3> dxdxi;
- xr[l](2) = (double) trig;
- curv.CalcElementTransformation (xr[l], i-1, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- dz(i) = dxdxi(i,2);
- }
+ /*
+ int hoplotn = 1 << vispar.subdivisions;
- Vec<3> d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
- Vec<3> d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
- n = Cross (d1, d0);
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
- }
-
- }
+ const ELEMENT_FACE * faces = MeshTopology :: GetFaces (PYRAMID);
+ const Point3d * vertices = MeshTopology :: GetVertices (PYRAMID);
- glEnd ();
+ Point<3> grid[33][33];
+ Vec<3> gridn[33][33];
- glBegin (GL_QUADS);
- for (int quad = 0; quad<3; quad++)
- {
- const Point3d * facepoint = MeshTopology :: GetVertices (PRISM);
+ glBegin (GL_TRIANGLES);
+
+ for (int trig = 0; trig < 4; trig++)
+ {
+ Point<3> p0 = vertices[faces[trig][0]-1];
+ Point<3> p1 = vertices[faces[trig][1]-1];
+ Point<3> p2 = vertices[faces[trig][2]-1];
+
+ if (vispar.shrink < 1)
+ {
+ static Point<3> c(0.375, 0.375, 0.25);
+ p0 = c + vispar.shrink * (p0 - c);
+ p1 = c + vispar.shrink * (p1 - c);
+ p2 = c + vispar.shrink * (p2 - c);
+ }
+
- Vec<3> x0,x1;
- int xyz;
+ Vec<3> taux = p0-p2;
+ Vec<3> tauy = p1-p2;
+ Vec<3> gtaux, gtauy;
- switch (quad)
+ Point<3> xl;
+ Mat<3,3> dxdxi;
+
+ for (int ix = 0; ix <= hoplotn; ix++)
+ for (int iy = 0; iy <= hoplotn-ix; iy++)
{
- case 0:
- x0 = facepoint[5] - facepoint[2];
- x1 = facepoint[0] - facepoint[2];
- xyz = 0;
- break;
- case 1:
- x0 = facepoint[4] - facepoint[0];
- x1 = facepoint[1] - facepoint[0];
- xyz = 0;
- break;
- case 2:
- x0 = facepoint[1] - facepoint[2];
- x1 = facepoint[5] - facepoint[2];
- xyz = 1;
- break;
+ for (int l = 0; l < 3; l++)
+ xl(l) =
+ (1-double(ix+iy)/hoplotn) * p2(l) +
+ (double(ix)/hoplotn) * p0(l) +
+ (double(iy)/hoplotn) * p1(l);
+
+ curv.CalcElementTransformation (xl, i-1, grid[ix][iy], dxdxi);
+
+ gtaux = dxdxi * taux;
+ gtauy = dxdxi * tauy;
+ gridn[ix][iy] = Cross (gtauy, gtaux).Normalize();
}
- x0.Normalize();
- x1.Normalize();
+ for (int ix = 0; ix < hoplotn; ix++)
+ for (int iy = 0; iy < hoplotn-ix; iy++)
+ {
+ glNormal3dv (gridn[ix][iy]);
+ glVertex3dv (grid[ix][iy]);
- Swap (x0,x1);
+ glNormal3dv (gridn[ix+1][iy]);
+ glVertex3dv (grid[ix+1][iy]);
- Point<3> xr[4];
- Point<3> xg;
- Vec<3> dx, dy, dz, n;
+ glNormal3dv (gridn[ix][iy+1]);
+ glVertex3dv (grid[ix][iy+1]);
- for (int i1 = 0; i1 < hoplotn; i1++)
- for (int j1 = 0; j1 < hoplotn; j1++)
- {
- xr[0](xyz) = (double) i1/hoplotn; xr[0](2) = (double) j1/hoplotn;
- xr[1](xyz) = (double)(i1+1)/hoplotn; xr[1](2) = (double) j1/hoplotn;
- xr[2](xyz) = (double)(i1+1)/hoplotn; xr[2](2) = (double)(j1+1)/hoplotn;
- xr[3](xyz) = (double) i1/hoplotn; xr[3](2) = (double)(j1+1)/hoplotn;
-
- for (int l=0; l<4; l++)
- {
- switch (quad)
- {
- case 0: xr[l](1) = 0; break;
- case 1: xr[l](1) = 1-xr[l](0); break;
- case 2: xr[l](0) = 0; break;
- }
+ if (iy < hoplotn-ix-1)
+ {
+ glNormal3dv (gridn[ix][iy+1]);
+ glVertex3dv (grid[ix][iy+1]);
+
+ glNormal3dv (gridn[ix+1][iy]);
+ glVertex3dv (grid[ix+1][iy]);
+
+ glNormal3dv (gridn[ix+1][iy+1]);
+ glVertex3dv (grid[ix+1][iy+1]);
+ }
+ }
+ }
- Mat<3,3> dxdxi;
- curv.CalcElementTransformation (xr[l], i-1, xg, dxdxi);
- for (int i = 0; i < 3; i++)
- {
- dx(i) = dxdxi(i,0);
- dy(i) = dxdxi(i,1);
- dz(i) = dxdxi(i,2);
- }
+ glEnd ();
- Vec<3> d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
- Vec<3> d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
- n = Cross (d1, d0);
- glNormal3d (n(0), n(1), n(2));
- glVertex3d (xg(0), xg(1), xg(2));
- }
- }
- }
- glEnd ();
- }
- else
- {
- Point3d c(0,0,0);
- if (vispar.shrink < 1)
- {
- for (j = 1; j <= 8; j++)
- {
- Point3d p = mesh->Point(el.PNum(j));
- c.X() += p.X();
- c.Y() += p.Y();
- c.Z() += p.Z();
- }
- c.X() /= 8;
- c.Y() /= 8;
- c.Z() /= 8;
- }
- glBegin (GL_TRIANGLES);
-
- for (j = 1; j <= faces.Size(); j++)
- {
- Element2d & face = faces.Elem(j);
- Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
- Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
- Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
- Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
- n /= (n.Length()+1e-12);
- glNormal3d (n.X(), n.Y(), n.Z());
-
- if (vispar.shrink < 1)
- {
- lp1 = c + vispar.shrink * (lp1 - c);
- lp2 = c + vispar.shrink * (lp2 - c);
- lp3 = c + vispar.shrink * (lp3 - c);
- }
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- }
- glEnd();
- }
- }
- }
- glEndList ();
-}
+ glBegin (GL_QUADS);
+
+ for (int quad = 4; quad < 5; quad++)
+ {
+ Point<3> p0 = vertices[faces[quad][0]-1];
+ Point<3> p1 = vertices[faces[quad][1]-1];
+ Point<3> p2 = vertices[faces[quad][2]-1];
+ Point<3> p3 = vertices[faces[quad][3]-1];
+ if (vispar.shrink < 1)
+ {
+ static Point<3> c(0.375, 0.375, 0.25);
+ p0 = c + vispar.shrink * (p0 - c);
+ p1 = c + vispar.shrink * (p1 - c);
+ p2 = c + vispar.shrink * (p2 - c);
+ p3 = c + vispar.shrink * (p3 - c);
+ }
+ Vec<3> taux = p1-p0;
+ Vec<3> tauy = p3-p0;
+ Vec<3> gtaux, gtauy;
+ Point<3> xl, xg;
+ Mat<3,3> dxdxi;
+ for (int ix = 0; ix <= hoplotn; ix++)
+ for (int iy = 0; iy <= hoplotn; iy++)
+ {
+ Point<3> xl;
+ for (int l = 0; l < 3; l++)
+ xl(l) =
+ (1-double(ix)/hoplotn)*(1-double(iy)/hoplotn) * p0(l) +
+ ( double(ix)/hoplotn)*(1-double(iy)/hoplotn) * p1(l) +
+ ( double(ix)/hoplotn)*( double(iy)/hoplotn) * p2(l) +
+ (1-double(ix)/hoplotn)*( double(iy)/hoplotn) * p3(l);
+
+ curv.CalcElementTransformation (xl, i-1, grid[ix][iy], dxdxi);
+
+ gtaux = dxdxi * taux;
+ gtauy = dxdxi * tauy;
+ gridn[ix][iy] = Cross (gtauy, gtaux).Normalize();
+ }
+ for (int ix = 0; ix < hoplotn; ix++)
+ for (int iy = 0; iy < hoplotn; iy++)
+ {
+ glNormal3dv (gridn[ix][iy]);
+ glVertex3dv (grid[ix][iy]);
+ glNormal3dv (gridn[ix+1][iy]);
+ glVertex3dv (grid[ix+1][iy]);
+ glNormal3dv (gridn[ix+1][iy+1]);
+ glVertex3dv (grid[ix+1][iy+1]);
-
-void VisualSceneMesh :: BuildPyramidList()
-{
- int i, j;
+ glNormal3dv (gridn[ix][iy+1]);
+ glVertex3dv (grid[ix][iy+1]);
+ }
+ }
+
+ glEnd ();
+ */
+
+
+ }
+ else
+ {
- pyramidlist = glGenLists (1);
- glNewList (pyramidlist, GL_COMPILE);
-
- static float pyramidcol[] = { 1.0f, 0.0f, 1.0f, 1.0f };
- glLineWidth (1.0f);
- ARRAY<Element2d> faces;
-
- for (i = 1; i <= mesh->GetNE(); i++)
- {
- if (mesh->VolumeElement(i).GetType() == PYRAMID)
- {
- // copy to be thread-safe
- Element el = mesh->VolumeElement (i);
-
- Point3d c(0,0,0);
- if (vispar.shrink < 1)
- {
- for (j = 1; j <= 5; j++)
- {
- Point3d p = mesh->Point(el.PNum(j));
- c.X() += p.X() / 5;
- c.Y() += p.Y() / 5;
- c.Z() += p.Z() / 5;
- }
- }
- el.GetSurfaceTriangles (faces);
+ Point3d c(0,0,0);
+ if (vispar.shrink < 1)
+ {
+ for (int j = 1; j <= 5; j++)
+ {
+ Point3d p = mesh->Point(el.PNum(j));
+ c.X() += p.X() / 5;
+ c.Y() += p.Y() / 5;
+ c.Z() += p.Z() / 5;
+ }
+ }
+
+
+ el.GetSurfaceTriangles (faces);
- glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, pyramidcol);
- if (el.PNum(1))
- {
- glBegin (GL_TRIANGLES);
+ glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, pyramidcol);
+ if (el.PNum(1))
+ {
+ glBegin (GL_TRIANGLES);
- for (j = 1; j <= faces.Size(); j++)
- {
- Element2d & face = faces.Elem(j);
- Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
- Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
- Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
- Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
- n /= (n.Length()+1e-12);
- n *= -1;
- glNormal3d (n.X(), n.Y(), n.Z());
+ for (int j = 1; j <= faces.Size(); j++)
+ {
+ Element2d & face = faces.Elem(j);
+ Point3d lp1 = mesh->Point (el.PNum(face.PNum(1)));
+ Point3d lp2 = mesh->Point (el.PNum(face.PNum(2)));
+ Point3d lp3 = mesh->Point (el.PNum(face.PNum(3)));
+ Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
+ n /= (n.Length()+1e-12);
+ n *= -1;
+ glNormal3d (n.X(), n.Y(), n.Z());
- if (vispar.shrink < 1)
- {
- lp1 = c + vispar.shrink * (lp1 - c);
- lp2 = c + vispar.shrink * (lp2 - c);
- lp3 = c + vispar.shrink * (lp3 - c);
- }
+ if (vispar.shrink < 1)
+ {
+ lp1 = c + vispar.shrink * (lp1 - c);
+ lp2 = c + vispar.shrink * (lp2 - c);
+ lp3 = c + vispar.shrink * (lp3 - c);
+ }
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- }
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
- glEnd();
- }
- }
- }
- glEndList ();
-}
+ glEnd();
+ }
+ }
+ }
+ }
+ glEndList ();
+ }
-void VisualSceneMesh :: BuildBadelList()
-{
- ;
-}
+ void VisualSceneMesh :: BuildBadelList()
+ {
+ ;
+ }
-void VisualSceneMesh :: BuildIdentifiedList()
-{
- ;
-}
+ void VisualSceneMesh :: BuildIdentifiedList()
+ {
+ ;
+ }
-void VisualSceneMesh :: BuildDomainSurfList()
-{
- if (domainsurflist)
- glDeleteLists (domainsurflist, 1);
+ void VisualSceneMesh :: BuildDomainSurfList()
+ {
+ if (domainsurflist)
+ glDeleteLists (domainsurflist, 1);
- domainsurflist = glGenLists (1);
- glNewList (domainsurflist, GL_COMPILE);
+ domainsurflist = glGenLists (1);
+ glNewList (domainsurflist, GL_COMPILE);
- int i, j;
- glLineWidth (1.0f);
+ int i, j;
+ glLineWidth (1.0f);
- glDisable (GL_COLOR_MATERIAL);
+ glDisable (GL_COLOR_MATERIAL);
- for (i = 1; i <= mesh->GetNSE(); i++)
- {
- Element2d el = mesh->SurfaceElement (i);
+ for (i = 1; i <= mesh->GetNSE(); i++)
+ {
+ Element2d el = mesh->SurfaceElement (i);
- int drawel = 1;
- for (j = 1; j <= el.GetNP(); j++)
- {
- if (!el.PNum(j))
- drawel = 0;
- }
+ int drawel = 1;
+ for (j = 1; j <= el.GetNP(); j++)
+ {
+ if (!el.PNum(j))
+ drawel = 0;
+ }
- if (!drawel)
- continue;
+ if (!drawel)
+ continue;
- if (el.GetIndex() < 1 || el.GetIndex() > mesh->GetNFD())
- continue;
- int domin = mesh->GetFaceDescriptor(el.GetIndex()).DomainIn();
- int domout = mesh->GetFaceDescriptor(el.GetIndex()).DomainOut();
-
- int fac;
- if (domin == vispar.drawdomainsurf)
- fac = 1;
- else if (domout == vispar.drawdomainsurf)
- fac = -1;
- else
- continue;
+ if (el.GetIndex() < 1 || el.GetIndex() > mesh->GetNFD())
+ continue;
+ int domin = mesh->GetFaceDescriptor(el.GetIndex()).DomainIn();
+ int domout = mesh->GetFaceDescriptor(el.GetIndex()).DomainOut();
+
+ int fac;
+ if (domin == vispar.drawdomainsurf)
+ fac = 1;
+ else if (domout == vispar.drawdomainsurf)
+ fac = -1;
+ else
+ continue;
- GLfloat matcol[] = { 1, 0, 0, 1 };
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, matcol);
+ GLfloat matcol[] = { 1, 0, 0, 1 };
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, matcol);
- if (el.GetNP() == 3)
- {
- glBegin (GL_TRIANGLES);
+ if (el.GetNP() == 3)
+ {
+ glBegin (GL_TRIANGLES);
- const Point3d & lp1 = mesh->Point (el.PNum(1));
- const Point3d & lp2 = mesh->Point (el.PNum(2));
- const Point3d & lp3 = mesh->Point (el.PNum(3));
- Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
- n /= ( fac * (n.Length()+1e-12));
- glNormal3d (n.X(), n.Y(), n.Z());
+ const Point3d & lp1 = mesh->Point (el.PNum(1));
+ const Point3d & lp2 = mesh->Point (el.PNum(2));
+ const Point3d & lp3 = mesh->Point (el.PNum(3));
+ Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
+ n /= ( fac * (n.Length()+1e-12));
+ glNormal3d (n.X(), n.Y(), n.Z());
- if (!vispar.colormeshsize)
- {
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- }
- glEnd();
- }
- else if (el.GetNP() == 4)
- {
- glBegin (GL_QUADS);
+ if (!vispar.colormeshsize)
+ {
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
+ glEnd();
+ }
+ else if (el.GetNP() == 4)
+ {
+ glBegin (GL_QUADS);
- const Point3d & lp1 = mesh->Point (el.PNum(1));
- const Point3d & lp2 = mesh->Point (el.PNum(2));
- const Point3d & lp3 = mesh->Point (el.PNum(4));
- const Point3d & lp4 = mesh->Point (el.PNum(3));
- Vec3d n = Cross (Vec3d (lp1, lp2),
- Vec3d (lp1, Center (lp3, lp4)));
- n /= (fac * (n.Length()+1e-12));
- glNormal3d (n.X(), n.Y(), n.Z());
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp4.X(), lp4.Y(), lp4.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- glEnd();
- }
- else if (el.GetNP() == 6)
- {
- glBegin (GL_TRIANGLES);
- static int trigs[4][3] = {
- { 1, 6, 5 },
- { 2, 4, 6 },
- { 3, 5, 4 },
- { 4, 5, 6 } };
+ const Point3d & lp1 = mesh->Point (el.PNum(1));
+ const Point3d & lp2 = mesh->Point (el.PNum(2));
+ const Point3d & lp3 = mesh->Point (el.PNum(4));
+ const Point3d & lp4 = mesh->Point (el.PNum(3));
+ Vec3d n = Cross (Vec3d (lp1, lp2),
+ Vec3d (lp1, Center (lp3, lp4)));
+ n /= (fac * (n.Length()+1e-12));
+ glNormal3d (n.X(), n.Y(), n.Z());
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp4.X(), lp4.Y(), lp4.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ glEnd();
+ }
+ else if (el.GetNP() == 6)
+ {
+ glBegin (GL_TRIANGLES);
+ static int trigs[4][3] = {
+ { 1, 6, 5 },
+ { 2, 4, 6 },
+ { 3, 5, 4 },
+ { 4, 5, 6 } };
- for (j = 0; j < 4; j++)
- {
- const Point3d & lp1 = mesh->Point (el.PNum(trigs[j][0]));
- const Point3d & lp2 = mesh->Point (el.PNum(trigs[j][1]));
- const Point3d & lp3 = mesh->Point (el.PNum(trigs[j][2]));
- Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
- n /= (fac * (n.Length() + 1e-12));
- glNormal3d (n.X(), n.Y(), n.Z());
- glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
- glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
- glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
- }
- glEnd();
- }
- }
- glEndList ();
-}
+ for (j = 0; j < 4; j++)
+ {
+ const Point3d & lp1 = mesh->Point (el.PNum(trigs[j][0]));
+ const Point3d & lp2 = mesh->Point (el.PNum(trigs[j][1]));
+ const Point3d & lp3 = mesh->Point (el.PNum(trigs[j][2]));
+ Vec3d n = Cross (Vec3d (lp1, lp2), Vec3d (lp1, lp3));
+ n /= (fac * (n.Length() + 1e-12));
+ glNormal3d (n.X(), n.Y(), n.Z());
+ glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
+ glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
+ glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
+ }
+ glEnd();
+ }
+ }
+ glEndList ();
+ }
@@ -2558,171 +2931,171 @@ void VisualSceneMesh :: BuildDomainSurfList()
-void VisualSceneMesh :: MouseDblClick (int px, int py)
-{
- int i, hits;
+ void VisualSceneMesh :: MouseDblClick (int px, int py)
+ {
+ int i, hits;
- // select surface triangle by mouse click
+ // select surface triangle by mouse click
- GLuint selbuf[10000];
- glSelectBuffer (10000, selbuf);
+ GLuint selbuf[10000];
+ glSelectBuffer (10000, selbuf);
- glRenderMode (GL_SELECT);
+ glRenderMode (GL_SELECT);
- GLint viewport[4];
- glGetIntegerv (GL_VIEWPORT, viewport);
+ GLint viewport[4];
+ glGetIntegerv (GL_VIEWPORT, viewport);
- glMatrixMode (GL_PROJECTION);
- glPushMatrix();
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix();
- GLdouble projmat[16];
- glGetDoublev (GL_PROJECTION_MATRIX, projmat);
+ GLdouble projmat[16];
+ glGetDoublev (GL_PROJECTION_MATRIX, projmat);
- glLoadIdentity();
- gluPickMatrix (px, viewport[3] - py, 1, 1, viewport);
- glMultMatrixd (projmat);
+ glLoadIdentity();
+ gluPickMatrix (px, viewport[3] - py, 1, 1, viewport);
+ glMultMatrixd (projmat);
- glClearColor(backcolor, backcolor, backcolor, 1.0);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glMatrixMode (GL_MODELVIEW);
+ glMatrixMode (GL_MODELVIEW);
- glPushMatrix();
- glMultMatrixf (transformationmat);
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
- // SetClippingPlane();
+ // SetClippingPlane();
- glInitNames();
- glPushName (1);
+ glInitNames();
+ glPushName (1);
- glPolygonOffset (1, 1);
- glEnable (GL_POLYGON_OFFSET_FILL);
+ glPolygonOffset (1, 1);
+ glEnable (GL_POLYGON_OFFSET_FILL);
- glDisable(GL_CLIP_PLANE0);
+ glDisable(GL_CLIP_PLANE0);
- if (vispar.clipenable)
- {
- Vec<3> n(clipplane[0], clipplane[1], clipplane[2]);
- double len = Abs(n);
- double mu = -clipplane[3] / (len*len);
- Point<3> p (mu * n);
- n /= len;
- Vec<3> t1 = n.GetNormal ();
- Vec<3> t2 = Cross (n, t1);
+ if (vispar.clipenable)
+ {
+ Vec<3> n(clipplane[0], clipplane[1], clipplane[2]);
+ double len = Abs(n);
+ double mu = -clipplane[3] / (len*len);
+ Point<3> p (mu * n);
+ n /= len;
+ Vec<3> t1 = n.GetNormal ();
+ Vec<3> t2 = Cross (n, t1);
- double xi1mid = (center - p) * t1;
- double xi2mid = (center - p) * t2;
+ double xi1mid = (center - p) * t1;
+ double xi2mid = (center - p) * t2;
- glLoadName (0);
- glBegin (GL_QUADS);
- glVertex3dv (p + (xi1mid-rad) * t1 + (xi2mid-rad) * t2);
- glVertex3dv (p + (xi1mid+rad) * t1 + (xi2mid-rad) * t2);
- glVertex3dv (p + (xi1mid+rad) * t1 + (xi2mid+rad) * t2);
- glVertex3dv (p + (xi1mid-rad) * t1 + (xi2mid+rad) * t2);
- glEnd ();
- }
+ glLoadName (0);
+ glBegin (GL_QUADS);
+ glVertex3dv (p + (xi1mid-rad) * t1 + (xi2mid-rad) * t2);
+ glVertex3dv (p + (xi1mid+rad) * t1 + (xi2mid-rad) * t2);
+ glVertex3dv (p + (xi1mid+rad) * t1 + (xi2mid+rad) * t2);
+ glVertex3dv (p + (xi1mid-rad) * t1 + (xi2mid+rad) * t2);
+ glEnd ();
+ }
- // SetClippingPlane();
+ // SetClippingPlane();
- glCallList (filledlist);
+ glCallList (filledlist);
- glDisable (GL_POLYGON_OFFSET_FILL);
+ glDisable (GL_POLYGON_OFFSET_FILL);
- glPopName();
+ glPopName();
- glMatrixMode (GL_PROJECTION);
- glPopMatrix();
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix();
- glMatrixMode (GL_MODELVIEW);
- glPopMatrix();
+ glMatrixMode (GL_MODELVIEW);
+ glPopMatrix();
- glFlush();
+ glFlush();
- hits = glRenderMode (GL_RENDER);
-
- // cout << "hits = " << hits << endl;
-
- int minname = 0;
- GLuint mindepth = 0;
-
- // find clippingplane
- GLuint clipdepth = 0; // GLuint(-1);
-
- for (i = 0; i < hits; i++)
- {
- int curname = selbuf[4*i+3];
- if (!curname) clipdepth = selbuf[4*i+1];
- }
-
- for (i = 0; i < hits; i++)
- {
- int curname = selbuf[4*i+3];
- GLuint curdepth = selbuf[4*i+1];
- /*
- cout << selbuf[4*i] << " " << selbuf[4*i+1] << " "
- << selbuf[4*i+2] << " " << selbuf[4*i+3] << endl;
- */
- if (curname && (curdepth > clipdepth) &&
- (curdepth < mindepth || !minname))
- {
- mindepth = curdepth;
- minname = curname;
- }
- }
-
- seledge = -1;
- if (minname)
- {
- const Element2d & sel = mesh->SurfaceElement(minname);
-
-
- cout << "select element " << minname
- << " on face " << sel.GetIndex() << endl;
- cout << "Nodes: ";
- for (i = 1; i <= sel.GetNP(); i++)
- cout << sel.PNum(i) << " ";
- cout << endl;
-
- selelement = minname;
- selface = mesh->SurfaceElement(minname).GetIndex();
-
- locpi = (locpi % sel.GetNP()) + 1;
- selpoint2 = selpoint;
- selpoint = sel.PNum(locpi);
- cout << "selected point " << selpoint
- << ", pos = " << mesh->Point (selpoint)
- << endl;
-
- for (i = 1; i <= mesh->GetNSeg(); i++)
- {
- const Segment & seg = mesh->LineSegment(i);
- if (seg.p1 == selpoint && seg.p2 == selpoint2 ||
- seg.p2 == selpoint && seg.p1 == selpoint2)
- {
- seledge = seg.edgenr;
- cout << "seledge = " << seledge << endl;
- }
- }
+ hits = glRenderMode (GL_RENDER);
+
+ // cout << "hits = " << hits << endl;
+
+ int minname = 0;
+ GLuint mindepth = 0;
+
+ // find clippingplane
+ GLuint clipdepth = 0; // GLuint(-1);
+
+ for (i = 0; i < hits; i++)
+ {
+ int curname = selbuf[4*i+3];
+ if (!curname) clipdepth = selbuf[4*i+1];
+ }
+
+ for (i = 0; i < hits; i++)
+ {
+ int curname = selbuf[4*i+3];
+ GLuint curdepth = selbuf[4*i+1];
+ /*
+ cout << selbuf[4*i] << " " << selbuf[4*i+1] << " "
+ << selbuf[4*i+2] << " " << selbuf[4*i+3] << endl;
+ */
+ if (curname && (curdepth > clipdepth) &&
+ (curdepth < mindepth || !minname))
+ {
+ mindepth = curdepth;
+ minname = curname;
+ }
+ }
+
+ seledge = -1;
+ if (minname)
+ {
+ const Element2d & sel = mesh->SurfaceElement(minname);
+
+
+ cout << "select element " << minname
+ << " on face " << sel.GetIndex() << endl;
+ cout << "Nodes: ";
+ for (i = 1; i <= sel.GetNP(); i++)
+ cout << sel.PNum(i) << " ";
+ cout << endl;
+
+ selelement = minname;
+ selface = mesh->SurfaceElement(minname).GetIndex();
+
+ locpi = (locpi % sel.GetNP()) + 1;
+ selpoint2 = selpoint;
+ selpoint = sel.PNum(locpi);
+ cout << "selected point " << selpoint
+ << ", pos = " << mesh->Point (selpoint)
+ << endl;
+
+ for (i = 1; i <= mesh->GetNSeg(); i++)
+ {
+ const Segment & seg = mesh->LineSegment(i);
+ if (seg.p1 == selpoint && seg.p2 == selpoint2 ||
+ seg.p2 == selpoint && seg.p1 == selpoint2)
+ {
+ seledge = seg.edgenr;
+ cout << "seledge = " << seledge << endl;
+ }
+ }
- }
- else
- {
- selface = -1;
- selelement = -1;
- selpoint = -1;
- selpoint2 = -1;
- }
-
- glDisable(GL_CLIP_PLANE0);
-
- selecttimestamp = NextTimeStamp();
-}
+ }
+ else
+ {
+ selface = -1;
+ selelement = -1;
+ selpoint = -1;
+ selpoint2 = -1;
+ }
+
+ glDisable(GL_CLIP_PLANE0);
+
+ selecttimestamp = NextTimeStamp();
+ }
diff --git a/Netgen/libsrc/visualization/vsocc.cpp b/Netgen/libsrc/visualization/vsocc.cpp
new file mode 100644
index 0000000000..12cfc5e179
--- /dev/null
+++ b/Netgen/libsrc/visualization/vsocc.cpp
@@ -0,0 +1,743 @@
+#ifdef OCCGEOMETRY
+
+
+#include <mystdlib.h>
+#include <myadt.hpp>
+#include <meshing.hpp>
+
+// #include <csg.hpp>
+// #include <stlgeom.hpp>
+
+#include <occgeom.hpp>
+
+#include "TopoDS_Shape.hxx"
+#include "TopoDS_Vertex.hxx"
+#include "TopExp_Explorer.hxx"
+#include "BRep_Tool.hxx"
+#include "TopoDS.hxx"
+#include "gp_Pnt.hxx"
+#include "Geom_Curve.hxx"
+#include "Poly_Triangulation.hxx"
+#include "Poly_Array1OfTriangle.hxx"
+#include "TColgp_Array1OfPnt2d.hxx"
+#include "Poly_Triangle.hxx"
+#include "Poly_Polygon3D.hxx"
+#include "Poly_PolygonOnTriangulation.hxx"
+// #include "BRepMesh.hxx"
+// #include "BRepMesh_IncrementalMesh.hxx"
+
+#include "incvis.hpp"
+
+
+namespace netgen
+{
+#include "mvdraw.hpp"
+
+
+extern OCCGeometry * occgeometry;
+
+
+
+
+/* *********************** Draw OCC Geometry **************** */
+
+
+VisualSceneOCCGeometry :: VisualSceneOCCGeometry ()
+ : VisualScene()
+{
+ trilists.SetSize(0);
+ linelists.SetSize(1);
+
+}
+
+VisualSceneOCCGeometry :: ~VisualSceneOCCGeometry ()
+{
+ ;
+}
+
+void VisualSceneOCCGeometry :: DrawScene ()
+{
+ // int i, j, k;
+
+ if ( occgeometry->changed )
+ {
+ BuildScene();
+ occgeometry -> changed = 0;
+ }
+
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ SetLight();
+
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
+
+ glShadeModel (GL_SMOOTH);
+ glDisable (GL_COLOR_MATERIAL);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+ glEnable (GL_BLEND);
+ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ // glEnable (GL_LIGHTING);
+
+ double shine = vispar.shininess;
+ // double transp = vispar.transp;
+
+ glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine);
+ glLogicOp (GL_COPY);
+
+
+ float mat_col[] = { 0.2f, 0.2f, 0.8f, 1.0f };
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+
+ glPolygonOffset (1, 1);
+ glEnable (GL_POLYGON_OFFSET_FILL);
+
+ GLfloat matcoledge[] = { 0, 0, 1, 1 };
+ GLfloat matcolhiedge[] = { 1, 0, 0, 1 };
+
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE,
+ matcoledge);
+ glLineWidth (1.0f);
+
+ if (vispar.occshowedges) glCallList (linelists.Get(1));
+ if (vispar.occshowsurfaces) glCallList (trilists.Get(1));
+
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE,
+ matcolhiedge);
+ glLineWidth (5.0f);
+
+ if (vispar.occshowedges) glCallList (linelists.Get(2));
+
+ for (int i = 1; i <= occgeometry->vmap.Extent(); i++)
+ if (occgeometry->vvispar[i-1].IsHighlighted())
+ {
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE,
+ matcolhiedge);
+ glLineWidth (5.0f);
+
+ glBegin (GL_LINES);
+
+ gp_Pnt p = BRep_Tool::Pnt(TopoDS::Vertex(occgeometry->vmap(i)));
+ double d = rad/100;
+ glVertex3f (p.X()-d, p.Y(), p.Z());
+ glVertex3f (p.X()+d, p.Y(), p.Z());
+ glVertex3f (p.X(), p.Y()-d, p.Z());
+ glVertex3f (p.X(), p.Y()+d, p.Z());
+ glVertex3f (p.X(), p.Y(), p.Z()-d);
+ glVertex3f (p.X(), p.Y(), p.Z()+d);
+ glEnd();
+ }
+
+ glDisable (GL_POLYGON_OFFSET_FILL);
+
+ glPopMatrix();
+ // DrawCoordinateCross ();
+ // DrawNetgenLogo ();
+ glFinish();
+
+ glDisable (GL_POLYGON_OFFSET_FILL);
+}
+
+
+/*
+void VisualSceneOCCGeometry :: BuildScene (int zoomall)
+{
+ int i = 0, j, k;
+
+ TopExp_Explorer ex, ex_edge;
+
+ if (vispar.occvisproblemfaces || (occgeometry -> changed != 2))
+ {
+ Box<3> bb = occgeometry -> GetBoundingBox();
+
+ center = bb.Center();
+ rad = bb.Diam() / 2;
+
+
+
+ if (vispar.occvisproblemfaces)
+ {
+ for (i = 1; i <= occgeometry->fmap.Extent(); i++)
+ if (occgeometry->facemeshstatus[i-1] == -1)
+ {
+ GProp_GProps system;
+ BRepGProp::LinearProperties(occgeometry->fmap(i), system);
+ gp_Pnt pnt = system.CentreOfMass();
+ center = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
+ cout << "Setting center to mid of face " << i << " = " << center << endl;
+ }
+ }
+
+
+ CalcTransformationMatrices();
+ }
+
+
+ for (i = 1; i <= linelists.Size(); i++)
+ glDeleteLists (linelists.Elem(i), 1);
+ linelists.SetSize(0);
+
+ linelists.Append (glGenLists (1));
+ glNewList (linelists.Last(), GL_COMPILE);
+
+ i = 0;
+ for (ex_edge.Init(occgeometry -> shape, TopAbs_EDGE);
+ ex_edge.More(); ex_edge.Next())
+ {
+ if (BRep_Tool::Degenerated(TopoDS::Edge(ex_edge.Current()))) continue;
+ i++;
+
+
+ TopoDS_Edge edge = TopoDS::Edge(ex_edge.Current());
+
+ Handle(Poly_PolygonOnTriangulation) aEdgePoly;
+ Handle(Poly_Triangulation) T;
+ TopLoc_Location aEdgeLoc;
+ BRep_Tool::PolygonOnTriangulation(edge, aEdgePoly, T, aEdgeLoc);
+
+ if(aEdgePoly.IsNull())
+ {
+ cout << "cannot visualize edge " << i << endl;
+ continue;
+ }
+
+ glBegin (GL_LINE_STRIP);
+
+ int nbnodes = aEdgePoly -> NbNodes();
+ for (j = 1; j <= nbnodes; j++)
+ {
+ gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc);
+ glVertex3f (p.X(), p.Y(), p.Z());
+ }
+
+ glEnd ();
+
+
+ }
+
+ glEndList ();
+
+ for (i = 1; i <= trilists.Size(); i++)
+ glDeleteLists (trilists.Elem(i), 1);
+ trilists.SetSize(0);
+
+
+ trilists.Append (glGenLists (1));
+ glNewList (trilists.Last(), GL_COMPILE);
+
+ i = 0;
+
+ TopExp_Explorer exp0, exp1, exp2, exp3;
+ int shapenr = 0;
+ for (exp0.Init(occgeometry -> shape, TopAbs_SOLID); exp0.More(); exp0.Next())
+ {
+ shapenr++;
+
+ if (vispar.occshowvolumenr != 0 &&
+ vispar.occshowvolumenr != shapenr) continue;
+
+ float mat_col[4];
+ mat_col[3] = 1;
+ switch (shapenr)
+ {
+ case 1:
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.8;
+ break;
+ case 2:
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.8;
+ break;
+ case 3:
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.8;
+ mat_col[2] = 0.8;
+ break;
+ case 4:
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.2;
+ break;
+ case 5:
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.8;
+ mat_col[2] = 0.8;
+ break;
+ case 6:
+ mat_col[0] = 0.6;
+ mat_col[1] = 0.6;
+ mat_col[2] = 0.6;
+ break;
+ case 7:
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.8;
+ mat_col[2] = 0.2;
+ break;
+ case 8:
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.8;
+ mat_col[2] = 0.2;
+ break;
+ default:
+ // mat_col[0] = 1-(1.0/double(shapenr));
+ // mat_col[1] = 0.5;
+ mat_col[0] = 0.5+double((shapenr*shapenr*shapenr*shapenr) % 10)/20.0;
+ mat_col[1] = 0.5+double(int(shapenr*shapenr*shapenr*shapenr*sin(double(shapenr))) % 10)/20.0;
+ mat_col[2] = 0.5+double((shapenr*shapenr*shapenr) % 10)/20.0;
+ }
+
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+
+ for (exp1.Init(exp0.Current(), TopAbs_SHELL); exp1.More(); exp1.Next())
+ for (exp2.Init(exp1.Current().Composed(exp0.Current().Orientation()), TopAbs_FACE); exp2.More(); exp2.Next())
+ {
+ TopoDS_Face face = TopoDS::Face (exp2.Current().Composed(exp1.Current().Orientation()));
+
+ i = occgeometry->fmap.FindIndex(face);
+
+ TopLoc_Location loc;
+ Handle(Geom_Surface) surf = BRep_Tool::Surface (face);
+ BRepAdaptor_Surface sf(face, Standard_False);
+ BRepLProp_SLProps prop(sf, 1, 1e-5);
+ Handle(Poly_Triangulation) triangulation = BRep_Tool::Triangulation (face, loc);
+
+ if (triangulation.IsNull())
+ {
+ cout << "cannot visualize face " << i << endl;
+ continue;
+ }
+
+ if (vispar.occvisproblemfaces)
+ {
+ switch (occgeometry->facemeshstatus[i-1])
+ {
+ case 0:
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.8;
+ break;
+ case 1:
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.8;
+ mat_col[2] = 0.2;
+ break;
+ case -1:
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.2;
+ break;
+ }
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+
+ }
+ glBegin (GL_TRIANGLES);
+
+ int ntriangles = triangulation -> NbTriangles();
+ for (j = 1; j <= ntriangles; j++)
+ {
+ Poly_Triangle triangle = (triangulation -> Triangles())(j);
+ for (k = 1; k <= 3; k++)
+ {
+ gp_Pnt2d uv = (triangulation -> UVNodes())(triangle(k));
+ gp_Pnt pnt;
+ gp_Vec du, dv;
+ prop.SetParameters (uv.X(), uv.Y());
+ surf->D0 (uv.X(), uv.Y(), pnt);
+ gp_Vec n;
+
+ if (prop.IsNormalDefined())
+ n = prop.Normal();
+ else
+ n = gp_Vec (0,0,0);
+
+ if (face.Orientation() == TopAbs_REVERSED) n *= -1;
+ glNormal3f (n.X(), n.Y(), n.Z());
+ glVertex3f (pnt.X(), pnt.Y(), pnt.Z());
+ }
+ }
+ glEnd ();
+
+ }
+ }
+
+
+ glEndList ();
+
+}
+*/
+
+
+void VisualSceneOCCGeometry :: BuildScene (int zoomall)
+{
+ if (occgeometry -> changed == OCCGEOMETRYVISUALIZATIONFULLCHANGE)
+ {
+ center = occgeometry -> Center();
+ rad = occgeometry -> GetBoundingBox().Diam() / 2;
+
+ if (vispar.occzoomtohighlightedentity)
+ {
+ bool hilite = false;
+ bool hiliteonepoint = false;
+ Bnd_Box bb;
+
+ for (int i = 1; i <= occgeometry->fmap.Extent(); i++)
+ if (occgeometry->fvispar[i-1].IsHighlighted())
+ {
+ hilite = true;
+ BRepBndLib::Add (occgeometry->fmap(i), bb);
+ }
+
+ for (int i = 1; i <= occgeometry->emap.Extent(); i++)
+ if (occgeometry->evispar[i-1].IsHighlighted())
+ {
+ hilite = true;
+ BRepBndLib::Add (occgeometry->emap(i), bb);
+ }
+
+ for (int i = 1; i <= occgeometry->vmap.Extent(); i++)
+ if (occgeometry->vvispar[i-1].IsHighlighted())
+ {
+ hiliteonepoint = true;
+ BRepBndLib::Add (occgeometry->vmap(i), bb);
+ }
+
+ if (hilite || hiliteonepoint)
+ {
+ double x1,y1,z1,x2,y2,z2;
+ bb.Get (x1,y1,z1,x2,y2,z2);
+ Point<3> p1 = Point<3> (x1,y1,z1);
+ Point<3> p2 = Point<3> (x2,y2,z2);
+ Box<3> boundingbox(p1,p2);
+
+ center = boundingbox.Center();
+ if (hiliteonepoint)
+ rad = occgeometry -> GetBoundingBox().Diam() / 100;
+ else
+ rad = boundingbox.Diam() / 2;
+ }
+ }
+
+ CalcTransformationMatrices();
+ }
+
+
+ // Clear lists
+
+ for (int i = 1; i <= linelists.Size(); i++)
+ glDeleteLists (linelists.Elem(i), 1);
+ linelists.SetSize(0);
+
+ for (int i = 1; i <= trilists.Size(); i++)
+ glDeleteLists (trilists.Elem(i), 1);
+ trilists.SetSize(0);
+
+
+ // Total wireframe
+
+ linelists.Append (glGenLists (1));
+ glNewList (linelists.Last(), GL_COMPILE);
+
+ for (int i = 1; i <= occgeometry->emap.Extent(); i++)
+ {
+ TopoDS_Edge edge = TopoDS::Edge(occgeometry->emap(i));
+ if (BRep_Tool::Degenerated(edge)) continue;
+ if (occgeometry->evispar[i-1].IsHighlighted()) continue;
+
+ Handle(Poly_PolygonOnTriangulation) aEdgePoly;
+ Handle(Poly_Triangulation) T;
+ TopLoc_Location aEdgeLoc;
+ BRep_Tool::PolygonOnTriangulation(edge, aEdgePoly, T, aEdgeLoc);
+
+ if(aEdgePoly.IsNull())
+ {
+ (*testout) << "visualizing edge " << occgeometry->emap.FindIndex (edge)
+ << " without using the occ visualization triangulation" << endl;
+
+ double s0, s1;
+ Handle(Geom_Curve) c = BRep_Tool::Curve(edge, s0, s1);
+
+ glBegin (GL_LINE_STRIP);
+ for (int i = 0; i<=50; i++)
+ {
+ gp_Pnt p = c->Value (s0 + i*(s1-s0)/50.0);
+ glVertex3f (p.X(),p.Y(),p.Z());
+ }
+ glEnd ();
+
+ continue;
+ }
+
+ int nbnodes = aEdgePoly -> NbNodes();
+ glBegin (GL_LINE_STRIP);
+ for (int j = 1; j <= nbnodes; j++)
+ {
+ gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc);
+ glVertex3f (p.X(), p.Y(), p.Z());
+ }
+ glEnd ();
+ }
+
+ glEndList ();
+
+
+ // Highlighted edge list
+
+ linelists.Append (glGenLists (1));
+ glNewList (linelists.Last(), GL_COMPILE);
+
+ for (int i = 1; i <= occgeometry->emap.Extent(); i++)
+ if (occgeometry->evispar[i-1].IsHighlighted())
+ {
+ TopoDS_Edge edge = TopoDS::Edge(occgeometry->emap(i));
+ if (BRep_Tool::Degenerated(edge)) continue;
+
+ Handle(Poly_PolygonOnTriangulation) aEdgePoly;
+ Handle(Poly_Triangulation) T;
+ TopLoc_Location aEdgeLoc;
+ BRep_Tool::PolygonOnTriangulation(edge, aEdgePoly, T, aEdgeLoc);
+
+ if(aEdgePoly.IsNull())
+ {
+ (*testout) << "visualizing edge " << occgeometry->emap.FindIndex (edge)
+ << " without using the occ visualization triangulation" << endl;
+
+ double s0, s1;
+ Handle(Geom_Curve) c = BRep_Tool::Curve(edge, s0, s1);
+
+ glBegin (GL_LINE_STRIP);
+ for (int i = 0; i<=50; i++)
+ {
+ gp_Pnt p = c->Value (s0 + i*(s1-s0)/50.0);
+ glVertex3f (p.X(),p.Y(),p.Z());
+ }
+ glEnd ();
+
+ continue;
+ }
+
+ int nbnodes = aEdgePoly -> NbNodes();
+ glBegin (GL_LINE_STRIP);
+ for (int j = 1; j <= nbnodes; j++)
+ {
+ gp_Pnt p = (T -> Nodes())(aEdgePoly->Nodes()(j)).Transformed(aEdgeLoc);
+ glVertex3f (p.X(), p.Y(), p.Z());
+ }
+ glEnd ();
+ }
+
+ glEndList ();
+
+
+
+
+
+ // display faces
+
+ trilists.Append (glGenLists (1));
+ glNewList (trilists.Last(), GL_COMPILE);
+
+ for (int i = 1; i <= occgeometry->fmap.Extent(); i++)
+ {
+ glLoadName (i);
+ float mat_col[4];
+ mat_col[3] = 1;
+
+ if (!occgeometry->fvispar[i-1].IsHighlighted())
+ {
+ mat_col[0] = 0.2;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.8;
+ }
+ else
+ {
+ mat_col[0] = 0.8;
+ mat_col[1] = 0.2;
+ mat_col[2] = 0.2;
+ }
+
+ glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col);
+
+ TopoDS_Face face = TopoDS::Face(occgeometry->fmap(i));
+ TopLoc_Location loc;
+ Handle(Geom_Surface) surf = BRep_Tool::Surface (face);
+ BRepAdaptor_Surface sf(face, Standard_False);
+ BRepLProp_SLProps prop(sf, 1, 1e-5);
+ Handle(Poly_Triangulation) triangulation = BRep_Tool::Triangulation (face, loc);
+
+ if (triangulation.IsNull())
+ {
+ cout << "cannot visualize face " << i << endl;
+ occgeometry->fvispar[i-1].SetNotDrawable();
+ continue;
+ }
+
+ gp_Pnt2d uv;
+ gp_Pnt pnt;
+ gp_Vec n;
+
+ glBegin (GL_TRIANGLES);
+
+ int ntriangles = triangulation -> NbTriangles();
+ for (int j = 1; j <= ntriangles; j++)
+ {
+ Poly_Triangle triangle = (triangulation -> Triangles())(j);
+ for (int k = 1; k <= 3; k++)
+ {
+ uv = (triangulation -> UVNodes())(triangle(k));
+ prop.SetParameters (uv.X(), uv.Y());
+
+ pnt = (triangulation -> Nodes())(triangle(k)).Transformed(loc);
+
+ // surf->D0 (uv.X(), uv.Y(), pnt);
+
+ if (prop.IsNormalDefined())
+ n = prop.Normal();
+ else
+ {
+ (*testout) << "Visualization of face " << i
+ << ": Normal vector not defined" << endl;
+ n = gp_Vec (0,0,0);
+ }
+
+ if (face.Orientation() == TopAbs_REVERSED) n *= -1;
+ glNormal3f (n.X(), n.Y(), n.Z());
+ glVertex3f (pnt.X(), pnt.Y(), pnt.Z());
+ }
+ }
+ glEnd ();
+
+ }
+ glEndList ();
+
+}
+
+void SelectFaceInOCCDialogTree (int facenr);
+
+void VisualSceneOCCGeometry :: MouseDblClick (int px, int py)
+{
+ int hits;
+
+ // select surface triangle by mouse click
+
+ GLuint selbuf[10000];
+ glSelectBuffer (10000, selbuf);
+
+
+ glRenderMode (GL_SELECT);
+
+ GLint viewport[4];
+ glGetIntegerv (GL_VIEWPORT, viewport);
+
+
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix();
+
+ GLdouble projmat[16];
+ glGetDoublev (GL_PROJECTION_MATRIX, projmat);
+
+ glLoadIdentity();
+ gluPickMatrix (px, viewport[3] - py, 1, 1, viewport);
+ glMultMatrixd (projmat);
+
+
+
+ glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glMatrixMode (GL_MODELVIEW);
+
+ glPushMatrix();
+ glMultMatrixf (transformationmat);
+
+
+
+ glInitNames();
+ glPushName (1);
+
+ glPolygonOffset (1, 1);
+ glEnable (GL_POLYGON_OFFSET_FILL);
+
+ glDisable(GL_CLIP_PLANE0);
+
+ glCallList (trilists.Get(1));
+
+ glDisable (GL_POLYGON_OFFSET_FILL);
+
+ glPopName();
+
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix();
+
+ glMatrixMode (GL_MODELVIEW);
+ glPopMatrix();
+
+ glFlush();
+
+
+ hits = glRenderMode (GL_RENDER);
+
+ int minname = 0;
+ GLuint mindepth = 0;
+
+ // find clippingplane
+ GLuint clipdepth = 0; // GLuint(-1);
+
+ for (int i = 0; i < hits; i++)
+ {
+ int curname = selbuf[4*i+3];
+ if (!curname) clipdepth = selbuf[4*i+1];
+ }
+
+ for (int i = 0; i < hits; i++)
+ {
+ int curname = selbuf[4*i+3];
+ GLuint curdepth = selbuf[4*i+1];
+ if (curname && (curdepth > clipdepth) &&
+ (curdepth < mindepth || !minname))
+ {
+ mindepth = curdepth;
+ minname = curname;
+ }
+ }
+
+ occgeometry->LowLightAll();
+
+ if (minname)
+ {
+ occgeometry->fvispar[minname-1].Highlight();
+
+ if (vispar.occzoomtohighlightedentity)
+ occgeometry->changed = OCCGEOMETRYVISUALIZATIONFULLCHANGE;
+ else
+ occgeometry->changed = OCCGEOMETRYVISUALIZATIONHALFCHANGE;
+ cout << "Selected face: " << minname << endl;
+ }
+ else
+ {
+ occgeometry->changed = OCCGEOMETRYVISUALIZATIONHALFCHANGE;
+ }
+
+ glDisable(GL_CLIP_PLANE0);
+
+ SelectFaceInOCCDialogTree (minname);
+
+
+ // selecttimestamp = NextTimeStamp();
+}
+
+
+
+
+
+
+}
+
+
+
+#endif
+
+
diff --git a/Netgen/libsrc/visualization/vssolution.cpp b/Netgen/libsrc/visualization/vssolution.cpp
index 8678fc900d..62b6faab83 100644
--- a/Netgen/libsrc/visualization/vssolution.cpp
+++ b/Netgen/libsrc/visualization/vssolution.cpp
@@ -15,6 +15,18 @@ namespace netgen
extern AutoPtr<Mesh> mesh;
+
+ VisualSceneSolution :: SolData :: SolData ()
+ : name (0), data (0), solclass(0)
+ { ; }
+
+ VisualSceneSolution :: SolData :: ~SolData ()
+ {
+ delete [] name;
+ delete data;
+ delete solclass;
+ }
+
VisualSceneSolution :: VisualSceneSolution ()
: VisualScene()
@@ -23,10 +35,12 @@ namespace netgen
linelist = 0;
clipplanelist = 0;
isolinelist = 0;
+ clipplane_isolinelist = 0;
surface_vector_list = 0;
cone_list = 0;
surfeltimestamp = GetTimeStamp();
+ surfellinetimestamp = GetTimeStamp();
clipplanetimestamp = GetTimeStamp();
solutiontimestamp = GetTimeStamp();
fieldlinestimestamp = GetTimeStamp();
@@ -36,22 +50,23 @@ namespace netgen
VisualSceneSolution :: ~VisualSceneSolution ()
{
- ;
+ ClearSolutionData();
}
void VisualSceneSolution :: AddSolutionData (SolData * sd)
{
- int i, funcnr = -1;
-
- for (i = 0; i < soldata.Size(); i++)
+ int funcnr = -1;
+ for (int i = 0; i < soldata.Size(); i++)
{
if (strcmp (soldata[i]->name, sd->name) == 0)
{
+ delete soldata[i];
soldata[i] = sd;
funcnr = i;
break;
}
}
+
if (funcnr == -1)
{
soldata.Append (sd);
@@ -91,18 +106,13 @@ namespace netgen
}
solutiontimestamp = NextTimeStamp();
}
-
- /*
- (*testout) << "set sol-data " << nsd->name
- << ", size = " << nsd->size << endl;
- if (nsd->data)
- for (i = 0; i < nsd->size; i++)
- (*testout) << i << ": " << nsd->data[i] << endl;
- */
}
+
void VisualSceneSolution :: ClearSolutionData ()
{
+ for (int i = 0; i < soldata.Size(); i++)
+ delete soldata[i];
soldata.SetSize (0);
}
@@ -110,8 +120,6 @@ namespace netgen
{
solutiontimestamp = NextTimeStamp();
}
-
-
VisualSceneSolution::SolData * VisualSceneSolution :: GetSolData (int i)
{
@@ -124,7 +132,7 @@ namespace netgen
- void VisualSceneSolution :: SaveSolutionData (const char * filename)
+ void VisualSceneSolution :: SaveSolutionData (const char * filename)
{
PrintMessage (1, "Write solution data to file ", filename);
int i, j, k;
@@ -171,15 +179,6 @@ namespace netgen
void VisualSceneSolution :: DrawScene ()
{
- /*
- if (multithread.running)
- {
- VisualScene::DrawScene();
- return;
- }
- */
- int i, j, k;
-
if (!mesh)
{
VisualScene::DrawScene();
@@ -189,24 +188,15 @@ namespace netgen
static NgLock mem_lock(mem_mutex);
mem_lock.Lock();
- /*
- lock = NULL;
- if (!lock)
- {
- lock = new NgLock (mesh->Mutex());
- lock -> Lock();
- }
- */
+ NgLock meshlock (mesh->Mutex(), 1);
BuildScene();
- // either continuous, or discrete coloring
- CreateTexture (numtexturecols, lineartexture);
+ CreateTexture (numtexturecols, lineartexture, GL_MODULATE);
- glClearColor(backcolor, backcolor, backcolor, 1.0);
+ glClearColor(backcolor, backcolor, backcolor, 1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
SetLight();
glPushMatrix();
@@ -218,7 +208,8 @@ namespace netgen
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- glPolygonOffset (1, 1);
+ // glPolygonOffset (1, 1);
+ glPolygonOffset (2, 10);
glEnable (GL_POLYGON_OFFSET_FILL);
glEnable (GL_COLOR_MATERIAL);
@@ -228,7 +219,7 @@ namespace netgen
glEnable (GL_TEXTURE_1D);
- if (vispar.drawfilledtrigs)
+ if (vispar.drawfilledtrigs || vispar.drawtetsdomain > 0 || vispar.drawdomainsurf > 0)
{
SetClippingPlane ();
@@ -240,7 +231,7 @@ namespace netgen
if (showclipsolution)
glCallList (clipplanelist);
-
+
if (draw_fieldlines)
{
@@ -249,7 +240,7 @@ namespace netgen
if (num_fieldlineslists <= 1)
glCallList (fieldlineslist);
else
- {
+ { // animated
int start = int (time / 10 * num_fieldlineslists);
for (int ln = 0; ln < 10; ln++)
{
@@ -278,43 +269,37 @@ namespace netgen
glLineWidth (1.0f);
glColor3f (0.0f, 0.0f, 0.0f);
glDisable (GL_LINE_SMOOTH);
-
- if (vispar.drawoutline || numisolines)
+
+
+ if (vispar.drawoutline && !numisolines)
{
SetClippingPlane ();
-
- if (numisolines)
- {
- glCallList (isolinelist);
- }
- else
- {
- glCallList (linelist);
- }
-
+ glCallList (linelist);
+ glDisable(GL_CLIP_PLANE0);
+ }
+
+ if (numisolines)
+ {
+ SetClippingPlane ();
+ glCallList (isolinelist);
+
glDisable(GL_CLIP_PLANE0);
+ glCallList (clipplane_isolinelist);
}
-
-
glPopMatrix();
glDisable(GL_CLIP_PLANE0);
- DrawColorBar (minval, maxval, logscale);
+ DrawColorBar (minval, maxval, logscale, lineartexture);
if (vispar.drawcoordinatecross)
DrawCoordinateCross ();
DrawNetgenLogo ();
glFinish();
+
- /*
- if (lock)
- {
- lock -> UnLock();
- delete lock;
- }
- */
+ // delete lock;
mem_lock.UnLock();
}
@@ -384,8 +369,6 @@ namespace netgen
glEndList();
}
-
-
vispar.colormeshsize = 1;
@@ -394,20 +377,24 @@ namespace netgen
glDisable(GL_CLIP_PLANE0);
- const SolData * sol = NULL;
- const SolData * vsol = NULL;
+ SolData * sol = NULL;
+ SolData * vsol = NULL;
if (scalfunction != -1)
sol = soldata[scalfunction];
if (vecfunction != -1)
vsol = soldata[vecfunction];
-
+
if (mesh->GetTimeStamp () > solutiontimestamp)
{
sol = NULL;
vsol = NULL;
}
+
+ if (sol && sol->solclass) sol->solclass->SetMultiDimComponent (multidimcomponent);
+ if (vsol && vsol->solclass) vsol->solclass->SetMultiDimComponent (multidimcomponent);
+
if (!autoscale || scalfunction == -1)
{
minval = mminval;
@@ -425,7 +412,7 @@ namespace netgen
if (mesh->GetTimeStamp() > surfeltimestamp ||
- solutiontimestamp > surfeltimestamp ||
+ solutiontimestamp > surfeltimestamp ||
zoomall)
{
if (mesh->GetTimeStamp() > surfeltimestamp ||
@@ -451,18 +438,24 @@ namespace netgen
}
}
-
if (surfellist)
glDeleteLists (surfellist, 1);
surfellist = glGenLists (1);
glNewList (surfellist, GL_COMPILE);
- DrawSurfaceElements();
+ DrawSurfaceElements();
glEndList ();
-
+ surfeltimestamp = max2 (solutiontimestamp, mesh->GetTimeStamp());
+ }
+
+
+ if (mesh->GetTimeStamp() > surfellinetimestamp ||
+ solutiontimestamp > surfellinetimestamp ||
+ zoomall)
+ {
if (linelist)
glDeleteLists (linelist, 1);
@@ -472,15 +465,12 @@ namespace netgen
DrawSurfaceElementLines();
glEndList ();
-
- surfeltimestamp = max2 (solutiontimestamp, mesh->GetTimeStamp());
-
- // cout << "minval = " << minval << " maxval = " << maxval << endl;
+
+ surfellinetimestamp = max2 (solutiontimestamp, mesh->GetTimeStamp());
}
-
-
+
if (mesh->GetTimeStamp() > surface_vector_timestamp ||
solutiontimestamp > surface_vector_timestamp ||
zoomall)
@@ -509,7 +499,11 @@ namespace netgen
if (vispar.clipenable && clipsolution)
{
// lock->UnLock();
+ NgLock mlock (mesh->Mutex(), 0);
+ mlock.UnLock();
mesh->BuildElementSearchTree();
+ mlock.Lock();
+
// lock->Lock();
}
@@ -531,7 +525,7 @@ namespace netgen
glBegin (GL_TRIANGLES);
for (i = 0; i < cpt.Size(); i++)
- DrawClipPlaneTrig (sol, scalcomp, cpt[i], 2*subdivisions);
+ DrawClipPlaneTrig (sol, scalcomp, cpt[i], 0); // 2*subdivisions);
glEnd();
glEnable(GL_CLIP_PLANE0);
@@ -544,6 +538,7 @@ namespace netgen
GetMinMax (vecfunction, 0, minval, maxval);
+ bool drawelem;
ARRAY<ClipPlanePoint> cpp;
GetClippingPlaneGrid (cpp);
@@ -553,12 +548,13 @@ namespace netgen
double values[6];
Vec3d v;
- GetValues (vsol, p.elnr, p.lam1, p.lam2, p.lam3, values);
+ drawelem = GetValues (vsol, p.elnr, p.lam1, p.lam2, p.lam3, values);
RealVec3d (values, v, vsol->iscomplex, imag_part);
double val = v.Length();
- if (val > 1e-10 * maxval)
+ // "drawelem": added 07.04.2004 (FB)
+ if (drawelem && val > 1e-10 * maxval)
{
v *= (rad / val / gridsize * 0.5);
@@ -571,9 +567,6 @@ namespace netgen
glEndList ();
}
-
-
-
if (
numisolines &&
(clipplanetimestamp < vispar.clipplanetimestamp ||
@@ -588,116 +581,162 @@ namespace netgen
Point<3> points[1100];
double values[1100];
- SurfaceElementIndex sei;
- glBegin (GL_LINES);
int nse = mesh->GetNSE();
- if (sol)
- for (sei = 0; sei <= nse; sei++)
- {
- const Element2d & el = (*mesh)[sei];
-
- if (el.GetType() == TRIG || el.GetType() == TRIG6)
- {
- Point<3> lp1, lp2, lp3;
- if (!mesh->GetCurvedElements().IsHighOrder())
- {
- GetPointDeformation (el[0]-1, lp1);
- GetPointDeformation (el[1]-1, lp2);
- GetPointDeformation (el[2]-1, lp3);
- }
-
-
- int n = 1 << subdivisions;
- int ii = 0;
- int ix, iy;
- for (iy = 0; iy <= n; iy++)
- for (ix = 0; ix <= n-iy; ix++)
+ if (sol)
+ {
+ glBegin (GL_LINES);
+
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
+ {
+ const Element2d & el = (*mesh)[sei];
+
+ if (el.GetType() == TRIG || el.GetType() == TRIG6)
+ {
+ Point<3> lp1, lp2, lp3;
+ if (!mesh->GetCurvedElements().IsHighOrder())
{
- double x = double(ix) / n;
- double y = double(iy) / n;
-
- values[ii] = GetSurfValue (sol, sei, x, y, scalcomp);
- Point<2> xref(x,y);
-
- if (mesh->GetCurvedElements().IsHighOrder())
- mesh->GetCurvedElements().
- CalcSurfaceTransformation (xref, sei, points[ii]);
- else
- points[ii] = lp3 + x * (lp1-lp3) + y * (lp2-lp3);
-
- if (deform)
- {
- Vec<3> def;
- GetSurfDeformation (sei, x, y, def);
- points[ii] += def;
- }
- ii++;
+ GetPointDeformation (el[0]-1, lp1);
+ GetPointDeformation (el[1]-1, lp2);
+ GetPointDeformation (el[2]-1, lp3);
}
-
- ii = 0;
- for (iy = 0; iy < n; iy++)
- {
- for (ix = 0; ix < n-iy; ix++)
+
+ int n = 1 << subdivisions;
+ int ii = 0;
+ int ix, iy;
+ for (iy = 0; iy <= n; iy++)
+ for (ix = 0; ix <= n-iy; ix++)
{
double x = double(ix) / n;
double y = double(iy) / n;
+ // TODO: consider return value (bool: draw/don't draw element)
+ GetSurfValue (sol, sei, x, y, scalcomp, values[ii]);
+ Point<2> xref(x,y);
+
+ if (mesh->GetCurvedElements().IsHighOrder())
+ mesh->GetCurvedElements().
+ CalcSurfaceTransformation (xref, sei, points[ii]);
+ else
+ points[ii] = lp3 + x * (lp1-lp3) + y * (lp2-lp3);
+
+ if (deform)
+ {
+ Vec<3> def;
+ GetSurfDeformation (sei, x, y, def);
+ points[ii] += def;
+ }
+ ii++;
+ }
+
+ ii = 0;
+ for (iy = 0; iy < n; iy++, ii++)
+ for (ix = 0; ix < n-iy; ix++, ii++)
+ {
int index[] = { ii, ii+1, ii+n-iy+1,
ii+1, ii+n-iy+2, ii+n-iy+1 };
- int np = (ix == n-iy-1) ? 3 : 6;
-
DrawIsoLines (points[index[0]], points[index[1]], points[index[2]],
values[index[0]], values[index[1]], values[index[2]],
minval, maxval, numisolines);
- if (np == 6)
+ if (ix < n-iy-1)
DrawIsoLines (points[index[3]], points[index[4]], points[index[5]],
- values[index[3]], values[index[4]], values[index[5]],
+ values[index[3]], values[index[4]], values[index[5]],
minval, maxval, numisolines);
- ii++;
+ }
+ }
+
+
+ if (el.GetType() == QUAD || el.GetType() == QUAD6 || el.GetType() == QUAD8 )
+ {
+ Point<3> lpi[4];
+ Vec<3> vx, vy, vtwist, def;
+ if (!mesh->GetCurvedElements().IsHighOrder())
+ {
+ for (int j = 0; j < 4; j++)
+ GetPointDeformation (el[j]-1, lpi[j]);
+ vx = lpi[1]-lpi[0];
+ vy = lpi[3]-lpi[0];
+ vtwist = (lpi[0]-lpi[1]) + (lpi[2]-lpi[3]);
+ }
+
+ int n = 1 << subdivisions;
+ int ix, iy, ii = 0;
+ for (iy = 0; iy <= n; iy++)
+ for (ix = 0; ix <= n; ix++, ii++)
+ {
+ double x = double(ix) / n;
+ double y = double(iy) / n;
+
+ // TODO: consider return value (bool: draw/don't draw element)
+ GetSurfValue (sol, sei, x, y, scalcomp, values[ii]);
+ Point<2> xref(x,y);
+
+ if (mesh->GetCurvedElements().IsHighOrder())
+ mesh->GetCurvedElements().
+ CalcSurfaceTransformation (xref, sei, points[ii]);
+ else
+ points[ii] = lpi[0] + x * vx + y * vy + x*y * vtwist;
+
+ if (deform)
+ {
+ GetSurfDeformation (sei, x, y, def);
+ points[ii] += def;
+ }
+ }
+
+ ii = 0;
+ for (iy = 0; iy < n; iy++, ii++)
+ for (ix = 0; ix < n; ix++, ii++)
+ {
+ DrawIsoLines (points[ii], points[ii+1], points[ii+n+1],
+ values[ii], values[ii+1], values[ii+n+1],
+ minval, maxval, numisolines);
+ DrawIsoLines (points[ii+1], points[ii+n+2], points[ii+n+1],
+ values[ii+1], values[ii+n+2], values[ii+n+1],
+ minval, maxval, numisolines);
}
- ii++;
- }
- /*
- double val1, val2, val3;
- val1 = GetSurfValue (sol, sei, 1, 0, scalcomp);
- val2 = GetSurfValue (sol, sei, 0, 1, scalcomp);
- val3 = GetSurfValue (sol, sei, 0, 0, scalcomp);
- */
- }
- }
-
+ }
+ }
+ glEnd();
+ }
+ glEndList ();
+
+ if (clipplane_isolinelist) glDeleteLists (clipplane_isolinelist, 1);
+
if (vispar.clipenable && clipsolution == 1 && sol)
{
- glDisable(GL_CLIP_PLANE0);
-
+ clipplane_isolinelist = glGenLists (1);
+ glNewList (clipplane_isolinelist, GL_COMPILE);
+
ARRAY<ClipPlaneTrig> cpt;
GetClippingPlaneTrigs (cpt);
+ bool drawelem;
glNormal3d (-clipplane[0], -clipplane[1], -clipplane[2]);
if (numisolines)
- for (i = 0; i < cpt.Size(); i++)
- {
- const ClipPlaneTrig & trig = cpt[i];
- double vali[3];
- for (j = 0; j < 3; j++)
- vali[j] = GetValue (sol, trig.elnr,
- trig.points[j].lami(0),
- trig.points[j].lami(1),
- trig.points[j].lami(2), scalcomp);
-
- DrawIsoLines (trig.points[0].p,
- trig.points[1].p,
- trig.points[2].p,
- vali[0], vali[1], vali[2], minval, maxval, numisolines);
- }
- glEnable(GL_CLIP_PLANE0);
+ for (i = 0; i < cpt.Size(); i++)
+ {
+ const ClipPlaneTrig & trig = cpt[i];
+ double vali[3];
+ for (j = 0; j < 3; j++)
+ drawelem = GetValue (sol, trig.elnr,
+ trig.points[j].lami(0),
+ trig.points[j].lami(1),
+ trig.points[j].lami(2), scalcomp, vali[j]);
+
+ if ( drawelem )
+ DrawIsoLines (trig.points[0].p,
+ trig.points[1].p,
+ trig.points[2].p,
+ vali[0], vali[1], vali[2], minval, maxval, numisolines);
+ }
+ glEndList ();
}
glEnd();
- glEndList ();
+
}
clipplanetimestamp = max2 (vispar.clipplanetimestamp, solutiontimestamp);
@@ -726,7 +765,7 @@ namespace netgen
mesh->GetBox (pmin, pmax);
double lami[3];
int i;
-
+ bool drawelem;
fieldlineslist = glGenLists (num_fieldlineslists);
@@ -750,7 +789,7 @@ namespace netgen
{
Vec3d v;
double values[6];
- GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
+ drawelem = GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
RealVec3d (values, v, vsol->iscomplex, phaser, phasei);
double val = v.Length();
@@ -765,7 +804,8 @@ namespace netgen
Point3d p2 = p + v;
cout << " p " << p << endl;
- DrawCylinder (p, p2, rad * 0.003);
+ // "drawelem": added 07.04.2004 (FB)
+ if ( drawelem ) DrawCylinder (p, p2, rad * 0.003);
p = p2;
for(i=0;i<20;i++)
@@ -774,14 +814,15 @@ namespace netgen
if (elnr != -1)
{
- GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
+ drawelem = GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
RealVec3d (values, v, vsol->iscomplex, phaser, phasei);
val = v.Length();
v *= (rad / val * 0.02);
SetOpenGlColor (val, minval, maxval, logscale);
p2 = p +v;
- DrawCylinder (p, p2, rad * 0.003);
+ // "drawelem": added 07.04.2004 (FB)
+ if ( drawelem ) DrawCylinder (p, p2, rad * 0.003);
p = p2;
}
else break;
@@ -793,7 +834,7 @@ namespace netgen
if (elnr != -1)
{
- GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
+ drawelem = GetValues (vsol, elnr, lami[0], lami[1], lami[2], values);
RealVec3d (values, v, vsol->iscomplex, phaser, phasei);
val = v.Length();
@@ -801,7 +842,8 @@ namespace netgen
SetOpenGlColor (val, minval, maxval, logscale);
p2 = p - v;
- DrawCylinder (p, p2, rad * 0.003);
+ // "drawelem": added 07.04.2004 (FB)
+ if ( drawelem ) DrawCylinder (p, p2, rad * 0.003);
p = p2;
}
else break;
@@ -815,13 +857,12 @@ namespace netgen
+
void VisualSceneSolution :: DrawSurfaceElements ()
{
- int j, k;
- SurfaceElementIndex sei;
-
const SolData * sol = NULL;
const SolData * vsol = NULL;
+ bool drawelem = 0;
if (scalfunction != -1)
sol = soldata[scalfunction];
@@ -833,27 +874,36 @@ namespace netgen
sol = NULL;
vsol = NULL;
}
-
+
glLineWidth (1.0f);
if (!sol || !sol->draw_surface)
glDisable (GL_TEXTURE_1D);
-
-
+
Point<3> points[1100];
Vec<3> nvs[1100];
double values[1100];
- glBegin (GL_TRIANGLES);
int nse = mesh->GetNSE();
- glColor3f (0.4, 0.4, 0.4);
+ glBegin (GL_TRIANGLES);
- for (sei = 0; sei < nse; sei++)
+ // glColor3f (0.4, 0.4, 0.4);
+ // glColor3d (0.8, 0.8, 0.8);
+ glColor3d (1.0, 1.0, 1.0);
+
+ for(SurfaceElementIndex sei = 0; sei < nse; sei++)
{
- Element2d & el = (*mesh)[sei];
+ const Element2d & el = (*mesh)[sei];
- if (el.GetType() == TRIG || el.GetType() == TRIG6)
+ if(vispar.drawdomainsurf > 0 &&
+ ((mesh->GetDimension() == 3 &&
+ vispar.drawdomainsurf != mesh->GetFaceDescriptor(el.GetIndex()).DomainIn() &&
+ vispar.drawdomainsurf != mesh->GetFaceDescriptor(el.GetIndex()).DomainOut()) ||
+ (mesh->GetDimension() == 2 && el.GetIndex() != vispar.drawdomainsurf))) continue;
+
+
+ if ( el.GetType() == TRIG || el.GetType() == TRIG6 )
{
Point<3> p1, p2, p3;
if (!mesh->GetCurvedElements().IsHighOrder())
@@ -865,15 +915,14 @@ namespace netgen
int n = 1 << subdivisions;
int ii = 0;
- int ix, iy;
- for (iy = 0; iy <= n; iy++)
- for (ix = 0; ix <= n-iy; ix++)
+ for (int iy = 0; iy <= n; iy++)
+ for (int ix = 0; ix <= n-iy; ix++)
{
double x = double(ix) / n;
double y = double(iy) / n;
if (sol && sol->draw_surface)
- values[ii] = GetSurfValue (sol, sei, x, y, scalcomp);
+ drawelem = GetSurfValue (sol, sei, x, y, scalcomp, values[ii]);
Point<2> xref(x,y);
Mat<3,2> dxdxi;
@@ -902,125 +951,129 @@ namespace netgen
}
ii = 0;
-
- for (iy = 0; iy < n; iy++)
- {
- for (ix = 0; ix < n-iy; ix++)
- {
- double x = double(ix) / n;
- double y = double(iy) / n;
-
- int index[] = { ii, ii+1, ii+n-iy+1,
- ii+1, ii+n-iy+2, ii+n-iy+1 };
-
- int np = (ix == n-iy-1) ? 3 : 6;
- for (int j = 0; j < np; j++)
- {
- if (sol && sol->draw_surface)
- SetOpenGlColor (values[index[j]], minval, maxval, logscale);
- glNormal3dv (&nvs[index[j]](0));
- glVertex3dv (points[index[j]]);
- }
- ii++;
- }
- ii++;
- }
+ for (int iy = 0; iy < n; iy++, ii++)
+ for (int ix = 0; ix < n-iy; ix++, ii++)
+ {
+ double x = double(ix) / n;
+ double y = double(iy) / n;
+
+ int index[] = { ii, ii+1, ii+n-iy+1,
+ ii+1, ii+n-iy+2, ii+n-iy+1 };
+
+ int np = (ix == n-iy-1) ? 3 : 6;
+ for (int j = 0; j < np; j++)
+ {
+ if (sol && sol->draw_surface && drawelem)
+ SetOpenGlColor (values[index[j]], minval, maxval, logscale);
+ else
+ glColor3f (0.4f, 0.4f, 0.4f);
+
+ glNormal3dv (nvs[index[j]]);
+ glVertex3dv (points[index[j]]);
+ }
+ }
}
}
glEnd ();
-
-
+
glBegin (GL_QUADS);
- for (sei = 0; sei < nse; sei++)
- {
- const Element2d & el = (*mesh)[sei];
-
- if (el.GetType() == QUAD || el.GetType() == QUAD6)
- {
- Point<3> lpi[4];
- for (k = 0; k < 4; k++)
- GetPointDeformation (el[k]-1, lpi[k]);
- Vec<3> vx = lpi[1]-lpi[0];
- Vec<3> vy = lpi[3]-lpi[0];
- Vec<3> vtwist = (lpi[0]-lpi[1]) + (lpi[2]-lpi[3]);
- Vec<3> nv = Cross (lpi[1]-lpi[0], Center (lpi[2],lpi[3]) - lpi[0]);
- nv.Normalize();
- glNormal3dv (nv);
-
+ for (SurfaceElementIndex sei = 0; sei < nse; sei++)
+ {
+ const Element2d & el = (*mesh)[sei];
- int n = 1 << subdivisions;
- int ii = 0;
- int ix, iy;
- for (iy = 0; iy <= n; iy++)
- for (ix = 0; ix <= n; ix++)
+ if(vispar.drawdomainsurf > 0 &&
+ ((mesh->GetDimension() == 3 &&
+ vispar.drawdomainsurf != mesh->GetFaceDescriptor(el.GetIndex()).DomainIn() &&
+ vispar.drawdomainsurf != mesh->GetFaceDescriptor(el.GetIndex()).DomainOut()) ||
+ (mesh->GetDimension() == 2 && el.GetIndex() != vispar.drawdomainsurf))) continue;
+
+ if ( el.GetType() == QUAD || el.GetType() == QUAD6 )
+ {
+ Point<3> lpi[4];
+ Vec<3> vx, vy, vtwist;
+
+ if (!mesh->GetCurvedElements().IsHighOrder())
{
- double x = double(ix) / n;
- double y = double(iy) / n;
+ for (int k = 0; k < 4; k++)
+ GetPointDeformation (el[k]-1, lpi[k]);
- Point<2> xref(x,y);
- Mat<3,2> dxdxi;
+ vx = lpi[1]-lpi[0];
+ vy = lpi[3]-lpi[0];
+ vtwist = (lpi[0]-lpi[1]) + (lpi[2]-lpi[3]);
+ }
+ Vec<3> nv = Cross (lpi[1]-lpi[0], Center (lpi[2],lpi[3]) - lpi[0]);
+ nv.Normalize();
+ glNormal3dv (nv);
- if (sol && sol->draw_surface)
- values[ii] = GetSurfValue (sol, sei, x, y, scalcomp);
+ int n = 1 << subdivisions;
+ int ii = 0;
+ int ix, iy;
+ for (iy = 0; iy <= n; iy++)
+ for (ix = 0; ix <= n; ix++)
+ {
+ double x = double(ix) / n;
+ double y = double(iy) / n;
+
+ Point<2> xref(x,y);
+ Mat<3,2> dxdxi;
+ if (sol && sol->draw_surface)
+ drawelem = GetSurfValue (sol, sei, x, y, scalcomp, values[ii]);
- if (mesh->GetCurvedElements().IsHighOrder())
- {
- mesh->GetCurvedElements().
- CalcSurfaceTransformation (xref, sei, points[ii], dxdxi);
- nvs[ii] = Cross (dxdxi.Col(0), dxdxi.Col(1));
- nvs[ii].Normalize();
- }
- else
- {
- points[ii] = lpi[0] + x * vx + y * vy + x*y * vtwist;
- nvs[ii] = Cross (vx, vy);
- nvs[ii].Normalize();
- }
+ if (mesh->GetCurvedElements().IsHighOrder())
+ {
+ mesh->GetCurvedElements().
+ CalcSurfaceTransformation (xref, sei, points[ii], dxdxi);
+ nvs[ii] = Cross (dxdxi.Col(0), dxdxi.Col(1));
+ nvs[ii].Normalize();
+ }
+ else
+ {
+ points[ii] = lpi[0] + x * vx + y * vy + x*y * vtwist;
+ nvs[ii] = Cross (vx, vy);
+ nvs[ii].Normalize();
+ }
- if (deform)
- {
- Vec<3> def;
- GetSurfDeformation (sei, x, y, def);
- points[ii] += def;
- }
+ if (deform)
+ {
+ Vec<3> def;
+ GetSurfDeformation (sei, x, y, def);
+ points[ii] += def;
+ }
- // points[ii] = lpi[0] + x * vx + y * vy;
- ii++;
- }
+ ii++;
+ }
- ii = 0;
- for (iy = 0; iy < n; iy++)
- {
- for (ix = 0; ix < n; ix++)
+ ii = 0;
+ for (iy = 0; iy < n; iy++, ii++)
+ for (ix = 0; ix < n; ix++, ii++)
{
double x = double(ix) / n;
double y = double(iy) / n;
-
+
int index[] = { ii, ii+1, ii+n+2, ii+n+1 };
-
+
for (int j = 0; j < 4; j++)
{
- if (sol && sol->draw_surface)
+ if (sol && sol->draw_surface && drawelem)
SetOpenGlColor (values[index[j]], minval, maxval, logscale);
- glNormal3dv (&nvs[index[j]](0));
+ else
+ glColor3f (0.4f, 0.4f, 0.4f);
+
+ glNormal3dv (nvs[index[j]]);
glVertex3dv (points[index[j]]);
}
- ii++;
}
- ii++;
- }
- }
- }
- glEnd();
-
- if (usetexture)
- glEnable (GL_TEXTURE_1D);
-
+ }
+ }
+ glEnd();
+
+ if (usetexture)
+ glEnable (GL_TEXTURE_1D);
}
@@ -1069,21 +1122,21 @@ nverse (mat, invmat);
nv = 4;
Point<3> p1, p2, p3, p4;
- GetPointDeformation (el[0]-1, p1, sei);
- GetPointDeformation (el[1]-1, p2, sei);
- GetPointDeformation (el[2]-1, p3, sei);
- if (nv == 4)
- GetPointDeformation (el[3]-1, p4, sei);
+ if (!mesh->GetCurvedElements().IsHighOrder())
+ {
+ p1 = (*mesh)[el[0]];
+ p2 = (*mesh)[el[1]];
+ p3 = (*mesh)[el[2]];
+ if (nv == 4)
+ p4 = (*mesh)[el[3]];
+ }
// glBegin (GL_LINE_LOOP);
int n = 1 << subdivisions;
// n = p;
- int ii = 0;
- int ix, iy;
Point<3> pnt;
-
for (k = 0; k < nv; k++)
{
Point<2> p0;
@@ -1130,16 +1183,15 @@ nverse (mat, invmat);
Point<3> pts[33], pts2[33];
if (n > 32) cerr << "too many subdivisions, code 433425" << endl;
- for (ix = 0; ix <= n; ix++)
+ for (int ix = 0; ix <= n; ix++)
{
Point<2> p = p0 + (double(ix) / n) * vtau;
double x = p(0);
double y = p(1);
- Point<2> xref(x,y);
if (mesh->GetCurvedElements().IsHighOrder())
mesh->GetCurvedElements().
- CalcSurfaceTransformation (xref, sei, pnt);
+ CalcSurfaceTransformation (p, sei, pnt);
else
{
if (nv == 3)
@@ -1163,6 +1215,8 @@ nverse (mat, invmat);
+
+
/*
// convert from point-values to Bernstein basis
for (i = 0; i < 3; i++)
@@ -1220,6 +1274,7 @@ void VisualSceneSolution :: DrawSurfaceVectors ()
SurfaceElementIndex sei;
const SolData * vsol = NULL;
+ bool drawelem;
if (vecfunction != -1)
vsol = soldata[vecfunction];
@@ -1244,6 +1299,7 @@ void VisualSceneSolution :: DrawSurfaceVectors ()
vsol->soltype==SOL_SURFACE_NONCONTINUOUS ||
vsol->soltype==SOL_VIRTUALFUNCTION)
*/
+
if (vsol->draw_surface && showsurfacesolution)
{
int nse = mesh->GetNSE();
@@ -1304,11 +1360,12 @@ void VisualSceneSolution :: DrawSurfaceVectors ()
double inv12 = -mat12/det;
double inv22 = mat11/det;
-
+ // cout << "drawsurfacevectors. xoffset = " << xoffset << ", yoffset = ";
+ // cout << yoffset << endl;
- for (s = 0; s <= 1; s += 1.0 / gridsize)
+ for (s = xoffset/gridsize; s <= 1+xoffset/gridsize; s += 1.0 / gridsize)
if (s >= minx2d && s <= maxx2d)
- for (t = 0; t <= 1; t += 1.0 / gridsize)
+ for (t = yoffset/gridsize; t <= 1+yoffset/gridsize; t += 1.0 / gridsize)
if (t >= miny2d && t <= maxy2d)
{
double lam1 = inv11 * (s - p2d[0](0)) + inv12 * (t-p2d[0](1));
@@ -1324,7 +1381,7 @@ void VisualSceneSolution :: DrawSurfaceVectors ()
Vec<3> v;
double values[6];
- GetSurfValues (vsol, sei, lam1, lam2, values);
+ drawelem = GetSurfValues (vsol, sei, lam1, lam2, values);
if (!vsol->iscomplex)
for (k = 0; k < 3; k++)
@@ -1340,14 +1397,18 @@ void VisualSceneSolution :: DrawSurfaceVectors ()
}
if (mesh->GetDimension() == 2)
- v(2) = 0;
+ if ( (!vsol->iscomplex && vsol->components != 3) ||
+ (vsol->iscomplex && vsol->components != 6) )
+ v(2) = 0;
double val = v.Length();
SetOpenGlColor (val, minval, maxval, logscale);
if (val > 1e-10 * maxval)
v *= (rad / val / gridsize * 0.5);
- DrawCone (cp, cp+4*v, 0.8*rad / gridsize);
+ // "drawelem": added 07.04.2004 (FB)
+ if ( drawelem ) DrawCone (cp, cp+4*v, 0.8*rad / gridsize);
+
/*
v /= val;
@@ -1440,8 +1501,9 @@ GetMinMax (int funcnr, int comp, double & minv, double & maxv) const
int i, j;
const SolData * sol;
double val;
+ bool considerElem;
- bool hasit = 0;
+ bool hasit = false;
minv = 0; maxv = 1;
if (funcnr != -1)
{
@@ -1451,12 +1513,16 @@ GetMinMax (int funcnr, int comp, double & minv, double & maxv) const
int ne = mesh->GetNE();
for (int i = 0; i < ne; i++)
{
- double val = GetValue (sol, i, 0.333, 0.333, 0.333, comp);
- if (val > maxv || !hasit)
- maxv = val;
- if (val < minv || !hasit)
- minv = val;
- hasit = 1;
+ // "considerElem": added 07.04.2004 (FB)
+ considerElem = GetValue (sol, i, 0.333, 0.333, 0.333, comp, val);
+ if (considerElem)
+ {
+ if (val > maxv || !hasit)
+ maxv = val;
+ if (val < minv || !hasit)
+ minv = val;
+ hasit = true;
+ }
}
}
if (sol->draw_surface)
@@ -1464,12 +1530,16 @@ GetMinMax (int funcnr, int comp, double & minv, double & maxv) const
int nse = mesh->GetNSE();
for (int i = 0; i < nse; i++)
{
- double val = GetSurfValue (sol, i, 0.333, 0.333, comp);
- if (val > maxv || !hasit)
- maxv = val;
- if (val < minv || !hasit)
- minv = val;
- hasit = 1;
+ // "considerElem": added 07.04.2004 (FB)
+ considerElem = GetSurfValue (sol, i, 0.333, 0.333, comp, val);
+ if (considerElem)
+ {
+ if (val > maxv || !hasit)
+ maxv = val;
+ if (val < minv || !hasit)
+ minv = val;
+ hasit = true;
+ }
}
}
}
@@ -1479,38 +1549,41 @@ GetMinMax (int funcnr, int comp, double & minv, double & maxv) const
-void VisualSceneSolution ::
+bool VisualSceneSolution ::
GetValues (const SolData * data, ElementIndex elnr,
double lam1, double lam2, double lam3,
double * values) const
{
+ bool ok;
switch (data->soltype)
{
case SOL_VIRTUALFUNCTION:
{
- bool ok =
- data->solclass->GetValue (elnr, lam1, lam2, lam3, values);
+ ok = data->solclass->GetValue (elnr, lam1, lam2, lam3, values);
break;
}
default:
{
for (int i = 0; i < data->components; i++)
- values[i] = GetValue (data, elnr, lam1, lam2, lam3, i+1);
+ ok = GetValue (data, elnr, lam1, lam2, lam3, i+1, values[i]);
}
}
+ return ok;
}
-double VisualSceneSolution ::
+bool VisualSceneSolution ::
GetValue (const SolData * data, ElementIndex elnr,
double lam1, double lam2, double lam3,
- int comp) const
+ int comp, double & val) const
{
+ val = 0;
+ bool ok = 0;
+
if (comp == 0)
{
- double val = 0;
ArrayMem<double,20> values(data->components);
- GetValues (data, elnr, lam1, lam2, lam3, &values[0]);
+ ok = GetValues (data, elnr, lam1, lam2, lam3, &values[0]);
switch (evalfunc)
{
@@ -1596,7 +1669,7 @@ GetValue (const SolData * data, ElementIndex elnr,
}
}
- return val;
+ return ok;
}
@@ -1605,12 +1678,10 @@ GetValue (const SolData * data, ElementIndex elnr,
case SOL_VIRTUALFUNCTION:
{
double values[20];
- bool ok = data->solclass->GetValue (elnr, lam1, lam2, lam3, values);
+ ok = data->solclass->GetValue (elnr, lam1, lam2, lam3, values);
- if (ok)
- return values[comp-1];
- else
- return 0;
+ val = values[comp-1];
+ return ok;
}
case SOL_NODAL:
{
@@ -1618,7 +1689,6 @@ GetValue (const SolData * data, ElementIndex elnr,
double lami[8];
int np, i;
- double val = 0;
switch (el.GetType())
{
@@ -1649,12 +1719,13 @@ GetValue (const SolData * data, ElementIndex elnr,
for (i = 0; i < np; i++)
val += lami[i] * data->data[(el[i]-1) * data->dist + comp-1];
- return val;
+ return 1;
}
case SOL_ELEMENT:
{
- return data->data[elnr * data->dist + comp-1];
+ val = data->data[elnr * data->dist + comp-1];
+ return 1;
}
case SOL_SURFACE_ELEMENT:
@@ -1666,7 +1737,6 @@ GetValue (const SolData * data, ElementIndex elnr,
double lami[8];
int np, i;
- double val = 0;
switch (el.GetType())
{
@@ -1726,14 +1796,20 @@ GetValue (const SolData * data, ElementIndex elnr,
for (i = 0; i < np; i++)
val += lami[i] * data->data[(base+i) * data->dist + comp-1];
- return val;
+ return 1;
}
case SOL_MARKED_ELEMENTS:
- return (*mesh)[elnr].TestRefinementFlag();
+ {
+ val = (*mesh)[elnr].TestRefinementFlag();
+ return 1;
+ }
case SOL_ELEMENT_ORDER:
- return (*mesh)[elnr].GetOrder();
+ {
+ val = (*mesh)[elnr].GetOrder();
+ return 1;
+ }
}
return 0;
}
@@ -1741,39 +1817,41 @@ GetValue (const SolData * data, ElementIndex elnr,
-void VisualSceneSolution ::
+bool VisualSceneSolution ::
GetSurfValues (const SolData * data, SurfaceElementIndex selnr,
double lam1, double lam2,
double * values) const
{
+ bool ok;
switch (data->soltype)
{
case SOL_VIRTUALFUNCTION:
{
- bool ok =
- data->solclass->GetSurfValue (selnr, lam1, lam2, values);
+ ok = data->solclass->GetSurfValue (selnr, lam1, lam2, values);
break;
}
default:
{
for (int i = 0; i < data->components; i++)
- values[i] = GetSurfValue (data, selnr, lam1, lam2, i+1);
+ ok = GetSurfValue (data, selnr, lam1, lam2, i+1, values[i]);
}
}
+ return ok;
}
-double VisualSceneSolution ::
+bool VisualSceneSolution ::
GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
double lam1, double lam2,
- int comp) const
+ int comp, double & val) const
{
+ bool ok;
if (comp == 0)
{
- double val = 0;
+ val = 0;
ArrayMem<double,20> values(data->components);
- GetSurfValues (data, selnr, lam1, lam2, &values[0]);
+ ok = GetSurfValues (data, selnr, lam1, lam2, &values[0]);
switch (evalfunc)
{
@@ -1859,7 +1937,7 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
}
}
- return val;
+ return ok;
/*
@@ -1876,13 +1954,23 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
{
case SOL_VIRTUALFUNCTION:
{
- double values[20];
- bool ok =
- data->solclass->GetSurfValue (selnr, lam1, lam2, values);
+ ArrayMem<double,20> values(data->components);
+ bool ok;
+
+ ok = data->solclass->GetSurfValue (selnr, lam1, lam2, &values[0]);
+
if (ok)
- return values[comp-1];
- else
- return 0;
+ {
+ if (!data->iscomplex)
+ val = values[comp-1];
+ else
+ {
+ // cout << "time = " << time << ", cos = " << cos(time) << endl;
+ val = values[comp-1]*cos(3*time) + values[comp]*sin(3*time);
+ }
+ }
+
+ return ok;
}
@@ -1892,7 +1980,7 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
double lami[8];
int np, i;
- double val = 0;
+ val = 0;
double lam3 = 1-lam1-lam2;
switch (el.GetType())
@@ -1941,7 +2029,7 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
for (i = 0; i < np; i++)
val += lami[i] * data->data[(el[i]-1) * data->dist + comp-1];
- return val;
+ return 1;
}
case SOL_ELEMENT:
@@ -1950,17 +2038,21 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
mesh->GetTopology().GetSurface2VolumeElement (selnr+1, el1, el2);
el1--;
- return data->data[el1 * data->dist+comp-1];
+ val = data->data[el1 * data->dist+comp-1];
+ return 1;
}
case SOL_NONCONTINUOUS:
{
+ val = 0;
+ // ?????
return 0;
}
case SOL_SURFACE_ELEMENT:
{
- return data->data[selnr * data->dist + comp-1];
+ val = data->data[selnr * data->dist + comp-1];
+ return 1;
}
case SOL_SURFACE_NONCONTINUOUS:
@@ -1969,7 +2061,7 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
double lami[8];
int np, i;
- double val = 0;
+ val = 0;
int order = data->order;
switch (order)
@@ -2031,14 +2123,20 @@ GetSurfValue (const SolData * data, SurfaceElementIndex selnr,
{
val += lami[i] * data->data[(base+i) * data->dist + comp-1];
}
- return val;
+ return 1;
}
case SOL_MARKED_ELEMENTS:
- return (*mesh)[selnr].TestRefinementFlag();
+ {
+ val = (*mesh)[selnr].TestRefinementFlag();
+ return 1;
+ }
case SOL_ELEMENT_ORDER:
- return (*mesh)[selnr].GetOrder();
+ {
+ val = (*mesh)[selnr].GetOrder();
+ return 1;
+ }
}
return 0;
@@ -2125,7 +2223,7 @@ void VisualSceneSolution :: GetClippingPlaneTrigs (ARRAY<ClipPlaneTrig> & trigs)
int ii, j, k, l;
ElementIndex ei;
- // int np = mesh->GetNV();
+
int np = mesh->GetNP();
int ne = mesh->GetNE();
@@ -2162,8 +2260,151 @@ void VisualSceneSolution :: GetClippingPlaneTrigs (ARRAY<ClipPlaneTrig> & trigs)
ARRAY<Element> loctetsloc;
ARRAY<Point3d> pointsloc;
+
+ int n = 1 << subdivisions;
+ ARRAY<Point<3> > grid((n+1)*(n+1)*(n+1));
+ ARRAY<Point<3> > locgrid((n+1)*(n+1)*(n+1));
+ ARRAY<double> val((n+1)*(n+1)*(n+1));
+
+
for (ei = 0; ei < ne; ei++)
{
+ ELEMENT_TYPE type = (*mesh)[ei].GetType();
+ if (type == HEX || type == PRISM || type == TET || type == PYRAMID)
+ {
+ const Element & el = (*mesh)[ei];
+
+ Vector shape(el.GetNP());
+
+ int ii = 0;
+ for (int ix = 0; ix <= n; ix++)
+ for (int iy = 0; iy <= n; iy++)
+ for (int iz = 0; iz <= n; iz++, ii++)
+ {
+ Point<3> ploc;
+ if (type == PRISM)
+ ploc = Point<3> (double(ix) / n * (1-double(iy)/n), double(iy) / n, double(iz) / n);
+ if (type == TET)
+ ploc = Point<3> (double(ix) / n * (1-double(iy)/n) * (1-double(iz)/n),
+ double(iy) / n * (1-double(iz)/n),
+ double(iz) / n);
+ if (type == HEX)
+ ploc = Point<3> (double(ix) / n, double(iy) / n, double(iz) / n);
+ if (type == PYRAMID)
+ ploc = Point<3> (double(ix) / n * (1-double(iz)/n),
+ double(iy) / n * (1-double(iz)/n),
+ double(iz)/n);
+
+ Point<3> pglob;
+
+ if (mesh->GetCurvedElements().IsHighOrder())
+ {
+ mesh->GetCurvedElements().
+ CalcElementTransformation (ploc, ei, pglob);
+ }
+ else
+ {
+ el.GetShapeNew (ploc, shape);
+ for (int j = 0; j < 3; j++)
+ {
+ pglob(j) = 0;
+ for (int k = 0; k < el.GetNP(); k++)
+ pglob(j) += shape(k) * (*mesh)[el[k]].X(j+1);
+ }
+ }
+
+ locgrid[ii] = ploc;
+ grid[ii] = pglob;
+ val[ii] =
+ pglob(0) * clipplane[0] +
+ pglob(1) * clipplane[1] +
+ pglob(2) * clipplane[2] +
+ clipplane[3];
+ }
+
+ for (int ix = 0; ix < n; ix++)
+ for (int iy = 0; iy < n; iy++)
+ for (int iz = 0; iz < n; iz++)
+ {
+ int base = iz + (n+1)*iy + (n+1)*(n+1)*ix;
+ int pi[8] =
+ { base, base+(n+1)*(n+1), base+(n+1)*(n+1)+(n+1), base+(n+1),
+ base+1, base+(n+1)*(n+1)+1, base+(n+1)*(n+1)+(n+1)+1, base+(n+1)+1 };
+
+ int tets[6][4] =
+ { { 1, 7, 2, 3 },
+ { 1, 7, 3, 4 },
+ { 1, 7, 4, 8 },
+ { 1, 7, 8, 5 },
+ { 1, 7, 5, 6 },
+ { 1, 7, 6, 2 }
+ };
+
+
+ for (int ii = 0; ii < 6; ii++)
+ {
+ int teti[4];
+ for (int k = 0; k < 4; k++)
+ teti[k] = pi[tets[ii][k]-1];
+
+ for (j = 0; j < 4; j++)
+ nodevali[j] = val[teti[j]];
+
+ cntce = 0;
+ for (j = 0; j < 6; j++)
+ {
+ int lpi1 = edgei[j][0];
+ int lpi2 = edgei[j][1];
+ if ( (nodevali[lpi1] > 0) !=
+ (nodevali[lpi2] > 0) )
+ {
+ edgelam[j] = nodevali[lpi2] / (nodevali[lpi2] - nodevali[lpi1]);
+ Point<3> p1 = grid[teti[lpi1]];
+ Point<3> p2 = grid[teti[lpi2]];
+
+ edgep[j] = p1 + (1-edgelam[j]) * (p2-p1);
+
+ cntce++;
+ cpe3 = cpe2;
+ cpe2 = cpe1;
+ cpe1 = j;
+ if (cntce >= 3)
+ {
+ ClipPlaneTrig cpt;
+ cpt.elnr = ei;
+
+ for (int k = 0; k < 3; k++)
+ {
+ int ednr;
+ switch (k)
+ {
+ case 0: ednr = cpe1; break;
+ case 1: ednr = cpe2; break;
+ case 2: ednr = cpe3; break;
+ }
+ cpt.points[k].p = edgep[ednr];
+
+ int pi1 = edgei[ednr][0];
+ int pi2 = edgei[ednr][1];
+ Point<3> p1 = locgrid[teti[pi1]];
+ Point<3> p2 = locgrid[teti[pi2]];
+ for (l = 0; l < 3; l++)
+ cpt.points[k].lami(l) =
+ edgelam[ednr] * p1(l) +
+ (1-edgelam[ednr]) * p2(l);
+ }
+
+ trigs.Append (cpt);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ else
+ {
+
// const Element & el = mesh->VolumeElement(i);
(*mesh)[ei].GetTets (loctets);
@@ -2228,6 +2469,7 @@ void VisualSceneSolution :: GetClippingPlaneTrigs (ARRAY<ClipPlaneTrig> & trigs)
}
}
}
+ }
}
}
@@ -2258,8 +2500,13 @@ void VisualSceneSolution :: GetClippingPlaneGrid (ARRAY<ClipPlanePoint> & pts)
int elnr;
double lami[3];
- for (xi1 = xi1mid-rad; xi1 <= xi1mid+rad; xi1 += rad / gridsize)
- for (xi2 = xi2mid-rad; xi2 <= xi2mid+rad; xi2 += rad / gridsize)
+ // cout << "getclippingplanegrid. xoffset = " << xoffset << ", yoffset = ";
+ // cout << yoffset << endl;
+
+ for (xi1 = xi1mid-rad+xoffset/gridsize; xi1 <= xi1mid+rad+xoffset/gridsize; xi1 += rad / gridsize)
+ for (xi2 = xi2mid-rad+yoffset/gridsize; xi2 <= xi2mid+rad+yoffset/gridsize; xi2 += rad / gridsize)
+ // for (xi1 = xi1mid-rad; xi1 <= xi1mid+rad; xi1 += rad / gridsize)
+ // for (xi2 = xi2mid-rad; xi2 <= xi2mid+rad; xi2 += rad / gridsize)
{
Point3d hp = p + xi1 * t1 + xi2 * t2;
@@ -2308,7 +2555,7 @@ SetOpenGlColor(double h, double hmin, double hmax, int logscale)
value *= 4;
- const double colp[][3] =
+ static const double colp[][3] =
{
{ 1, 0, 0 },
{ 1, 1, 0 },
@@ -2323,8 +2570,7 @@ SetOpenGlColor(double h, double hmin, double hmax, int logscale)
double r = value - i;
GLdouble col[3];
- int j;
- for (j = 0; j < 3; j++)
+ for (int j = 0; j < 3; j++)
col[j] = (1-r) * colp[i][j] + r * colp[i+1][j];
glColor3d (col[0], col[1], col[2]);
@@ -2472,6 +2718,7 @@ DrawClipPlaneTrig (const SolData * sol,
int level)
{
int j;
+ double val;
if (level <= 0)
for (j = 0; j < 3; j++)
{
@@ -2494,11 +2741,12 @@ DrawClipPlaneTrig (const SolData * sol,
p += def;
}
- double val =
- GetValue (sol, trig.elnr,
- trig.points[j].lami(0),
- trig.points[j].lami(1),
- trig.points[j].lami(2), scalcomp);
+
+ // TODO: consider return value (bool: draw/don't draw element)
+ GetValue (sol, trig.elnr,
+ trig.points[j].lami(0),
+ trig.points[j].lami(1),
+ trig.points[j].lami(2), scalcomp, val);
SetOpenGlColor (val, minval, maxval, logscale);
glVertex3dv (p);
@@ -2552,30 +2800,37 @@ int Ng_Vis_Set (ClientData clientData,
"vec") == 0)
vssolution.clipsolution = 2;
- const char * scalname =
+ // SZ const -> tcl_const
+ tcl_const char * scalname =
Tcl_GetVar (interp, "visoptions.scalfunction", 0);
- const char * vecname =
+ // SZ const -> tcl_const
+ tcl_const char * vecname =
Tcl_GetVar (interp, "visoptions.vecfunction", 0);
vssolution.scalfunction = -1;
vssolution.vecfunction = -1;
+ int pointpos; // SZ
+ char * pch;
+ pch=strchr(scalname,'.');
+ pointpos = int(pch-scalname+1);
+
for (i = 0; i < vssolution.soldata.Size(); i++)
{
if (strlen (vssolution.soldata[i]->name) ==
- strlen (scalname)-2 &&
+ pointpos-1 &&
strncmp (vssolution.soldata[i]->name, scalname,
- strlen (scalname)-2) == 0)
+ pointpos-1) == 0)
{
vssolution.scalfunction = i;
- vssolution.scalcomp = atoi (scalname + strlen(scalname)-1);
+ vssolution.scalcomp = atoi (scalname + pointpos);
}
if (strcmp (vssolution.soldata[i]->name, vecname) == 0)
vssolution.vecfunction = i;
}
-
- const char * evalname =
+
+ tcl_const char * evalname =
Tcl_GetVar (interp, "visoptions.evaluate", 0);
if (strcmp(evalname, "abs") == 0) vssolution.evalfunc = VisualSceneSolution::FUNC_ABS;
@@ -2586,6 +2841,14 @@ int Ng_Vis_Set (ClientData clientData,
vssolution.gridsize =
atoi (Tcl_GetVar (interp, "visoptions.gridsize", 0));
+ vssolution.xoffset =
+ atof (Tcl_GetVar (interp, "visoptions.xoffset", 0));
+
+ // cout << "x-offset:" << vssolution.xoffset << endl;
+
+ vssolution.yoffset =
+ atof (Tcl_GetVar (interp, "visoptions.yoffset", 0));
+
vssolution.autoscale =
atoi (Tcl_GetVar (interp, "visoptions.autoscale", 0));
@@ -2610,6 +2873,9 @@ int Ng_Vis_Set (ClientData clientData,
vssolution.numtexturecols =
atoi (Tcl_GetVar (interp, "visoptions.numtexturecols", 0));
+ vssolution.multidimcomponent =
+ atoi (Tcl_GetVar (interp, "visoptions.multidimcomponent", 0));
+
vssolution.draw_fieldlines =
atoi (Tcl_GetVar (interp, "visoptions.drawfieldlines", 0));
vssolution.num_fieldlines =
@@ -2638,6 +2904,7 @@ int Ng_Vis_Set (ClientData clientData,
if (argc >= 3 && strcmp (argv[1], "time") == 0)
{
vssolution.time = double (atoi (argv[2])) / 1000;
+ vssolution.solutiontimestamp = NextTimeStamp();
// cout << "time = " << vssolution.time << endl;
}
diff --git a/Netgen/libsrc/visualization/vssolution.hpp b/Netgen/libsrc/visualization/vssolution.hpp
index 8a63ffd6ba..d20654b5fc 100644
--- a/Netgen/libsrc/visualization/vssolution.hpp
+++ b/Netgen/libsrc/visualization/vssolution.hpp
@@ -36,6 +36,7 @@ class VisualSceneSolution : public VisualScene
int linelist;
int clipplanelist;
int isolinelist;
+ int clipplane_isolinelist;
int surface_vector_list;
int cone_list;
@@ -46,6 +47,7 @@ class VisualSceneSolution : public VisualScene
int num_fieldlineslists;
int surfeltimestamp, clipplanetimestamp, solutiontimestamp;
+ int surfellinetimestamp;
int fieldlinestimestamp, surface_vector_timestamp;
double minval, maxval;
@@ -78,6 +80,9 @@ public:
class SolData
{
public:
+ SolData ();
+ ~SolData ();
+
char * name;
double * data;
int components;
@@ -101,6 +106,7 @@ public:
int clipsolution; // 0..no, 1..scal, 2..vec
int scalfunction, scalcomp, vecfunction;
int gridsize;
+ double xoffset, yoffset;
int autoscale, logscale;
double mminval, mmaxval;
@@ -112,6 +118,8 @@ public:
bool lineartexture;
int numtexturecols;
+ int multidimcomponent;
+
// bool fieldlineplot;
double time;
@@ -146,16 +154,16 @@ private:
// Get Function Value, local coordinates lam1, lam2, lam3,
- double GetValue (const SolData * data, ElementIndex elnr,
+ bool GetValue (const SolData * data, ElementIndex elnr,
double lam1, double lam2, double lam3,
- int comp) const;
- double GetSurfValue (const SolData * data, SurfaceElementIndex elnr,
- double lam1, double lam2,
- int comp) const;
- void GetValues (const SolData * data, ElementIndex elnr,
+ int comp, double & val) const;
+ bool GetSurfValue (const SolData * data, SurfaceElementIndex elnr,
+ double lam1, double lam2,
+ int comp, double & val) const;
+ bool GetValues (const SolData * data, ElementIndex elnr,
double lam1, double lam2, double lam3,
double * values) const;
- void GetSurfValues (const SolData * data, SurfaceElementIndex elnr,
+ bool GetSurfValues (const SolData * data, SurfaceElementIndex elnr,
double lam1, double lam2,
double * values) const;
diff --git a/Netgen/nglib_addon.cpp b/Netgen/nglib_addon.cpp
index 8416c0af55..391e036012 100644
--- a/Netgen/nglib_addon.cpp
+++ b/Netgen/nglib_addon.cpp
@@ -2,13 +2,19 @@
#include "meshing.hpp"
#include "mystdlib.h"
+
+namespace nglib {
#include "nglib.h"
+}
using namespace netgen;
#include <iostream>
#include "Message.h"
+namespace nglib
+{
+
class mystreambuf: public streambuf
{
int index;
@@ -73,7 +79,7 @@ Ng_Result NgAddOn_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp
MeshVolume (mparam, *m);
//RemoveIllegalElements (*m);
- //OptimizeVolume (mparam, *m, NULL);
+ //OptimizeVolume (mparam, *m);
return NG_OK;
}
@@ -91,7 +97,9 @@ Ng_Result NgAddOn_OptimizeVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp
//MeshVolume (mparam, *m);
RemoveIllegalElements (*m);
- OptimizeVolume (mparam, *m, NULL);
+ OptimizeVolume (mparam, *m);
return NG_OK;
}
+
+}
--
GitLab