Index: /issm/trunk/src/c/objects/Tria.cpp
===================================================================
--- /issm/trunk/src/c/objects/Tria.cpp	(revision 2045)
+++ /issm/trunk/src/c/objects/Tria.cpp	(revision 2046)
@@ -1647,5 +1647,5 @@
 	GetNodalFunctionsDerivativesBasic(&dh1dh2dh3_basic[0][0],xyz_list, gauss_l1l2l3);
 
-	#ifdef _ISSM_ISSM_DEBUG_ 
+	#ifdef _ISSM_DEBUG_ 
 	for (i=0;i<3;i++){
 		printf("Node %i  dh/dx=%lf dh/dy=%lf \n",i,dh1dh2dh3_basic[0][i],dh1dh2dh3_basic[1][i]);
@@ -1777,5 +1777,5 @@
 	GetNodalFunctions(&l1l2l3[0],gauss_l1l2l3);
 
-	#ifdef _ISSM_ISSM_DEBUG_ 
+	#ifdef _ISSM_DEBUG_ 
 	for (i=0;i<3;i++){
 		printf("Node %i  h=%lf \n",i,l1l2l3[i]);
@@ -2128,5 +2128,5 @@
 		/* Get Jacobian determinant: */
 		GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 		printf("Element id %i Jacobian determinant: %g\n",GetId(),Jdet);
 		#endif
@@ -2365,5 +2365,5 @@
 		GetParameterValue(&alpha_complement, &alpha_complement_list[0],gauss_l1l2l3);
 		GetParameterValue(&drag, &k[0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 			printf("Drag complement: %20.20lf Drag: %20.20lf\n",alpha_complement,drag);
 		#endif
@@ -2372,5 +2372,5 @@
 		GetParameterValue(&lambda, &adjx_list[0],gauss_l1l2l3);
 		GetParameterValue(&mu, &adjy_list[0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 			printf("Adjoint vector %20.20lf %20.20lf\n",lambda,mu);
 		#endif
@@ -2379,5 +2379,5 @@
 		GetParameterValue(&vx, &vx_list[0],gauss_l1l2l3);
 		GetParameterValue(&vy, &vy_list[0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 			printf("Velocity vector %20.20lf %20.20lf\n",vx,vy);
 		#endif
@@ -2385,5 +2385,5 @@
 		/* Get Jacobian determinant: */
 		GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 		printf("Element id %i Jacobian determinant: %lf\n",GetId(),Jdet);
 		#endif
@@ -2563,5 +2563,5 @@
 		GetParameterValue(&alpha_complement, &alpha_complement_list[0],gauss_l1l2l3);
 		GetParameterValue(&drag, &k[0],gauss_l1l2l3);
-#ifdef _ISSM_ISSM_DEBUG_ 
+#ifdef _ISSM_DEBUG_ 
 		printf("Drag complement: %20.20lf Drag: %20.20lf\n",alpha_complement,drag);
 #endif
@@ -2571,5 +2571,5 @@
 		GetParameterValue(&mu, &adjy_list[0],gauss_l1l2l3);
 		GetParameterValue(&xi, &adjz_list[0],gauss_l1l2l3);
-#ifdef _ISSM_ISSM_DEBUG_ 
+#ifdef _ISSM_DEBUG_ 
 		printf("Adjoint vector %20.20lf %20.20lf\n",lambda,mu);
 #endif
@@ -2579,5 +2579,5 @@
 		GetParameterValue(&vy, &vy_list[0],gauss_l1l2l3);
 		GetParameterValue(&vz, &vz_list[0],gauss_l1l2l3);
-#ifdef _ISSM_ISSM_DEBUG_ 
+#ifdef _ISSM_DEBUG_ 
 		printf("Velocity vector %20.20lf %20.20lf\n",vx,vy);
 
@@ -2592,5 +2592,5 @@
 		/* Get Jacobian determinant: */
 		GetJacobianDeterminant3d(&Jdet, &xyz_list[0][0],gauss_l1l2l3);
-#ifdef _ISSM_ISSM_DEBUG_ 
+#ifdef _ISSM_DEBUG_ 
 		printf("Element id %i Jacobian determinant: %lf\n",GetId(),Jdet);
 #endif
@@ -2743,5 +2743,5 @@
 	/* Get gaussian points and weights (make this a statically initialized list of points? fstd): */
 	GaussTria( &num_gauss, &first_gauss_area_coord, &second_gauss_area_coord, &third_gauss_area_coord, &gauss_weights, 4);
-	#ifdef _ISSM_ISSM_DEBUG_ 
+	#ifdef _ISSM_DEBUG_ 
 	for (i=0;i<num_gauss;i++){
 		printf("Gauss coord %i: %lf %lf %lf Weight: %lf\n",i,*(first_gauss_area_coord+i),*(second_gauss_area_coord+i),*(third_gauss_area_coord+i),*(gauss_weights+i));
@@ -2777,5 +2777,5 @@
 		/* Get nodal functions value at gaussian point:*/
 		GetNodalFunctions(l1l2l3, gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_
+		#ifdef _ISSM_DEBUG_
 			printf("viscositycomp %g thickness %g dvx [%g %g] dvy [%g %g]  dadjx [%g %g] dadjy[%g %g]\n",viscosity_complement,thickness,dvx[0],dvx[1],dvy[0],dvy[1],dadjx[0],dadjx[1],dadjy[0],dadjy[1]);
 		#endif
@@ -2913,5 +2913,5 @@
 	GaussTria( &num_gauss, &first_gauss_area_coord, &second_gauss_area_coord, &third_gauss_area_coord, &gauss_weights, 2);
 	
-	#ifdef _ISSM_ISSM_DEBUG_ 
+	#ifdef _ISSM_DEBUG_ 
 	for (i=0;i<num_gauss;i++){
 		printf("Gauss coord %i: %lf %lf %lf Weight: %lf\n",i,*(first_gauss_area_coord+i),*(second_gauss_area_coord+i),*(third_gauss_area_coord+i),*(gauss_weights+i));
@@ -2929,5 +2929,5 @@
 		/* Get Jacobian determinant: */
 		GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss_l1l2l3);
-		#ifdef _ISSM_ISSM_DEBUG_ 
+		#ifdef _ISSM_DEBUG_ 
 		printf("Element id %i Jacobian determinant: %lf\n",GetId(),Jdet);
 		#endif