header files

libsrc/geom2d/Makefile.am

@@ -7,7 +7,6 @@ lib_LTLIBRARIES = libgeom2d.la libgeom2dvis.la
 
 libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp
 libgeom2d_la_LIBADD = 	$(top_builddir)/libsrc/meshing/libmesh.la
-#	$(top_builddir)/libsrc/gprim/libgprim.la 
 
 libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp
 libgeom2dvis_la_LIBADD = libgeom2d.la

libsrc/geom2d/genmesh2d.cpp

@@ -1,8 +1,6 @@
-#include <mystdlib.h>
 #include <meshing.hpp>
 #include <geometry2d.hpp>
 
-
 namespace netgen
 {
 
@@ -10,10 +8,6 @@ namespace netgen
 
 
 
-
-
-
-
   void CalcPartition (double l, double h, double h1, double h2,
 		      double hcurve, double elto0, Array<double> & points);
 

libsrc/geom2d/geom2dmesh.cpp

@@ -1,6 +1,4 @@
-#include <mystdlib.h>
 #include <meshing.hpp>
-
 #include <geometry2d.hpp>
 
 namespace netgen

libsrc/geom2d/geom2dpkg.cpp

@@ -1,15 +1,8 @@
-#include <mystdlib.h>
-#include <myadt.hpp>
-#include <linalg.hpp>
-
-
-#include <incvis.hpp>
 #include <meshing.hpp>
 #include <geometry2d.hpp>
-
 #include <visual.hpp>
-#include "vsgeom2d.hpp"
 
+#include "vsgeom2d.hpp"
 
 // extern "C" int Ng_CSG_Init (Tcl_Interp * interp);
 

libsrc/geom2d/geometry2d.cpp

@@ -4,8 +4,6 @@
 
 */
 
-
-#include <mystdlib.h>
 #include <meshing.hpp>
 #include <geometry2d.hpp>
 

libsrc/geom2d/geometry2d.hpp

@@ -12,10 +12,9 @@
 
 
 // #include "../gprim/spline.hpp"
-#include "../gprim/splinegeometry.hpp"
+// #include "../gprim/splinegeometry.hpp"
 #include "geom2dmesh.hpp"
 
-
 namespace netgen
 {
 

libsrc/geom2d/vsgeom2d.cpp

@@ -1,9 +1,4 @@
-#include <mystdlib.h>
-#include "incvis.hpp"
-
-#include <myadt.hpp>
 #include <meshing.hpp>
-
 #include <geometry2d.hpp>
 #include <visual.hpp>
 

libsrc/gprim/adtree.hpp

@@ -9,13 +9,15 @@
 /* *************************************************************************/
 
 
+namespace netgen
+{
 
 /**
   Alternating Digital Tree
  */
 
-#include "../include/mystdlib.h"
+// #include "../include/mystdlib.h"
-#include "../include/myadt.hpp"
+// #include "../include/myadt.hpp"
 
 class ADTreeNode
 {
@@ -478,4 +480,7 @@ public:
 
   const ADTree6 & Tree() const { return *tree; };
 };
+
+}
+
 #endif

libsrc/gprim/geom2d.hpp

@@ -7,7 +7,8 @@
 /* Date:   5. Aug. 95                                                      */
 /* *************************************************************************/
 
-
+namespace netgen 
+{
 
   /* Geometric Algorithms */
 
@@ -880,6 +881,6 @@ inline void Mat2d :: AddDiadicProduct (double alpha, Vec2d & v)
     coeff[3] += alpha * v.Y() * v.Y();
   }
 
-
+}
 
 #endif

libsrc/gprim/geom3d.hpp

@@ -7,7 +7,8 @@
 /* Date:   5. Aug. 95                                                      */
 /* *************************************************************************/
 
-
+namespace netgen
+{
 
 
   extern void MyError (const char * ch);
@@ -739,6 +740,7 @@ public:
     void FromPlain (const Point3d & pp, Point3d & p) const;
   };
 
+}
 
 
 #endif

libsrc/gprim/geomfuncs.hpp

@@ -8,6 +8,9 @@
 /* *************************************************************************/
 
 
