Changeset 5177 for issm/trunk/src/c/objects/Bamg/Geometry.cpp

Timestamp:

08/12/10 09:43:45 (15 years ago)

Author:

Mathieu Morlighem

Message:

As usual (Added object constructor from matlab structure

File:

• issm/trunk/src/c/objects/Bamg/Geometry.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Bamg/Geometry.cpp

@@ -111 +111 @@
                          * where D is the longest side of the domain (direction x or y)
                          * so that (x-pmin.x)/D is in ]0 1[
+                         *
+                         * coefIcoor = (2^30 -1)/D
                          */
                         coefIcoor=(MaxICoor)/(Max(pmax.x-pmin.x,pmax.y-pmin.y));
@@ -398 +400 @@
 
         /*Methods*/
-        /*FUNCTION Geometry::AfterRead(){{{1*/
+        /*FUNCTION Geometry::AfterRead{{{1*/
         void Geometry::AfterRead(){
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/AfterRead)*/
 
-                long int verbose=0;
-
-                long i,j,k;
-                int jj;
-                long* head_v=new long[nbv];
-                long* next_p=new long[2*nbe];
-                float* eangle=new float[nbe];
-                double eps=1e-20;
-                QuadTree quadtree; // build quadtree to find duplicates
-                BamgVertex* v0=vertices; 
-                GeometricalVertex* v0g=(GeometricalVertex*) (void*)v0;   
+                long               i,j,k;
+                int                jj;
+                long              *head_v   = new long[nbv];
+                long              *next_p   = new long[2*nbe];
+                float             *eangle   = new float[nbe];
+                double             eps      = 1e-20;
+                QuadTree           quadtree; // build quadtree to find duplicates
+                BamgVertex        *v0       = vertices;
+                GeometricalVertex *v0g      = (GeometricalVertex*) (void*)v0;
 
                 k=0;
@@ -424 +424 @@
                         All the coordinates are transformed to ]0,1[^2
                         then, the integer coordinates are computed using 
-                        the transformation ]0,1[^2 -> [0 2^(30-1)[^2 for a quadtree of depth 30*/
+                        the transformation ]0,1[^2 -> [0 2^30-1[^2 for a quadtree of depth 30*/
                         vertices[i].i=toI2(vertices[i].r); 
 
-                        //find nearest vertex already present in the quadtree (NULL if empty)
+                        /*find nearest vertex already present in the quadtree (NULL if empty)*/
                         BamgVertex* v=quadtree.NearestVertex(vertices[i].i.x,vertices[i].i.y); 
 
-                        //if there is a vertex found that is to close to vertices[i] -> error
-                        if( v && Norme1(v->r - vertices[i]) < eps ){
-                                printf("WARNING: two points of the geometry are very closed to each other\n");
-                        }
-
-                        //Add vertices[i] to the quadtree
+                        /*if there is a vertex found that is to close to vertices[i] -> error*/
+                        if( v && Norme1(v->r - vertices[i].r) < eps ){
+                                ISSMERROR("two points of the geometry are very closed to each other");
+                        }
+
+                        /*Add vertices[i] to the quadtree*/
                         quadtree.Add(vertices[i]);
-                }
-
-                //if k>0, there are some duplicate vertices -> error
-                if (k) {
-                        printf("number of distinct vertices= %i, over %i\n",nbv - k,nbv);
-                        printf("List of duplicate vertices:\n");
-                        ISSMERROR("See above");
                 }
 
@@ -767 +760 @@
                 nbv=0;
                 nbe=0;
-                quadtree=0;
-                curves=0;
-                edges=0;
-                vertices=0;
+                quadtree=NULL;
+                curves=NULL;
+                edges=NULL;
+                vertices=NULL;
                 nbsubdomains=0;
                 nbcurves=0;
-                subdomains=0;
+                subdomains=NULL;
                 MaxCornerAngle = 10*Pi/180; //default is 10 degres
         }
@@ -941 +934 @@
         /*FUNCTION Geometry::toI2{{{1*/
         I2 Geometry::toI2(const R2 & P) const {
-                return  I2( (Icoor1) (coefIcoor*(P.x-pmin.x))
-                                        ,(Icoor1) (coefIcoor*(P.y-pmin.y)) );
+                /*coefIcoor is the coefficient used for integer coordinates:
+                 *                       (x-pmin.x)
+                 * Icoor x = (2^30 -1) ------------ 
+                 *                          D
+                 * where D is the longest side of the domain (direction x or y)
+                 * so that (x-pmin.x)/D is in ]0 1[
+                 *
+                 * coefIcoor = (2^30 -1)/D
+                 */
+                return  I2( (Icoor1) (coefIcoor*(P.x-pmin.x)) ,(Icoor1) (coefIcoor*(P.y-pmin.y)) );
         }/*}}}*/
         /*FUNCTION Geometry::UnMarkEdges{{{1*/