Changeset 2955 for issm/trunk/src/c/Bamgx/Mesh2.h

Timestamp:

02/04/10 07:25:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

• issm/trunk/src/c/Bamgx/Mesh2.h (modified) (5 diffs)

issm/trunk/src/c/Bamgx/Mesh2.h

@@ -16 +16 @@
 #include <limits.h>
 #include <time.h>
-
-#if  (defined(unix) || defined(__unix)) && !defined(__AIX)
-#define SYSTIMES
-#include <sys/times.h>
-#include <unistd.h>
-#endif
 
 #include "meshtype.h"
@@ -124 +118 @@
                                 Vertex * to;// use in geometry Vertex to now the Mesh Vertex associed 
                                 VertexOnGeom * onGeometry;     // if vint 8; // set with Triangles::SetVertexFieldOn()
-                                Vertex * onbv; // if vint == 16 on Background vertex Triangles::SetVertexFieldOnBTh()
-                                VertexOnEdge * onbe;   // if vint == 32 on Background edge
+                                Vertex * onBackgroundVertex; // if vint == 16 on Background vertex Triangles::SetVertexFieldOnBTh()
+                                VertexOnEdge * onBackgroundEdge;   // if vint == 32 on Background edge
                         };
                         Int1 vint;  // the vertex number in triangle; varies between 0 and 2 in t
@@ -245 +239 @@
         class GeometricalEdge {
                 public:
-                        GeometricalVertex * v[2];
+                        GeometricalVertex* v[2];
                         Int4 ref;
-                        Int4  CurveNumber;
-                        R2 tg[2]; // the 2 tangente 
-                        //   if tg[0] =0 => no continuite 
-                        GeometricalEdge * Adj [2]; 
+                        Int4 CurveNumber;
+                        R2   tg[2]; // the 2 tangentes
+                        //   if tg[0] =0 => no continuity
+                        GeometricalEdge* Adj[2]; 
                         int DirAdj[2];
-                        //  private:
                         int flag ;
-                public: 
                         GeometricalEdge* link; // if   Cracked() or Equi()
-
                         // end of data 
 
@@ -578 +569 @@
                         VertexOnVertex() {};
                         inline void Set(const Triangles &,Int4,Triangles &);
-                        void SetOnBTh(){v->onbv=bv;v->vint=IsVertexOnVertex;}
+                        void SetOnBTh(){v->onBackgroundVertex=bv;v->vint=IsVertexOnVertex;}
         };
         /*}}}1*/
@@ -590 +581 @@
                 VertexOnEdge(){}
                 inline void Set(const Triangles &,Int4,Triangles &);  
-                void SetOnBTh(){v->onbe=this;v->vint=IsVertexOnEdge;}  
+                void SetOnBTh(){v->onBackgroundEdge=this;v->vint=IsVertexOnEdge;}  
                 Vertex & operator[](int i) const { return (*be)[i];}
                 operator Real8 () const { return abcisse;}