+namespace netgen 
+{
+
   template <int D>
   inline double Abs (const Vec<D> & v)
   {
@@ -154,4 +157,6 @@ double Det (const Mat<3,3> & m);
   void EigenValues (const Mat<3,3> & m, Vec<3> & ev);
   void EigenValues (const Mat<2,2> & m, Vec<3> & ev);
 
+}
+
 #endif

libsrc/gprim/geomobjects.hpp

@@ -8,6 +8,9 @@
 /* *************************************************************************/
 
 
+namespace netgen
+{
+
 
   template <int D> class Vec;
   template <int D> class Point;
@@ -361,7 +364,7 @@ public:
 
 
 
-
+}
 
 
 #endif

libsrc/gprim/geomops.hpp

@@ -8,6 +8,9 @@
 /* *************************************************************************/
 
 
+namespace netgen
+{
+
   /*
 
   Point - Vector operations
@@ -386,6 +389,6 @@ inline ostream & operator<< (ostream & ost, const Mat<H,W> & m)
   }
 
 
-
+}
 
 #endif

libsrc/gprim/geomtest3d.hpp

@@ -8,6 +8,9 @@
 /* *************************************************************************/
 
 
+namespace netgen
+{
+
 
 extern int
 IntersectTriangleLine (const Point<3> ** tri, const Point<3> ** line);
@@ -79,5 +82,6 @@ extern double MinDistTP2 (const Point3d & tp1, const Point3d & tp2,
 extern double MinDistLL2 (const Point3d & l1p1, const Point3d & l1p2,
 			  const Point3d & l2p1, const Point3d & l2p2);
 
+}
 
 #endif

libsrc/gprim/gprim.hpp

@@ -8,19 +8,26 @@
 /* *************************************************************************/
 
 
-namespace netgen
+#include <myadt.hpp>
-{
+#include <linalg.hpp>
+
+
+
+
 #include "geomobjects.hpp"
 #include "geomops.hpp"
 #include "geomfuncs.hpp"
 
 #include "geom2d.hpp"
 #include "geom3d.hpp"
+
 #include "geomtest3d.hpp"
-// #include "rot3d.hpp"
 #include "transform3d.hpp"
-// #include "reftrans.hpp"
+
 #include "adtree.hpp"
-}
+
+#include "spline.hpp"
+#include "splinegeometry.hpp"
+
 
 #endif

libsrc/gprim/transform3d.hpp

@@ -11,6 +11,9 @@
   Affine - Linear mapping in 3D space
  */
 
+namespace netgen
+{
+
 class Transformation3d;
 ostream & operator<< (ostream & ost, Transformation3d & trans);
 
@@ -185,6 +188,6 @@ template <int D>
 ostream & operator<< (ostream & ost, Transformation<D> & trans);
 
 
-
+}
 
 #endif

libsrc/stlgeom/stlgeom.cpp

@@ -1,14 +1,7 @@
-#include <mystdlib.h>
-
-#include <myadt.hpp>
-#include <linalg.hpp>
-#include <gprim.hpp>
-
 #include <meshing.hpp>
 
 #include "stlgeom.hpp"
 
-
 namespace netgen
 {
 
@@ -40,11 +33,13 @@ void STLMeshing (STLGeometry & geom,
 
 
   STLGeometry :: STLGeometry()
+  /*
   : edges(), edgesperpoint(),
     normals(),  externaledges(),
     atlas(), chartmark(), 
     lines(), outerchartspertrig(), vicinity(), markedtrigs(), markedsegs(),
     lineendpoints(), spiralpoints(), selectedmultiedge()
+  */
 {
 	edgedata = new STLEdgeDataList(*this);
   externaledges.SetSize(0);

libsrc/stlgeom/stlgeom.hpp

@@ -21,11 +21,9 @@
 */
 
 
-#include <gprim.hpp>
 #include <meshing.hpp>
 
 
-
 namespace netgen
 {
   extern int IsInArray(int n, const Array<int>& ia);

libsrc/stlgeom/stltool.cpp

@@ -856,7 +856,8 @@ void STLBoundarySeg :: Swap ()
 
 
 STLBoundary :: STLBoundary (STLGeometry * ageometry)
-  : boundary(), geometry(ageometry)
+  : // boundary(), 
+    geometry(ageometry)
 {
   ;
 }