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

Timestamp:

08/19/10 09:38:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

renamed some fields and got rid of curve->next

File:

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

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

@@ -151 +151 @@
                                 edges[i].tg[0]=zerovector;
                                 edges[i].tg[1]=zerovector;
-                                edges[i].AdjVertexNumber[0] = edges[i].AdjVertexNumber[1] = -1;
+                                edges[i].AdjVertexIndex[0] = edges[i].AdjVertexIndex[1] = -1;
                                 edges[i].Adj[0] = edges[i].Adj[1] = NULL;
                                 edges[i].type = 0;
@@ -697 +697 @@
 
                                 edges[i1].Adj[j1] = edges + i;
-                                edges[i1].AdjVertexNumber[j1] = j;
+                                edges[i1].AdjVertexIndex[j1] = j;
                         }
                 }
@@ -719 +719 @@
                                                  * previous and next vertices connected to current vertex
                                                  * normed by the edge length*/
-                                                tg = edges[i].v[1-j]->r - edges[i].Adj[j]->v[1-edges[i].AdjVertexNumber[j]]->r;
+                                                tg = edges[i].v[1-j]->r - edges[i].Adj[j]->v[1-edges[i].AdjVertexIndex[j]]->r;
                                                 ltg= Norme2(tg);
                                                 tg = tg *(lAB/ltg);
@@ -786 +786 @@
                                                                 //else: go to next edge (adjacent)
                                                                 else{
-                                                                        k0 = e->AdjVertexNumber[k1];//  vertex in next edge
+                                                                        k0 = e->AdjVertexIndex[k1];//  vertex in next edge
                                                                         e  = e->Adj[k1]; // next edge
                                                                 }
@@ -873 +873 @@
                         ge[--bge] =eg0 = eg0->Adj[direction0];
                         ISSMASSERT(bge>=0 && bge<=mxe);
-                        direction0 = 1-( directionge[bge] = tmpge->AdjVertexNumber[direction0]);
+                        direction0 = 1-( directionge[bge] = tmpge->AdjVertexIndex[direction0]);
                 }
                 while (eg1 != (GeometricalEdge*) vg1  &&  (*eg1)(direction1) != (GeometricalVertex*) vg1) { 
@@ -889 +889 @@
                         GeometricalEdge* tmpge = eg1;
                         ge[++tge] =eg1 = eg1->Adj[direction1];
-                        directionge[tge]= direction1 = 1-tmpge->AdjVertexNumber[direction1];
+                        directionge[tge]= direction1 = 1-tmpge->AdjVertexIndex[direction1];
                         ISSMASSERT(tge>=0 && tge<=mxe);
                 }