Index: /issm/trunk/src/c/objects/Bamg/BamgVertex.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/BamgVertex.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/BamgVertex.cpp	(revision 5460)
@@ -109,9 +109,9 @@
 	long BamgVertex::Optim(int i,int koption){ 
 		long ret=0;
-		if ( t && (vint >= 0 ) && (vint <3) ){
-			ret = t->Optim(vint,koption);
+		if ( t && (IndexInTriangle >= 0 ) && (IndexInTriangle <3) ){
+			ret = t->Optim(IndexInTriangle,koption);
 			if(!i){
 				t =0; // for no future optime 
-				vint= 0;
+				IndexInTriangle= 0;
 			}
 		}
@@ -128,5 +128,5 @@
 		register Triangle* tbegin= t , *tria = t , *ttc;
 
-		register int k=0,kk=0,j = EdgesVertexTriangle[vint][0],jc;
+		register int k=0,kk=0,j = EdgesVertexTriangle[IndexInTriangle][0],jc;
 		R2 P(s->r),PNew(0,0);
 		do {
Index: /issm/trunk/src/c/objects/Bamg/BamgVertex.h
===================================================================
--- /issm/trunk/src/c/objects/Bamg/BamgVertex.h	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/BamgVertex.h	(revision 5460)
@@ -25,13 +25,13 @@
 			long      ReferenceNumber;
 			Direction DirOfSearch;
-			short     vint;              // the vertex number in triangle; varies between 0 and 2 in t
+			short     IndexInTriangle;              // the vertex number in triangle; varies between 0 and 2 in t
 
 			union {
 				Triangle     *t;                      // one triangle which is containing the vertex
 				long          color;
-				BamgVertex   *to;                     // used in geometry BamgVertex to know the Mesh Vertex associated
-				VertexOnGeom *GeometricalEdgeHook;    // if vint == 8; // set with Mesh::SetVertexFieldOn()
-				BamgVertex   *BackgroundVertexHook;   // if vint == 16 on Background vertex Mesh::SetVertexFieldOnBTh()
-				VertexOnEdge *BackgroundEdgeHook;     // if vint == 32 on Background edge
+				BamgVertex   *MeshVertexHook;         // used in geometry BamgVertex to know the Mesh Vertex associated
+				VertexOnGeom *GeometricalEdgeHook;    // if IndexInTriangle == 8; // set with Mesh::SetVertexFieldOn()
+				BamgVertex   *BackgroundVertexHook;   // if IndexInTriangle == 16 on Background vertex Mesh::SetVertexFieldOnBTh()
+				VertexOnEdge *BackgroundEdgeHook;     // if IndexInTriangle == 32 on Background edge
 			};
 
Index: /issm/trunk/src/c/objects/Bamg/Mesh.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/Mesh.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/Mesh.cpp	(revision 5460)
@@ -219,11 +219,13 @@
 	/*}}}1*/
 	/*FUNCTION Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices){{{1*/
-	Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices) :Gh(BT.Gh),BTh(BT) {
-		TriangulateFromGeom1(maxnbv,bamgopts,keepBackVertices);
+	Mesh::Mesh(long imaxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices) :Gh(BT.Gh),BTh(BT) {
+		this->Init(imaxnbv);
+		TriangulateFromGeom1(bamgopts,keepBackVertices);
 	}
 	/*}}}1*/
 	/*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{1*/
-	Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts):Gh(G),BTh(*this){
-		TriangulateFromGeom0(maxnbv,bamgopts);
+	Mesh::Mesh(long imaxnbv,Geometry & G,BamgOpts* bamgopts):Gh(G),BTh(*this){
+		Init(imaxnbv);
+		TriangulateFromGeom0(bamgopts);
 	}
 	/*}}}1*/
@@ -2267,5 +2269,5 @@
 			//find a triangle holding the vertex i1 (first vertex of the ith cracked edge)
 			Triangle* tbegin=vertices[i1].t;
-			k=vertices[i1].vint;//local number of i in triangle tbegin
+			k=vertices[i1].IndexInTriangle;//local number of i in triangle tbegin
 			ISSMASSERT(GetId((*tbegin)[k])==GetId(vertices[i1]));
 
@@ -2584,5 +2586,5 @@
 					ISSMASSERT(t && direction);
 
-					AdjacentTriangle  ta(t,EdgesVertexTriangle[v0->vint][0]);// previous edges
+					AdjacentTriangle  ta(t,EdgesVertexTriangle[v0->IndexInTriangle][0]);// previous edges
 
 					while (1) {
@@ -3231,5 +3233,5 @@
 			for (i=nbvold;i<nbv;i++){ 
 				BamgVertex*          s  = vertices + i;
-				AdjacentTriangle ta(s->t, EdgesVertexTriangle[s->vint][1]);
+				AdjacentTriangle ta(s->t, EdgesVertexTriangle[s->IndexInTriangle][1]);
 				Triangle*        tbegin= (Triangle*) ta;
 				long kt;
@@ -3273,8 +3275,8 @@
 		R2 A=vA,B=vB;
 		BamgVertex * pvA=&vA, * pvB=&vB;
-		if (vA.vint == IsVertexOnVertex){
+		if (vA.IndexInTriangle == IsVertexOnVertex){
 			pA=vA.BackgroundVertexHook;
 		}
-		else if (vA.vint == IsVertexOnEdge){
+		else if (vA.IndexInTriangle == IsVertexOnEdge){
 			pA=vA.BackgroundEdgeHook->be;
 			tA=vA.BackgroundEdgeHook->abcisse;
@@ -3284,8 +3286,8 @@
 		} 
 
-		if (vB.vint == IsVertexOnVertex){
+		if (vB.IndexInTriangle == IsVertexOnVertex){
 			pB=vB.BackgroundVertexHook;
 		}
-		else if(vB.vint == IsVertexOnEdge){
+		else if(vB.IndexInTriangle == IsVertexOnEdge){
 			pB=vB.BackgroundEdgeHook->be;
 			tB=vB.BackgroundEdgeHook->abcisse;
@@ -3309,10 +3311,10 @@
 		// 2 walk n back gound boundary to find the final vertex B
 
-		if( vA.vint == IsVertexOnEdge) 
+		if( vA.IndexInTriangle == IsVertexOnEdge) 
 		  { // find the start edge 
 			e = vA.BackgroundEdgeHook->be;	 
 
 		  } 
-		else if (vB.vint == IsVertexOnEdge) 
+		else if (vB.IndexInTriangle == IsVertexOnEdge) 
 		  {
 			theta = 1-theta;
@@ -3507,5 +3509,5 @@
 	for (i=0;i<nbv;i++){ 
 		vertices[i].t=0;
-		vertices[i].vint=0;
+		vertices[i].IndexInTriangle=0;
 		if (ordre[i]) ordre[nbvb++]=ordre[i];
 	}
@@ -4086,5 +4088,5 @@
 			}
 			BamgVertex & vi = vertices[i];
-			AdjacentTriangle ta(t,EdgesVertexTriangle[vertices[i].vint][0]);
+			AdjacentTriangle ta(t,EdgesVertexTriangle[vertices[i].IndexInTriangle][0]);
 			BamgVertex *pvj0 = ta.EdgeVertex(0);
 			while (1) {
@@ -4871,5 +4873,5 @@
 /*}}}1*/
 	/*FUNCTION Mesh::TriangulateFromGeom0{{{1*/
-	void Mesh::TriangulateFromGeom0(long imaxnbv,BamgOpts* bamgopts){
+	void Mesh::TriangulateFromGeom0(BamgOpts* bamgopts){
 		/*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/GeomToTriangles0)*/
 		/*Generate mesh from geometry*/
@@ -4894,5 +4896,4 @@
 
 		//initialize Mesh
-		Init(imaxnbv);
 		nbv=0;
 		NbVerticesOnGeomVertex=0;
@@ -4922,8 +4923,8 @@
 				
 				//Add pointer from geometry (Gh) to vertex from mesh (Th)
-				Gh[i].to=vertices+nbv;
+				Gh[i].MeshVertexHook=vertices+nbv;
 
 				//Build VerticesOnGeomVertex for current point
-				VerticesOnGeomVertex[nbv]=VertexOnGeom(*Gh[i].to,Gh[i]);
+				VerticesOnGeomVertex[nbv]=VertexOnGeom(*Gh[i].MeshVertexHook,Gh[i]);
 
 				//nbv increment
@@ -4979,6 +4980,6 @@
 								//check that edges has been allocated
 								ISSMASSERT(edges);
-								edges[nbe].v[0]=a->to;
-								edges[nbe].v[1]=b->to;;
+								edges[nbe].v[0]=a->MeshVertexHook;
+								edges[nbe].v[1]=b->MeshVertexHook;;
 								edges[nbe].ReferenceNumber = e->ReferenceNumber;
 								edges[nbe].GeometricalEdgeHook = e;
@@ -5006,5 +5007,5 @@
 								e=&ei;          // e = reference of current edge
 								a=ei(k);        // a = pointer toward the kth vertex of the current edge
-								va = a->to;     // va = pointer toward mesh vertex associated
+								va = a->MeshVertexHook; // va = pointer toward mesh vertex associated
 								e->SetMark();   // Mark edge
 
@@ -5104,5 +5105,5 @@
 									ISSMASSERT(e);
 								}// for(;;)
-								vb = b->to;
+								vb = b->MeshVertexHook;
 								NbEdgeCurve = Max((long) (lcurve +0.5), (long) 1);
 								NbNewPoints = NbEdgeCurve-1;
@@ -5165,5 +5166,5 @@
 	/*}}}1*/
 	/*FUNCTION Mesh::TriangulateFromGeom1{{{1*/
-	void Mesh::TriangulateFromGeom1(long imaxnbv,BamgOpts* bamgopts,int KeepVertices){ 
+	void Mesh::TriangulateFromGeom1(BamgOpts* bamgopts,int KeepVertices){ 
 		/*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/GeomToTriangles1)*/
 
@@ -5195,5 +5196,4 @@
 
 		//Initialize new mesh
-		this->Init(imaxnbv);
 		BTh.SetVertexFieldOn();
 		int* bcurve = new int[Gh.nbcurves]; // 
@@ -5224,9 +5224,9 @@
 				vertices[nbv]  =Gh[i];
 				vertices[nbv].i=I2(0,0);
-				Gh[i].to = vertices + nbv;// save Geom -> Th
+				Gh[i].MeshVertexHook = vertices + nbv;// save Geom -> Th
 				VerticesOnGeomVertex[nbv]= VertexOnGeom(vertices[nbv],Gh[i]);
 				nbv++;
 			}
-			else Gh[i].to=0;
+			else Gh[i].MeshVertexHook=0;
 		} 
 		for (i=0;i<BTh.NbVerticesOnGeomVertex;i++){ 
@@ -5235,7 +5235,7 @@
 				GeometricalVertex* gv=vog;
 				BamgVertex *bv = vog;
-				ISSMASSERT(gv->to); // use of Geom -> Th
-				VertexOnBThVertex[NbVertexOnBThVertex++]=VertexOnVertex(gv->to,bv);
-				gv->to->m = bv->m; // for taking the metrix of the background mesh
+				ISSMASSERT(gv->MeshVertexHook); // use of Geom -> Th
+				VertexOnBThVertex[NbVertexOnBThVertex++]=VertexOnVertex(gv->MeshVertexHook,bv);
+				gv->MeshVertexHook->m = bv->m; // for taking the metrix of the background mesh
 			}
 		}
@@ -5337,5 +5337,5 @@
 					register GeometricalVertex * GA0 = *(*peequi)[k0equi].GeometricalEdgeHook;
 					BamgVertex *A0;
-					A0 = GA0->to;  // the vertex in new mesh
+					A0 = GA0->MeshVertexHook;  // the vertex in new mesh
 					BamgVertex *A1;
 					VertexOnGeom *GA1;
@@ -5346,5 +5346,5 @@
 					if(ongequi->Required()){
 						GeometricalVertex *GA1 = *(*peequi)[1-k0equi].GeometricalEdgeHook;
-						A1 = GA1->to;  //
+						A1 = GA1->MeshVertexHook;  //
 					}       
 					else {
@@ -5410,5 +5410,5 @@
 								ISSMASSERT(eeequi[k1equi].GeometricalEdgeHook->IsRequiredVertex());
 								register GeometricalVertex * GA1 = *eeequi[k1equi].GeometricalEdgeHook;
-								A1=GA1->to;// the vertex in new mesh
+								A1=GA1->MeshVertexHook;// the vertex in new mesh
 								ISSMASSERT(A1-vertices>=0 && A1-vertices<nbv);
 								break;
@@ -5691,5 +5691,5 @@
 	taret=AdjacentTriangle(0,0); // erreur 
 
-	AdjacentTriangle tta(a.t,EdgesVertexTriangle[a.vint][0]);
+	AdjacentTriangle tta(a.t,EdgesVertexTriangle[a.IndexInTriangle][0]);
 	BamgVertex   *v1, *v2 = tta.EdgeVertex(0),*vbegin =v2;
 	// we turn around a in the  direct direction  
Index: /issm/trunk/src/c/objects/Bamg/Mesh.h
===================================================================
--- /issm/trunk/src/c/objects/Bamg/Mesh.h	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/Mesh.h	(revision 5460)
@@ -125,5 +125,5 @@
 			//Inline methods
 			inline  void CreateSingleVertexToTriangleConnectivity(){
-				for (int i=0;i<nbv;i++) vertices[i].vint=0, vertices[i].t=NULL;
+				for (int i=0;i<nbv;i++) vertices[i].IndexInTriangle=0, vertices[i].t=NULL;
 				for (int i=0;i<nbt;i++) triangles[i].SetSingleVertexToTriangleConnectivity();
 			}
@@ -145,6 +145,6 @@
 
 		private:
-			void TriangulateFromGeom1(long maxnbv,BamgOpts* bamgopts,int KeepVertices=1);// the real constructor mesh adaption
-			void TriangulateFromGeom0(long maxnbv,BamgOpts* bamgopts);// the real constructor mesh generator
+			void TriangulateFromGeom1(BamgOpts* bamgopts,int KeepVertices=1);// the real constructor mesh adaption
+			void TriangulateFromGeom0(BamgOpts* bamgopts);// the real constructor mesh generator
 			void Init(long);
 	};
Index: /issm/trunk/src/c/objects/Bamg/Triangle.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/Triangle.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/Triangle.cpp	(revision 5460)
@@ -299,7 +299,7 @@
 	/*FUNCTION Triangle::SetSingleVertexToTriangleConnectivity{{{1*/
 	void Triangle::SetSingleVertexToTriangleConnectivity() { 
-		if (vertices[0]) (vertices[0]->t=this,vertices[0]->vint=0);
-		if (vertices[1]) (vertices[1]->t=this,vertices[1]->vint=1);
-		if (vertices[2]) (vertices[2]->t=this,vertices[2]->vint=2);
+		if (vertices[0]) (vertices[0]->t=this,vertices[0]->IndexInTriangle=0);
+		if (vertices[1]) (vertices[1]->t=this,vertices[1]->IndexInTriangle=1);
+		if (vertices[2]) (vertices[2]->t=this,vertices[2]->IndexInTriangle=2);
 	}/*}}}*/
 	/*FUNCTION Triangle::SetUnMarkUnSwap{{{1*/
Index: /issm/trunk/src/c/objects/Bamg/VertexOnEdge.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/VertexOnEdge.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/VertexOnEdge.cpp	(revision 5460)
@@ -21,5 +21,5 @@
 	void VertexOnEdge::SetOnBTh(){
 		v->BackgroundEdgeHook=this;
-		v->vint=IsVertexOnEdge;  
+		v->IndexInTriangle=IsVertexOnEdge;  
 	}
 	/*}}}*/
Index: /issm/trunk/src/c/objects/Bamg/VertexOnGeom.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/VertexOnGeom.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/VertexOnGeom.cpp	(revision 5460)
@@ -58,5 +58,5 @@
 	void VertexOnGeom::SetOn(){
 		mv->GeometricalEdgeHook=this;
-		mv->vint=IsVertexOnGeom;
+		mv->IndexInTriangle=IsVertexOnGeom;
 	}
 	/*}}}*/
Index: /issm/trunk/src/c/objects/Bamg/VertexOnVertex.cpp
===================================================================
--- /issm/trunk/src/c/objects/Bamg/VertexOnVertex.cpp	(revision 5459)
+++ /issm/trunk/src/c/objects/Bamg/VertexOnVertex.cpp	(revision 5460)
@@ -28,5 +28,5 @@
 	/*FUNCTION VertexOnVertex::SetOnBTh{{{1*/
 	void VertexOnVertex::SetOnBTh(){
-		v->BackgroundVertexHook=bv;v->vint=IsVertexOnVertex;
+		v->BackgroundVertexHook=bv;v->IndexInTriangle=IsVertexOnVertex;
 	}/*}}}*/