Index: /issm/trunk/src/c/Bamgx/objects/Geometry.cpp
===================================================================
--- /issm/trunk/src/c/Bamgx/objects/Geometry.cpp	(revision 3030)
+++ /issm/trunk/src/c/Bamgx/objects/Geometry.cpp	(revision 3031)
@@ -77,5 +77,5 @@
 
 		//Vertices
-		if(verbose>3) printf("      writing Vertices\n");
+		if(verbose>5) printf("      writing Vertices\n");
 		bamggeom->NumVertices=nbv;
 		xfree((void**)&bamggeom->Vertices);
@@ -96,5 +96,5 @@
 
 		//Edges
-		if(verbose>3) printf("      writing Edges\n");
+		if(verbose>5) printf("      writing Edges\n");
 		bamggeom->NumEdges=nbe;
 		xfree((void**)&bamggeom->Edges);
@@ -121,5 +121,5 @@
 
 		//CrackedEdges
-		if(verbose>3) printf("      writing CrackedEdges\n");
+		if(verbose>5) printf("      writing CrackedEdges\n");
 		bamggeom->NumCrackedEdges=nbcracked;
 		xfree((void**)&bamggeom->CrackedEdges);
@@ -142,5 +142,5 @@
 
 		//RequiredEdges
-		if(verbose>3) printf("      writing RequiredEdges\n");
+		if(verbose>5) printf("      writing RequiredEdges\n");
 		bamggeom->NumRequiredEdges=nbreq;
 		xfree((void**)&bamggeom->RequiredEdges);
@@ -162,5 +162,5 @@
 
 		//RequiredVertices
-		if(verbose>3) printf("      writing RequiredVertices\n");
+		if(verbose>5) printf("      writing RequiredVertices\n");
 		bamggeom->NumRequiredVertices=nbreqv;
 		xfree((void**)&bamggeom->RequiredVertices);
@@ -180,5 +180,5 @@
 
 		//SubDomains
-		if(verbose>3) printf("      writing SubDomains\n");
+		if(verbose>5) printf("      writing SubDomains\n");
 		bamggeom->NumSubDomains=NbSubDomains;
 		xfree((void**)&bamggeom->SubDomains);
@@ -197,5 +197,5 @@
 
 		//TangentAtEdges
-		if(verbose>3) printf("      writing TangentAtEdges\n");
+		if(verbose>5) printf("      writing TangentAtEdges\n");
 		bamggeom->NumTangentAtEdges=nbtan;
 		xfree((void**)&bamggeom->TangentAtEdges);
