Changeset 3407 for issm/trunk/src/c/Bamgx/objects/Geometry.cpp

Timestamp:

04/06/10 11:19:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved BamgVertex to MeshVertex

File:

• issm/trunk/src/c/Bamgx/objects/Geometry.cpp (modified) (7 diffs)

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

@@ -120 +120 @@
                 }
                 else{
-                        ISSMERROR(exprintf("No Vertex provided"));
+                        ISSMERROR(exprintf("No MeshVertex provided"));
                 }
 
@@ -438 +438 @@
                 double eps=1e-20;
                 QuadTree quadtree; // build quadtree to find duplicates
-                Vertex* v0=vertices; 
+                MeshVertex* v0=vertices; 
                 GeometricalVertex* v0g=(GeometricalVertex*) (void*)v0;   
 
@@ -457 +457 @@
 
                         //find nearest vertex already present in the quadtree (NULL if empty)
-                        Vertex* v=quadtree.NearestVertex(vertices[i].i.x,vertices[i].i.y); 
+                        MeshVertex* 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
@@ -465 +465 @@
                                 j=vg-v0g;
                                 //check that the clostest vertex is not itself...
-                                if ( v !=  &(Vertex &) vertices[j]){
-                                        ISSMERROR(exprintf(" v !=  &(Vertex &) vertices[j]"));
+                                if ( v !=  &(MeshVertex &) vertices[j]){
+                                        ISSMERROR(exprintf(" v !=  &(MeshVertex &) vertices[j]"));
                                 }
                                 vertices[i].link = vertices + j;
@@ -830 +830 @@
         /*}}}1*/
         /*FUNCTION  Geometry::ProjectOnCurve {{{1*/
-        GeometricalEdge* Geometry::ProjectOnCurve(const Edge &e,double s,Vertex &V,VertexOnGeom &GV) const {
+        GeometricalEdge* Geometry::ProjectOnCurve(const Edge &e,double s,MeshVertex &V,VertexOnGeom &GV) const {
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/ProjectOnCurve)*/
                 /*Add a vertex on an existing geometrical edge according to the metrics of the two vertices constituting the edge*/
@@ -849 +849 @@
 
                 //Get the two vertices of the edge
-                const Vertex &v0=e[0];
-                const Vertex &v1=e[1];
+                const MeshVertex &v0=e[0];
+                const MeshVertex &v1=e[1];
 
                 //Get position of V0, V1 and vector v0->v1
@@ -916 +916 @@
 
                 if ((*eg0)(sens0)==(GeometricalVertex*)vg0)
-                 vg0=VertexOnGeom(*(Vertex*) vg0,*eg0,sens0); //vg0 = absisce
+                 vg0=VertexOnGeom(*(MeshVertex*) vg0,*eg0,sens0); //vg0 = absisce
 
                 if ((*eg1)(sens1)==(GeometricalVertex*)vg1)
-                 vg1=VertexOnGeom(*(Vertex*) vg1,*eg1,sens1);
+                 vg1=VertexOnGeom(*(MeshVertex*) vg1,*eg1,sens1);
 
                 double sg;