Changeset 16233 for issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

Timestamp:

09/23/13 11:01:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed legacy code

File:

• issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp ¶

@@ -391 +391 @@
         }
         /*}}}*/
-        /*FUNCTION BamgQuadtree::NearestVertexWithNormal{{{*/
-        BamgVertex*  BamgQuadtree::NearestVertexWithNormal(Icoor1 i,Icoor1 j) {
-                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.cpp/NearestVertexWithNormal)*/
-
-                BamgQuadtreeBox * pb[ MaxDepth ];
-                int  pi[ MaxDepth  ];
-                Icoor1 ii[  MaxDepth ], jj [ MaxDepth];
-                int l; // level
-                BamgQuadtreeBox * b;
-                long     h =MaxISize,h0;
-                long     hb=MaxISize;
-                Icoor1  i0=0,j0=0;
-                Icoor1  iplus( i<MaxISize?(i<0?0:i):MaxISize-1);
-                Icoor1  jplus( j<MaxISize?(j<0?0:j):MaxISize-1);
-
-                BamgVertex *vn=0;
-
-                // init for optimisation ---
-                b = root;
-                register long  n0;
-                if (!root->nbitems)
-                 return vn; // empty tree 
-
-                while( (n0 = b->nbitems) < 0) 
-                  {
-                        // search the non empty 
-                        // BamgQuadtreeBox containing  the point (i,j)
-                        register Icoor1 hb2 = hb >> 1 ;
-                        register  int k = IJ(iplus,jplus,hb2);// BamgQuadtreeBox number of size hb2 contening i;j
-                        register BamgQuadtreeBox * b0= b->b[k];
-                        if ( ( b0 == 0) || (b0->nbitems == 0) ) 
-                         break; // null box or empty   => break             
-                        b=b0;   
-                        i0 += I_IJ(k,hb2); // i orign of BamgQuadtreeBox
-                        j0 += J_IJ(k,hb2); // j orign of BamgQuadtreeBox 
-                        hb = hb2; 
-                  }
-
-                if ( n0 > 0) 
-                  {  
-                        for(register int k=0;k<n0;k++)
-                          {
-                                I2 i2 =  b->v[k]->i;
-                                //   try if is in the right direction -- 
-                                h0 = NORM(iplus,i2.x,jplus,i2.y);
-                                if (h0 <h) {
-                                        h = h0;
-                                        vn = b->v[k];}
-                          }
-                        if (vn) return vn; 
-                  }
-                // general case -----
-                // INITIALISATION OF THE HEAP 
-                l =0; // level 
-                pb[0]= b;
-                pi[0]=b->nbitems>0 ?(int)  b->nbitems : 4  ;
-                ii[0]=i0;
-                jj[0]=j0;
-                h=hb;
-                do {   // walk on the tree  
-                        b= pb[l];
-                        while (pi[l]--) // loop on 4 element of the box
-                          {           
-                                int k = pi[l];
-
-                                if (b->nbitems>0) // BamgVertex BamgQuadtreeBox none empty
-                                  { 
-                                        I2 i2 =  b->v[k]->i;
-                                        // if good direction when try -- 
-
-                                        h0 = NORM(iplus,i2.x,jplus,i2.y);
-                                        if (h0 <h) 
-                                          {
-                                                h = h0;
-                                                vn = b->v[k];
-                                          }
-                                  }
-                                else // Pointer BamgQuadtreeBox 
-                                  { 
-                                        register BamgQuadtreeBox *b0=b;
-                                        if ((b=b->b[k])) 
-                                          {
-                                                hb >>=1 ; // div by 2
-                                                register Icoor1 iii = ii[l]+I_IJ(k,hb);
-                                                register Icoor1 jjj = jj[l]+J_IJ(k,hb);
-
-                                                if  (INTER_SEG(iii,iii+hb,iplus-h,iplus+h) && INTER_SEG(jjj,jjj+hb,jplus-h,jplus+h)) 
-                                                  {
-                                                        pb[++l]=  b;
-                                                        pi[l]= b->nbitems>0 ?(int)  b->nbitems : 4  ;
-                                                        ii[l]= iii;
-                                                        jj[l]= jjj;
-
-                                                  }
-                                                else
-                                                 b=b0, hb <<=1 ;
-                                          }
-                                        else
-                                         b=b0;
-                                  }
-                          }
-                        hb <<= 1; // mul by 2 
-                } while (l--);
-
-                return vn;
-        }
-        /*}}}*/
         /*FUNCTION BamgQuadtree::NewBamgQuadtreeBox {{{*/
         BamgQuadtree::BamgQuadtreeBox* BamgQuadtree::NewBamgQuadtreeBox(void){