Changeset 5461

Timestamp:

08/20/10 16:11:32 (15 years ago)

Author:

Mathieu Morlighem

Message:

as usual renaming

Location:

issm/trunk/src/c/objects/Bamg

Files:

• Mesh.cpp (modified) (3 diffs)
• VertexOnGeom.cpp (modified) (3 diffs)
• VertexOnGeom.h (modified) (2 diffs)

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

@@ -3792 +3792 @@
                 for (i=0;i< NbVerticesOnGeomVertex;i++)
                   {
-                        BamgVertex *v = VerticesOnGeomVertex[i].mv;
+                        BamgVertex *v = VerticesOnGeomVertex[i].meshvertex;
                         if (v>=vertices && v < ve)
-                         VerticesOnGeomVertex[i].mv=vertices+renu[GetId(v)];
+                         VerticesOnGeomVertex[i].meshvertex=vertices+renu[GetId(v)];
                   }
 
@@ -3800 +3800 @@
                 for (i=0;i< NbVerticesOnGeomEdge;i++)
                   {
-                        BamgVertex *v =VerticesOnGeomEdge[i].mv;
+                        BamgVertex *v =VerticesOnGeomEdge[i].meshvertex;
                         if (v>=vertices && v < ve)
-                         VerticesOnGeomEdge[i].mv=vertices+renu[GetId(v)];
+                         VerticesOnGeomEdge[i].meshvertex=vertices+renu[GetId(v)];
                   }
 
@@ -4036 +4036 @@
           tstart[i]=0;
         for ( j=0;j<NbVerticesOnGeomVertex;j++ ) 
-         tstart[ GetId(VerticesOnGeomVertex[j].mv)]=&vide;
+         tstart[ GetId(VerticesOnGeomVertex[j].meshvertex)]=&vide;
         for ( k=0;k<NbVerticesOnGeomEdge;k++ ) 
-         tstart[ GetId(VerticesOnGeomEdge[k].mv)]=&vide;
+         tstart[ GetId(VerticesOnGeomEdge[k].meshvertex)]=&vide;
         if(verbose>2) printf("   SmoothingVertex: nb Iteration = %i, Omega=%g\n",nbiter,omega);
         for (k=0;k<nbiter;k++)

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

@@ -12 +12 @@
         /*Constructors/Destructors*/
         /*FUNCTION VertexOnGeom::VertexOnGeom(){{{1*/
-        VertexOnGeom::VertexOnGeom(): mv(0),abscisse(0){
+        VertexOnGeom::VertexOnGeom(){
+                meshvertex=NULL;
+                curvilincoord=0;
                 gv=0;
         } 
         /*}}}*/
         /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalVertex &g){{{1*/
-        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalVertex &g) : mv(&m),abscisse(-1){
+        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalVertex &g){
+                meshvertex=&m;
+                curvilincoord=-1;
                 gv=&g;
         }
         /*}}}*/
         /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalEdge &g,double s){{{1*/
-        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalEdge &g,double s) : mv(&m),abscisse(s){
+        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeometricalEdge &g,double s){
+                meshvertex=&m;
+                curvilincoord=s;
                 ge=&g;
         }
@@ -31 +37 @@
         void VertexOnGeom::Set(const VertexOnGeom & rec,const Mesh & Th ,Mesh & ThNew){
                 *this = rec;  
-                mv = ThNew.vertices + Th.GetId(mv);
+                meshvertex = ThNew.vertices + Th.GetId(meshvertex);
                 if (gv)
-                 if (abscisse < 0 )
+                 if (curvilincoord < 0 )
                   gv = ThNew.Gh.vertices + Th.Gh.GetId(gv);
                  else
@@ -42 +48 @@
         /*FUNCTION VertexOnGeom::OnGeomVertex{{{1*/
         int VertexOnGeom::OnGeomVertex()const{
-                return this? abscisse <0 :0;
+                return this? curvilincoord <0 :0;
         }
         /*}}}*/
         /*FUNCTION VertexOnGeom::OnGeomEdge{{{1*/
         int VertexOnGeom::OnGeomEdge() const{
-                return this? abscisse >=0 :0;
+                return this? curvilincoord >=0 :0;
         }
         /*}}}*/
         /*FUNCTION VertexOnGeom::IsRequiredVertex{{{1*/
         int VertexOnGeom::IsRequiredVertex() {
-                return this? ((abscisse<0 ? (gv?gv->Required():0):0 )) : 0;
+                return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0;
         }
         /*}}}*/
         /*FUNCTION VertexOnGeom::SetOn{{{1*/
         void VertexOnGeom::SetOn(){
-                mv->GeometricalEdgeHook=this;
-                mv->IndexInTriangle=IsVertexOnGeom;
+                meshvertex->GeometricalEdgeHook=this;
+                meshvertex->IndexInTriangle=IsVertexOnGeom;
         }
         /*}}}*/

issm/trunk/src/c/objects/Bamg/VertexOnGeom.h

@@ -16 +16 @@
                 public:
 
-                        BamgVertex* mv;
-                        double abscisse;  
+                        BamgVertex* meshvertex;
+                        double curvilincoord;  
                         union{ 
-                                GeometricalVertex* gv; // if abscisse <0; 
-                                GeometricalEdge*   ge; // if abscisse in [0..1]
+                                GeometricalVertex* gv; // if curvilincoord <0; 
+                                GeometricalEdge*   ge; // if curvilincoord in [0..1]
                         };
 
@@ -29 +29 @@
 
                         //Operators
-                        operator BamgVertex*() const  {return mv;}
+                        operator BamgVertex*() const  {return meshvertex;}
                         operator GeometricalVertex * () const  {return gv;}
                         operator GeometricalEdge * () const  {return ge;}
-                        operator const double & () const {return abscisse;}
+                        operator const double & () const {return curvilincoord;}
 
                         //Methods