Changeset 2989

Timestamp:

02/08/10 17:24:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added ifndef for each header file

Location:

issm/trunk/src/c/Bamgx

Files:

• Mesh2.h (modified) (8 diffs)
• Metric.h (modified) (2 diffs)
• QuadTree.h (modified) (2 diffs)
• R2.h (modified) (2 diffs)
• SetOfE4.h (modified) (1 diff)

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

@@ -6 +6 @@
 #include "../include/macros.h"
 #include "../toolkits/toolkits.h"
-
-//From MeshIo
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <cctype>
-#include <stdlib.h>
-#include <math.h>
 
 #include "meshtype.h"
@@ -817 +809 @@
         /*}}}1*/
 
+        inline void Vertex::Set(const Vertex & rec,const Triangles & ,Triangles & ){ 
+                *this  = rec;
+          }
+        inline void GeometricalVertex::Set(const GeometricalVertex & rec,const Geometry & ,const Geometry & ){ 
+                *this  = rec;
+          }
+        inline void VertexOnVertex::Set(const Triangles & Th ,Int4 i,Triangles & ThNew) { 
+                *this = Th.VertexOnBThVertex[i];  
+                v = ThNew.vertices + Th.Number(v);
+
+          }
+        Int4 inline  Vertex::Optim(int i,int koption){ 
+                Int4 ret=0;
+                if ( t && (vint >= 0 ) && (vint <3) )
+                  {
+                        ret = t->Optim(vint,koption);
+                        if(!i) 
+                          {
+                                t =0; // for no future optime 
+                                vint= 0; }
+                  }
+                return ret;
+          }
+
         // to sort in descending order
         template<class T>  inline void  HeapSort(T *c,long n){
@@ -902 +918 @@
           }
 
-        inline void Vertex::Set(const Vertex & rec,const Triangles & ,Triangles & )
-          { 
-                *this  = rec;
-          }
-        inline void GeometricalVertex::Set(const GeometricalVertex & rec,const Geometry & ,const Geometry & )
-          { 
-                *this  = rec;
-          }
+
         inline void Edge::Set(const Triangles & Th ,Int4 i,Triangles & ThNew)
           { 
@@ -950 +959 @@
                  link = ThNew.triangles + Th.Number(link);
           }
-        inline void VertexOnVertex::Set(const Triangles & Th ,Int4 i,Triangles & ThNew)
-          { 
-                *this = Th.VertexOnBThVertex[i];  
-                v = ThNew.vertices + Th.Number(v);
-
-          }
+
         inline void SubDomain::Set(const Triangles & Th ,Int4 i,Triangles & ThNew)
           {
@@ -1133 +1137 @@
           }
 
-        Int4 inline  Vertex::Optim(int i,int koption)
-          { 
-                Int4 ret=0;
-                if ( t && (vint >= 0 ) && (vint <3) )
-                  {
-                        ret = t->Optim(vint,koption);
-                        if(!i) 
-                          {
-                                t =0; // for no future optime 
-                                vint= 0; }
-                  }
-                return ret;
-          }
-
-        Icoor2 inline det(const Vertex & a,const Vertex & b,const Vertex & c)
-          {
+
+        Icoor2 inline det(const Vertex & a,const Vertex & b,const Vertex & c){
                 register  Icoor2 bax = b.i.x - a.i.x ,bay = b.i.y - a.i.y; 
                 register  Icoor2 cax = c.i.x - a.i.x ,cay = c.i.y - a.i.y; 
-                return  bax*cay - bay*cax;}
+                return  bax*cay - bay*cax;
+          }
 
 
@@ -1158 +1149 @@
                                         Vertex *s1,Vertex *s2,Icoor2 det1,Icoor2 det2);
 
-
-
                 int inline TriangleAdjacent::swap()
                   { return  t->swap(a);}
-
-
 
                 int SwapForForcingEdge(Vertex   *  & pva ,Vertex  * &   pvb ,
@@ -1171 +1158 @@
                 int ForceEdge(Vertex &a, Vertex & b,TriangleAdjacent & taret) ;
 
-                // inline bofbof   FH 
-                inline  TriangleAdjacent FindTriangleAdjacent(Edge &E)
-                  {
+                inline  TriangleAdjacent FindTriangleAdjacent(Edge &E){
                         Vertex * a = E.v[0];
                         Vertex * b = E.v[1];
@@ -1202 +1187 @@
                   }
 
-                inline Vertex * TheVertex(Vertex * a) // give a unique vertex with smallest number
-                  { // in case on crack in mesh 
+                inline Vertex* TheVertex(Vertex * a){
+                        // give a unique vertex with smallest number
+                   // in case on crack in mesh 
                         Vertex * r(a), *rr;
                         Triangle * t = a->t;

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

@@ -1 @@
-#ifndef TYPEMETRIX
-#define TYPEMETRIX Metric
-#endif
+#ifndef _METRIC_H
+#define _METRIC_H
 
-//#include "R2.h"
+#include "R2.h"
+
 namespace bamg {
 
@@ -121 +121 @@
                 return ( Abs(la - lb) <1.0e-6*Max3(la,lb,1.0e-20))  ? s : (exp(s*lab*(la-lb)/(la*lb))-1)*lb/(la-lb);
         }
-
 }
+#endif

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

@@ +1 @@
+#ifndef _QUADTREE_H
+#define _QUADTREE_H
+
 #include "../shared/shared.h"
 #include "../include/macros.h"
@@ -63 +66 @@
         };
 }
+#endif

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

@@ +1 @@
+#ifndef _R2_H
+#define _R2_H
+
 namespace bamg {
 
@@ -96 +99 @@
           } 
 }
+#endif

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

@@ -36 +36 @@
         };
 }
-
 #endif