meshing headers

libsrc/meshing/basegeom.hpp

@@ -7,7 +7,8 @@
 /* Date:   23. Aug. 09                                                    */
 /**************************************************************************/
 
-class Tcl_Interp;
+
+struct Tcl_Interp;
 
 namespace netgen
 {

libsrc/meshing/global.hpp

@@ -12,6 +12,9 @@
   global functions and variables
 */
 
+namespace netgen
+{
+
   ///
   DLL_HEADER extern double GetTime ();
   extern void ResetTime ();
@@ -46,5 +49,6 @@ extern volatile multithreadt multithread;
   extern string ngdir;
   extern DebugParameters debugparam;
   extern bool verbose;  
+}
 
 #endif

libsrc/meshing/localh.hpp

@@ -8,6 +8,8 @@
 /**************************************************************************/
 
 
+namespace netgen
+{
 
 
   /// box for grading
@@ -180,4 +182,6 @@ inline ostream & operator<< (ostream & ost, const LocalH & loch)
     return ost;
   }
 
+}
+
 #endif

libsrc/meshing/meshclass.hpp

@@ -11,7 +11,8 @@
   The mesh class
 */
 
-
+namespace netgen
+{
 
   enum resthtype { RESTRICTH_FACE, RESTRICTH_EDGE, 
 		   RESTRICTH_SURFACEELEMENT, RESTRICTH_POINT, RESTRICTH_SEGMENT };
@@ -756,6 +757,7 @@ inline ostream& operator<<(ostream& ost, const Mesh& mesh)
     return ost;
   }
 
+}
 
 #endif
 

libsrc/meshing/meshing.hpp

@@ -12,20 +12,22 @@
 
 namespace netgen
 {
-
+  // extern int printmessage_importance;
-  extern int printmessage_importance;
 
   class CSGeometry;
+  class NetgenGeometry;
+}
   
   
 #include "msghandler.hpp"
-
 #include "meshtype.hpp"
 #include "localh.hpp"
 #include "meshclass.hpp"
 #include "global.hpp"
 
 
+namespace netgen
+{
 #include "meshtool.hpp"
 #include "ruler2.hpp"
 #include "adfront2.hpp"
@@ -37,17 +39,12 @@ namespace netgen
 #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 "findip2.hpp"
 
@@ -55,23 +52,20 @@ namespace netgen
 #include "curvedelems.hpp"
 #include "clusters.hpp"
 
-#ifdef _INCLUDE_MORE
 #include "meshfunc.hpp"
-#endif
+
 #include "bisect.hpp"
 #include "hprefinement.hpp"
 #include "boundarylayer.hpp"
 #include "specials.hpp"
+}
 
 #include "validate.hpp"
+#include "basegeom.hpp"
 
 #ifdef PARALLEL
 #include "paralleltop.hpp"
-// #include "../parallel/parallelmesh.hpp"
 #endif
-}
 
 
-#include "basegeom.hpp"
-
 #endif

libsrc/meshing/meshtype.hpp

@@ -8,11 +8,15 @@
 /* Date:   01. Okt. 95                                                    */
 /**************************************************************************/
 
+namespace netgen
+{
+
   /*
     Classes for NETGEN
   */
 
 
+
   enum ELEMENT_TYPE { 
     SEGMENT = 1, SEGMENT3 = 2,
     TRIG = 10, QUAD=11, TRIG6 = 12, QUAD6 = 13, QUAD8 = 14,
@@ -1293,7 +1297,7 @@ public:
   };
 
 
-
+}
 
 
 

libsrc/meshing/msghandler.hpp

@@ -8,6 +8,9 @@
 /**************************************************************************/
 
 
+namespace netgen
+{
+
   extern void PrintDot(char ch = '.');
 
 
@@ -47,6 +50,7 @@ extern void PushStatusF(const MyStr& s);
   extern void PopStatus();
   extern void SetThreadPercent(double percent);
   extern void GetStatus(MyStr & s, double & percentage);
+}
 
 
 #endif

libsrc/meshing/paralleltop.hpp

@@ -1,7 +1,8 @@
 #ifndef FILE_PARALLELTOP
 #define FILE_PARALLELTOP
 
-#include <meshing.hpp>
+namespace netgen
+{
 
   extern int ntasks;
 
@@ -261,7 +262,7 @@ public:
   };
  
 
-
+}
 
 
 

libsrc/meshing/validate.hpp

@@ -1,7 +1,8 @@
 #ifndef VALIDATE_HPP
 #define VALIDATE_HPP
 
-
+namespace netgen
+{
   
   void GetPureBadness(Mesh & mesh, Array<double> & pure_badness,
 		      const BitArray & isnewpoint);
@@ -9,9 +10,12 @@ double Validate(const Mesh & mesh, Array<ElementIndex> & bad_elements,
 		  const Array<double> & pure_badness, 
 		  double max_worsening, const bool uselocalworsening,
 		  Array<double> * quality_loss = NULL);
-void RepairBisection(Mesh & mesh, Array<ElementIndex> & bad_elements, const BitArray & isnewpoint, const Refinement & refinement,
+  void RepairBisection(Mesh & mesh, Array<ElementIndex> & bad_elements, 
+		       const BitArray & isnewpoint, const Refinement & refinement,
 		       const Array<double> & pure_badness, 
 		       double max_worsening, const bool uselocalworsening,
 		       const Array< Array<int,PointIndex::BASE>* > & idmaps);
 
+}
+
 #endif // VALIDATE_HPP

tutorials/Makefile.am

@@ -5,7 +5,7 @@ dist_pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo			   \
 	cylsphere.geo ellipsoid.geo ellipticcyl.geo extrusion.geo fichera.geo lshape3d.geo \
 	manyholes.geo manyholes2.geo matrix.geo ortho.geo period.geo revolution.geo	   \
 	sculpture.geo shaft.geo shell.geo sphere.geo sphereincube.geo torus.geo trafo.geo  \
-	twobricks.geo twocubes.geo twocyl.geo						   \
+	twobricks.geo twocubes.geo twocyl.geo boundarycondition.geo			   \
 	hinge.stl  part1.stl frame.step  screw.step					   \
 	squarehole.in2d squarecircle.in2d square.in2d
 

tutorials/boundarycondition.geo

@@ -0,0 +1,16 @@
+algebraic3d
+
+solid p1 = plane (0.5, 0, 0; 1, 0, 0);
+
+# since surfaces of both bricks are identic they get the same bc id:
+solid brick1 = orthobrick (0,0,0; 1,1,1) and p1 -bc=1;
+solid brick2 = orthobrick (0,0,-1; 1,1,0) and p1 -bc=2;
+
+
+tlo brick1;
+tlo brick2;
+
+# override bc number: 
+# all faces of solid p1 belonging to the boundary of tlo brick1 get bc=3
+
+boundarycondition p1 brick1 3;