Changeset 3276

Timestamp:

03/12/10 16:28:29 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed problem in readmesh

File:

• issm/trunk/src/c/Bamgx/objects/Triangles.cpp (modified) (6 diffs)

issm/trunk/src/c/Bamgx/objects/Triangles.cpp

@@ -333 +333 @@
                                 vertices[i].r.x=bamgmesh->Vertices[i*3+0];
                                 vertices[i].r.y=bamgmesh->Vertices[i*3+1];
-                                vertices[i].ReferenceNumber=1;
+                                vertices[i].ReferenceNumber=(long)bamgmesh->Vertices[i*3+2];
                                 vertices[i].DirOfSearch =NoDirOfSearch;
                                 vertices[i].m=M1;
-                                vertices[i].color=(long)bamgmesh->Vertices[i*3+2];
+                                vertices[i].color=0;
                         }
                         nbtx=2*nbvx-2; // for filling The Holes and quadrilaterals 
@@ -440 +440 @@
                                 edges[i].v[0]= vertices +i1;
                                 edges[i].v[1]= vertices +i2;
-                                edges[i].adj[0]=0;
-                                edges[i].adj[1]=0;
+                                edges[i].adj[0]=NULL;
+                                edges[i].adj[1]=NULL;
                                 R2 x12 = vertices[i2].r-vertices[i1].r;
                                 double l12=sqrt( (x12,x12));        
@@ -896 +896 @@
 
                 //errC cannot be higher than 1
-                if (errC > 1) errC = 1;
+                if (errC>1) errC=1;
 
                 //Set all vertices to "on"
@@ -1315 +1315 @@
                 }
 
-                /*Build edges[].adj*/
-
+                /*Build edges[i].adj: adjacency of each edge (if on the same curve)*/
                 for (i=0;i<nbe;i++){
                         for (j=0;j<2;j++){ 
@@ -1322 +1321 @@
                                 Vertex* v=edges[i].v[j];
                                 //get vertex color (i0)
-                                long i0=v->color,j0;
+                                long i0=v->color;
+                                long j0;
 
                                 //if color<0 (first time), no adjacent edge
@@ -2703 +2703 @@
                 }
 
-                //check the consistant of edge[].adj and the geometrical required  vertex
+                //check the consistency of edge[].adj and the geometrical required vertex
                 long k=0;
                 for (i=0;i<edge4->nb();i++){