Changeset 12218 for issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.h

Timestamp:

05/07/12 10:54:06 (13 years ago)

Author:

Mathieu Morlighem

Message:

renamed QuadTree BamgQuadtree to avoid conflicts with Kriging's Quadtree

File:

• issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.h (moved) (moved from issm/trunk-jpl/src/c/objects/Bamg/QuadTree.h ) (3 diffs)

issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.h

@@ -1 @@
-/*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, QuadTree.h)*/
+/*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.h)*/
 #ifndef _QUADTREE_H
 #define _QUADTREE_H
@@ -12 +12 @@
         class BamgVertex;
 
-        class QuadTree{
+        class BamgQuadtree{
 
                 private:
@@ -21 +21 @@
                          * - up to 4 vertices
                          * - 4 "sub" quadtree boxes*/
-                        class QuadTreeBox: public Object{ 
+                        class BamgQuadtreeBox: public Object{ 
                                 public:
                                         int nbitems; // number of current vertices in the box
                                         union{
-                                                QuadTreeBox* b[4];
+                                                BamgQuadtreeBox* b[4];
                                                 BamgVertex*  v[4];
                                         };
                                         /*Object functions*/
-                                        void  Echo(){_error_("not implemented yet");};
-                                        void  DeepEcho(){_error_("not implemented yet");};
-                                        int   Id(){_error_("not implemented yet");};
-                                        int   MyRank(){_error_("not implemented yet");};
-                                        int   ObjectEnum(){_error_("not implemented yet");};
-                                        Object* copy(){_error_("not implemented yet");};
+                                        void    Echo()       {_error_("not implemented yet"); };
+                                        void    DeepEcho()   {_error_("not implemented yet"); };
+                                        int     Id()         {_error_("not implemented yet"); };
+                                        int     MyRank()     {_error_("not implemented yet"); };
+                                        int     ObjectEnum() {_error_("not implemented yet"); };
+                                        Object *copy()       {_error_("not implemented yet"); };
                         };
 
-                        /*QuadTree private Fields*/
+                        /*BamgQuadtree private Fields*/
                         DataSet* boxcontainer;
 
                 public:
 
-                        /*QuadTree public Fields*/
-                        QuadTreeBox* root;
-                        long         NbQuadTreeBox;
+                        /*BamgQuadtree public Fields*/
+                        BamgQuadtreeBox* root;
+                        long         NbBamgQuadtreeBox;
                         long         NbVertices;
 
-                        QuadTree();
-                        QuadTree(Mesh *t,long nbv=-1);
-                        ~QuadTree();
+                        BamgQuadtree();
+                        BamgQuadtree(Mesh *t,long nbv=-1);
+                        ~BamgQuadtree();
 
-                        BamgVertex*  NearestVertex(Icoor1 i,Icoor1 j);
-                        BamgVertex*  NearestVertexWithNormal(Icoor1 i,Icoor1 j);
-                        QuadTreeBox* NewQuadTreeBox(void);
-                        BamgVertex*  ToClose(BamgVertex & ,double ,Icoor1,Icoor1);
-                        void         Add( BamgVertex & w);
-
+                        BamgVertex      *NearestVertex(Icoor1 i,Icoor1 j);
+                        BamgVertex      *NearestVertexWithNormal(Icoor1  i,Icoor1 j);
+                        BamgQuadtreeBox *NewBamgQuadtreeBox(void);
+                        BamgVertex      *ToClose(BamgVertex &,double ,Icoor1,Icoor1);
+                        void             Add(BamgVertex &w);
         };
 }