Index: /issm/trunk/src/c/Bamgx/Mesh2.h
===================================================================
--- /issm/trunk/src/c/Bamgx/Mesh2.h	(revision 2982)
+++ /issm/trunk/src/c/Bamgx/Mesh2.h	(revision 2983)
@@ -26,12 +26,16 @@
 	const double Pi =3.141592653589793238462643383279502884197169399375105820974944592308;
 	const float  fPi=3.141592653589793238462643383279502884197169399375105820974944592308;
-
+	const  int   IsVertexOnGeom = 8;
+	const  int   IsVertexOnVertex = 16;
+	const  int   IsVertexOnEdge = 32;
+
+	//some functions
 	inline int BinaryRand(){
-#ifdef RAND_MAX
+	#ifdef RAND_MAX
 		const long HalfRandMax = RAND_MAX/2;
 		return rand() < HalfRandMax;
-#else
-		return rand() & 16384; // 2^14 (for sun because RAND_MAX is not def in stdlib.h)
-#endif
+	#else
+		return rand() & 16384; //2^14 (for sun because RAND_MAX is not def in stdlib.h)
+	#endif
 	} 
 
@@ -47,6 +51,6 @@
 namespace bamg {
 
-	inline float OppositeAngle(float a){return a<0 ? fPi + a :a - fPi ;}
-	inline double OppositeAngle(double a){return a<0 ? Pi + a :a - Pi ;}
+	inline float  OppositeAngle(float  a){return a<0 ? fPi+a:a-fPi;}
+	inline double OppositeAngle(double a){return a<0 ?  Pi+a:a- Pi;}
 
 	Icoor2 inline det(const I2 &a,const I2 & b,const I2 &c){
@@ -55,4 +59,7 @@
 		return  bax*cay - bay*cax;
 	}
+
+	//Intermediary
+	Int4 AGoodNumberPrimeWith(Int4 n);
 
 	//triangle numbering definitions
@@ -66,6 +73,5 @@
 	static const Int2 PreviousVertex[3] = {2,0,1};
 
-	Int4 AGoodNumberPrimeWith(Int4 n);
-
+	//classes
 	class Geometry;
 	class Triangles;
@@ -75,9 +81,4 @@
 	class VertexOnGeom;
 	class VertexOnEdge;
-	/////////////////////////////////////////////////////////////////////////////////////
-	const int IsVertexOnGeom = 8;
-	const int IsVertexOnVertex = 16;
-	const int IsVertexOnEdge = 32;
-	/////////////////////////////////////////////////////////////////////////////////////
 
 	/*CLASS: DoubleAndInt4 {{{1*/
@@ -138,5 +139,5 @@
 	};
 	/*}}}1*/
-	inline Vertex * TheVertex(Vertex * a); // for remove crak in mesh 
+	inline Vertex* TheVertex(Vertex * a); // for remove crak in mesh 
 	double QuadQuality(const Vertex &,const Vertex &,const Vertex &,const Vertex &);
 	/*CLASS: TriangleAdjacent{{{1*/
@@ -894,9 +895,9 @@
 
 	//From Metric.cpp
-	inline Real8 det3x3(Real8 A[3] ,Real8 B[3],Real8 C[3])
-	  { return    A[0] * ( B[1]*C[2]-B[2]*C[1])
-		- A[1] * ( B[0]*C[2]-B[2]*C[0])
-		  + A[2] * ( B[0]*C[1]-B[1]*C[0]);
-	  }
+	inline Real8 det3x3(Real8 A[3] ,Real8 B[3],Real8 C[3]){
+		return A[0]*( B[1]*C[2]-B[2]*C[1])
+		     - A[1]*( B[0]*C[2]-B[2]*C[0])
+		     + A[2]*( B[0]*C[1]-B[1]*C[0]);
+	}
 
 	inline Triangles::Triangles(Int4 i) :Gh(*new Geometry()),BTh(*this){PreInit(i);}
Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 2982)
+++ /issm/trunk/src/c/Makefile.am	(revision 2983)
@@ -325,5 +325,5 @@
 					./Bamgx/meshtype.h \
 					./Bamgx/objects/MatVVP2x2.cpp \
-					./Bamgx/objects/MetricAnIso.cpp \
+					./Bamgx/objects/Metric.cpp \
 					./Bamgx/objects/GeometricalEdge.cpp \
 					./Bamgx/objects/ListofIntersectionTriangles.cpp \
@@ -666,5 +666,5 @@
 					./Bamgx/meshtype.h \
 					./Bamgx/objects/MatVVP2x2.cpp \
-					./Bamgx/objects/MetricAnIso.cpp \
+					./Bamgx/objects/Metric.cpp \
 					./Bamgx/objects/GeometricalEdge.cpp \
 					./Bamgx/objects/ListofIntersectionTriangles.cpp \