@@ -254,5 +254,5 @@
 		//Vertices
 		if (bamggeom->Vertices){
-			if(verbose>3) printf("      processing Vertices\n");
+			if(verbose>5) printf("      processing Vertices\n");
 			vertices = new GeometricalVertex[nbvx];
 			for (i=0;i<nbv;i++) {
@@ -293,5 +293,5 @@
 			Real4* len=NULL;
 
-			if(verbose>3) printf("      processing Edges\n");
+			if(verbose>5) printf("      processing Edges\n");
 			edges = new GeometricalEdge[nbe];
 
@@ -346,5 +346,5 @@
 		//CrackedEdges
 		if (bamggeom->CrackedEdges){
-			if(verbose>3) printf("      processing CrackedEdges\n");
+			if(verbose>5) printf("      processing CrackedEdges\n");
 			for (i=0;i<bamggeom->NumCrackedEdges;i++){
 				throw ErrorException(__FUNCT__,exprintf("Not implemented yet"));
@@ -352,10 +352,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no CrackedEdges found\n");
+			if(verbose>5) printf("      no CrackedEdges found\n");
 		}
 
 		//hVertices
 		if(bamggeom->hVertices){
-			if(verbose>3) printf("      processing hVertices\n");
+			if(verbose>5) printf("      processing hVertices\n");
 			for (i=0;i< nbv;i++){
 				vertices[i].m=Metric((Real4)bamggeom->hVertices[i]);
@@ -363,10 +363,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no hVertices found\n");
+			if(verbose>5) printf("      no hVertices found\n");
 		}
 
 		//MetricVertices
 		if(bamggeom->MetricVertices){
-			if(verbose>3) printf("      processing MetricVertices\n");
+			if(verbose>5) printf("      processing MetricVertices\n");
 			hvertices=1;
 			for (i=0;i< nbv;i++) {
@@ -375,10 +375,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no MetricVertices found\n");
+			if(verbose>5) printf("      no MetricVertices found\n");
 		}
 
 		//h1h2VpVertices
 		if(bamggeom->h1h2VpVertices){
-			if(verbose>3) printf("      processing h1h2VpVertices\n");
+			if(verbose>5) printf("      processing h1h2VpVertices\n");
 			Real4 h1,h2,v1,v2;
 			hvertices =1;
@@ -392,19 +392,19 @@
 		}
 		else{
-			if(verbose>3) printf("      no h1h2VpVertices found\n");
+			if(verbose>5) printf("      no h1h2VpVertices found\n");
 		}
 
 		//MaximalAngleOfCorner
 		if (bamgopts->MaximalAngleOfCorner){
-			if(verbose>3) printf("      processing MaximalAngleOfCorner\n");
+			if(verbose>5) printf("      processing MaximalAngleOfCorner\n");
 			MaximalAngleOfCorner=bamgopts->MaximalAngleOfCorner*Pi/180;
 		}
 		else{
-			if(verbose>3) printf("      no MaximalAngleOfCorner found\n");
+			if(verbose>5) printf("      no MaximalAngleOfCorner found\n");
 		}
 
 		//TangentAtEdges
 		if (bamggeom->TangentAtEdges){
-			if(verbose>3) printf("      processing TangentAtEdges");
+			if(verbose>5) printf("      processing TangentAtEdges");
 			int n,i,j,k;
 			R2 tg;
@@ -423,10 +423,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no TangentAtEdges found\n");
+			if(verbose>5) printf("      no TangentAtEdges found\n");
 		}
 
 		//Corners
 		if(bamggeom->Corners){
-			if(verbose>3) printf("      processing Corners");
+			if(verbose>5) printf("      processing Corners");
 			n=bamggeom->NumCorners;
 			for (i=0;i<n;i++) {     
@@ -439,10 +439,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no Corners found\n");
+			if(verbose>5) printf("      no Corners found\n");
 		}
 
 		//RequiredVertices
 		if(bamggeom->RequiredVertices){
-			if(verbose>3) printf("      processing RequiredVertices");
+			if(verbose>5) printf("      processing RequiredVertices");
 			n=bamggeom->NumRequiredVertices;
 			for (i=0;i<n;i++) {     
@@ -454,10 +454,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no RequiredVertices found\n");
+			if(verbose>5) printf("      no RequiredVertices found\n");
 		}
 
 		//RequiredEdges
 		if(bamggeom->RequiredEdges){
-			if(verbose>3) printf("      processing RequiredEdges");
+			if(verbose>5) printf("      processing RequiredEdges");
 			n=bamggeom->NumRequiredEdges;
 			for (i=0;i<n;i++) {     
@@ -470,5 +470,5 @@
 		}
 		else{
-			if(verbose>3) printf("      no RequiredEdges found\n");
+			if(verbose>5) printf("      no RequiredEdges found\n");
 		}
 
@@ -476,5 +476,5 @@
 		if(bamggeom->SubDomains){
 			Int4 i0,i1,i2,i3;
-			if(verbose>3) printf("      processing SubDomains\n");
+			if(verbose>5) printf("      processing SubDomains\n");
 			NbSubDomains=bamggeom->NumSubDomains;
 			subdomains = new GeometricalSubDomain[NbSubDomains];
@@ -492,5 +492,5 @@
 		}
 		else{
-			if(verbose>3) printf("      no SubDomains found\n");
+			if(verbose>5) printf("      no SubDomains found\n");
 		}
 	}
Index: /issm/trunk/src/c/Bamgx/objects/Triangles.cpp
===================================================================
--- /issm/trunk/src/c/Bamgx/objects/Triangles.cpp	(revision 3030)
+++ /issm/trunk/src/c/Bamgx/objects/Triangles.cpp	(revision 3031)
@@ -247,5 +247,5 @@
 		//Vertices
 		if(bamgmesh->Vertices){
-			if(verbose>3) printf("      processing Vertices\n");
+			if(verbose>5) printf("      processing Vertices\n");
 
 			vertices=(Vertex*)xmalloc(nbv*sizeof(Vertex));
@@ -263,10 +263,10 @@
 		}
 		else{
-			if(verbose>3) throw ErrorException(__FUNCT__,exprintf("no Vertices found in the initial mesh"));
+			if(verbose>5) throw ErrorException(__FUNCT__,exprintf("no Vertices found in the initial mesh"));
 		}
 
 		//Triangles
 		if(bamgmesh->Triangles){
-			if(verbose>3) printf("      processing Triangles\n");
+			if(verbose>5) printf("      processing Triangles\n");
 			triangles =new Triangle[nbtx]; //we cannot allocate only nbt triangles since 
 			//other triangles will be added for each edge
@@ -281,10 +281,10 @@
 		}
 		else{
-			if(verbose>3) throw ErrorException(__FUNCT__,exprintf("no Triangles found in the initial mesh"));
+			if(verbose>5) throw ErrorException(__FUNCT__,exprintf("no Triangles found in the initial mesh"));
 		}
 
 		//Quadrilaterals
 		if(bamgmesh->Quadrilaterals){
-			if(verbose>3) printf("      processing Quadrilaterals\n");
+			if(verbose>5) printf("      processing Quadrilaterals\n");
 			Int4 i1,i2,i3,i4,iref;
 			triangles =new Triangle[nbt];
@@ -306,10 +306,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no Quadrilaterals found\n");
+			if(verbose>5) printf("      no Quadrilaterals found\n");
 		}
 
 		//hVertices
 		if(bamgmesh->hVertices){
-			if(verbose>3) printf("      processing hVertices\n");
+			if(verbose>5) printf("      processing hVertices\n");
 			hvertices=1;
 			for (i=0;i< nbv;i++){
@@ -320,10 +320,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no hVertices found\n");
+			if(verbose>5) printf("      no hVertices found\n");
 		}
 
 		//VerVerticesOnGeometricEdge
 		if(bamgmesh->VerticesOnGeometricEdge){
-			if(verbose>3) printf("      processing VerticesOnGeometricEdge\n");
+			if(verbose>5) printf("      processing VerticesOnGeometricEdge\n");
 			NbVerticesOnGeomEdge=bamgmesh->NumVerticesOnGeometricEdge;
 			VerticesOnGeomEdge= new  VertexOnGeom[NbVerticesOnGeomEdge] ;
@@ -338,5 +338,5 @@
 		}
 		else{
-			if(verbose>3) printf("      no VertexOnGeometricEdge found\n");
+			if(verbose>5) printf("      no VertexOnGeometricEdge found\n");
 		}
 
@@ -347,5 +347,5 @@
 			Real4 *len =0;
 
-			if(verbose>3) printf("      processing Edges\n");
+			if(verbose>5) printf("      processing Edges\n");
 			nbe=bamgmesh->NumEdges;
 			edges = new Edge[nbe];
@@ -411,9 +411,9 @@
 		}
 		else{
-			if(verbose>3) printf("      no Edges found\n");
+			if(verbose>5) printf("      no Edges found\n");
 		}
 		//CrackedEdges
 		if(bamgmesh->CrackedEdges){
-			if(verbose>3) printf("      processing CrackedEdges\n");
+			if(verbose>5) printf("      processing CrackedEdges\n");
 			NbCrackedEdges=bamgmesh->NumCrackedEdges;
 			CrackedEdges=new CrackedEdge[NbCrackedEdges];
@@ -426,10 +426,10 @@
 		}
 		else{
-			if(verbose>3) printf("      no CrackedEdges found\n");
+			if(verbose>5) printf("      no CrackedEdges found\n");
 		}
 
 		//EdgeOnGeometricEdge
 		if(bamgmesh->EdgesOnGeometricEdge){
-			if(verbose>3) printf("      processing EdgesOnGeometricEdge\n");
+			if(verbose>5) printf("      processing EdgesOnGeometricEdge\n");
 			int i1,i2,i,j;
 			i2=bamgmesh->NumEdgesOnGeometricEdge;
@@ -444,5 +444,5 @@
 		}
 		else{
-			if(verbose>3) printf("      no EdgesOnGeometricEdge found\n");
+			if(verbose>5) printf("      no EdgesOnGeometricEdge found\n");
 		}
 
@@ -450,5 +450,5 @@
 		if(bamgmesh->SubDomains){
 			Int4 i3,head,sens;
-			if(verbose>3) printf("      processing SubDomains\n");
+			if(verbose>5) printf("      processing SubDomains\n");
 			NbSubDomains=bamgmesh->NumSubDomains;
 			subdomains = new SubDomain [ NbSubDomains ];
@@ -463,5 +463,5 @@
 		}
 		else{
-			if(verbose>3) printf("      no SubDomains found\n");
+			if(verbose>5) printf("      no SubDomains found\n");
 		}
 
@@ -483,7 +483,7 @@
 		//renumber
 		if (bamgopts->renumber){
-			if(verbose>3) printf("      Renumbering...");
+			if(verbose>5) printf("      Renumbering...");
 			Renumber(bamgopts);
-			if(verbose>3) printf(" done\n"); 
+			if(verbose>5) printf(" done\n"); 
 		}
 
@@ -493,5 +493,5 @@
 
 		//Vertices
-		if(verbose>3) printf("      writing Vertices\n");
+		if(verbose>5) printf("      writing Vertices\n");
 		bamgmesh->NumVertices=nbv;
 		xfree((void**)&bamgmesh->Vertices);
@@ -509,5 +509,5 @@
 
 		//Edges
-		if(verbose>3) printf("      writing Edges\n");
+		if(verbose>5) printf("      writing Edges\n");
 		bamgmesh->NumEdges=nbe;
 		xfree((void**)&bamgmesh->Edges);
@@ -530,5 +530,5 @@
 		//Segments
 		bamgmesh->NumSegments=0;
-		if(verbose>3) printf("      writing Segments\n");
+		if(verbose>5) printf("      writing Segments\n");
 
 		//chaining algorithm
@@ -599,5 +599,5 @@
 
 		//CrackedEdges
-		if(verbose>3) printf("      writing CrackedEdges\n");
+		if(verbose>5) printf("      writing CrackedEdges\n");
 		bamgmesh->NumCrackedEdges=NbCrackedEdges;
 		xfree((void**)&bamgmesh->CrackedEdges);
@@ -614,5 +614,5 @@
 
 		//Triangles
-		if(verbose>3) printf("      writing Triangles\n");
+		if(verbose>5) printf("      writing Triangles\n");
 		k=nbInT-NbOfQuad*2;
 		num=0;
@@ -638,5 +638,5 @@
 
 		//Quadrilaterals
-		if(verbose>3) printf("      writing Quadrilaterals\n");
+		if(verbose>5) printf("      writing Quadrilaterals\n");
 		bamgmesh->NumQuadrilaterals=NbOfQuad;
 		xfree((void**)&bamgmesh->Quadrilaterals);
@@ -662,5 +662,5 @@
 
 		//SubDomains
-		if(verbose>3) printf("      writing SubDomains\n");
+		if(verbose>5) printf("      writing SubDomains\n");
 		bamgmesh->NumSubDomains=NbSubDomains;
 		xfree((void**)&bamgmesh->SubDomains);
@@ -679,5 +679,5 @@
 
 		//SubDomainsFromGeom
-		if(verbose>3) printf("      writing SubDomainsFromGeom\n");
+		if(verbose>5) printf("      writing SubDomainsFromGeom\n");
 		bamgmesh->NumSubDomainsFromGeom=Gh.NbSubDomains;
 		xfree((void**)&bamgmesh->SubDomainsFromGeom);
@@ -696,5 +696,5 @@
 
 		//VerticesOnGeomVertex
-		if(verbose>3) printf("      writing VerticesOnGeometricVertex\n");
+		if(verbose>5) printf("      writing VerticesOnGeometricVertex\n");
 		bamgmesh->NumVerticesOnGeometricVertex=NbVerticesOnGeomVertex;
 		xfree((void**)&bamgmesh->VerticesOnGeometricVertex);
@@ -715,5 +715,5 @@
 
 		//VertexOnGeometricEdge
-		if(verbose>3) printf("      writing VerticesOnGeometricEdge\n");
+		if(verbose>5) printf("      writing VerticesOnGeometricEdge\n");
 		bamgmesh->NumVerticesOnGeometricEdge=NbVerticesOnGeomEdge;
 		xfree((void**)&bamgmesh->VerticesOnGeometricEdge);
@@ -735,5 +735,5 @@
 
 		//EdgesOnGeometricEdge
-		if(verbose>3) printf("      writing EdgesOnGeometricEdge\n");
+		if(verbose>5) printf("      writing EdgesOnGeometricEdge\n");
 		k=0;
 		for (i=0;i<nbe;i++){
@@ -2806,5 +2806,5 @@
 
 		//initialize this
-		if (verbose>3) printf("      Generating vertices\n");
+		if (verbose>3) printf("      Generating Boundary vertices\n");
 		PreInit(inbvx);
 		nbv=0;
@@ -3086,18 +3086,21 @@
 
 		//Insert points inside existing triangles
-		if (verbose>3) printf("      Inserting vertices in mesh\n");
+		if (verbose>4) printf("      -- current number of vertices = %i\n",nbv);
+		if (verbose>3) printf("      Creating initial Constrained Delaunay Triangulation...\n");
+		if (verbose>3) printf("         Inserting points\n");
 		Insert();
 
 		//Force the boundary
-		if (verbose>3) printf("      Forcing boundaries\n");
+		if (verbose>3) printf("         Forcing boundaries\n");
 		ForceBoundary();
 
 		//Extract SubDomains
-		if (verbose>3) printf("      Extracting subdomains\n");
+		if (verbose>3) printf("         Extracting subdomains\n");
 		FindSubDomain();
 
 		// NewPointsOld(*this) ;
-		if (verbose>3) printf("      Generating mesh properties\n");
+		if (verbose>3) printf("      Inserting internal points\n");
 		NewPoints(*this,0) ;
+		if (verbose>4) printf("      -- current number of vertices = %i\n",nbv);
 	}
 	/*}}}1*/
@@ -3958,6 +3961,6 @@
 			i=Headt;
 			next_t=-first_np_or_next_t[i];
-			for(t=&triangles[i];i<nbt;t=&triangles[i=next_t],next_t=-first_np_or_next_t[i]) 
-			  { // for each triangle  t
+			for(t=&triangles[i];i<nbt;t=&triangles[i=next_t],next_t=-first_np_or_next_t[i]){
+				// for each triangle  t
 				// we can change first_np_or_next_t[i]
 				if (i<0 || i>=nbt ){
@@ -3965,6 +3968,6 @@
 				}
 				first_np_or_next_t[i] = iter; 
-				for(j=0;j<3;j++)
-				  { // for each edge 
+				for(j=0;j<3;j++){
+					// for each edge 
 					TriangleAdjacent tj(t,j);
 					Vertex & vA = * tj.EdgeVertex(0);
@@ -3998,18 +4001,20 @@
 			 break;
 
-			for (i=nbtold;i<nbt;i++)
-			 first_np_or_next_t[i]=iter;
+			for (i=nbtold;i<nbt;i++) first_np_or_next_t[i]=iter;
 
 			Headt = nbt; // empty list 
-			for (i=nbvold;i<nbv;i++) 
-			  { // for all the triangle contening the vertex i
-				Vertex * s  = vertices + i;
+
+			// for all the triangle contening the vertex i
+			for (i=nbvold;i<nbv;i++){ 
+				Vertex*          s  = vertices + i;
 				TriangleAdjacent ta(s->t, EdgesVertexTriangle[s->vint][1]);
-				Triangle * tbegin= (Triangle*) ta;
+				Triangle*        tbegin= (Triangle*) ta;
 				Int4 kt;
 				do { 
 					kt = Number((Triangle*) ta);
-					if (first_np_or_next_t[kt]>0) 
-					 first_np_or_next_t[kt]=-Headt,Headt=kt;
+					if (first_np_or_next_t[kt]>0){
+						first_np_or_next_t[kt]=-Headt;
+						Headt=kt;
+					}
 					if (ta.EdgeVertex(0)!=s){
 						throw ErrorException(__FUNCT__,exprintf("ta.EdgeVertex(0)!=s"));
@@ -4017,5 +4022,5 @@
 					ta = Next(Adj(ta));
 				} while ( (tbegin != (Triangle*) ta)); 
-			  }   
+			}   
 
 		} while (nbv!=nbvold);