Changeset 12258 for issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.cpp

Timestamp:

05/16/12 13:51:50 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into branches/trunk-jpl-damage through revision 12254

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/objects/Bamg/Mesh.cpp (modified) (5 diffs)

issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.cpp

@@ -2885 +2885 @@
 
                 //build quadtree
-                if (!quadtree)  quadtree = new QuadTree(this,0);
+                if (!quadtree)  quadtree = new BamgQuadtree(this,0);
                 quadtree->Add(*v0);
                 quadtree->Add(*v1);
@@ -3107 +3107 @@
         }
         /*}}}1*/
-        /*FUNCTION Mesh::MakeQuadTree{{{1*/
-        void Mesh::MakeQuadTree() {  
-                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeQuadTree)*/
+        /*FUNCTION Mesh::MakeBamgQuadtree{{{1*/
+        void Mesh::MakeBamgQuadtree() {  
+                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeBamgQuadtree)*/
 
                 long int verbose=0;
-                if (  !quadtree )  quadtree = new QuadTree(this);
+                if (  !quadtree )  quadtree = new BamgQuadtree(this);
 
         }
@@ -3622 +3622 @@
 
         if (!quadtree) delete quadtree; //ReInitialise;
-        quadtree = new QuadTree(this,0);
+        quadtree = new BamgQuadtree(this,0);
         quadtree->Add(*v0);
         quadtree->Add(*v1);
@@ -3900 +3900 @@
                 if (quadtree){
                         delete quadtree;
-                        quadtree = new QuadTree(this);
+                        quadtree = new BamgQuadtree(this);
                 }
 
@@ -4116 +4116 @@
 
         delete [] tstart;
-        if (quadtree) quadtree= new QuadTree(this);
+        if (quadtree) quadtree= new BamgQuadtree(this);
 }
 /*}}}1*/