Index: /issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp
===================================================================
--- /issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 5237)
+++ /issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 5238)
@@ -291,5 +291,5 @@
 				 *we can only rely on the position (x,y) of the rift grids to create a segment:*/
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+0)-1]) & (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
+					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+0)-1]) && (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
 						*(segments+3*j+0)=*(index+el1*3+k);
 						break;
@@ -297,5 +297,5 @@
 				}
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+1)-1]) & (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
+					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+1)-1])  && (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
 						*(segments+3*j+1)=*(index+el1*3+k);
 						break;
@@ -306,5 +306,5 @@
 				*(segmentmarkerlist+(nsegs+i))=*(segmentmarkerlist+j);
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+0)-1]) & (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
+					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+0)-1]) && (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
 						*(segments+3*(nsegs+i)+0)=*(index+el2*3+k);
 						break;
@@ -312,5 +312,5 @@
 				}
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+1)-1]) & (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
+					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+1)-1]) && (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
 						*(segments+3*(nsegs+i)+1)=*(index+el2*3+k);
 						break;
@@ -322,5 +322,5 @@
 				/*Let's update segments[j][:] using  element el2 and the corresponding rift segment: */
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+0)-1]) & (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
+					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+0)-1]) && (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
 						*(segments+3*j+0)=*(index+el2*3+k);
 						break;
@@ -328,5 +328,5 @@
 				}
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+1)-1]) & (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
+					if ((x[(int)*(index+el2*3+k)-1]==x[(int)*(segments+3*j+1)-1]) && (y[(int)*(index+el2*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
 						*(segments+3*j+1)=*(index+el2*3+k);
 						break;
@@ -337,5 +337,5 @@
 				*(segmentmarkerlist+(nsegs+i))=*(segmentmarkerlist+j);
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+0)-1]) & (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
+					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+0)-1]) && (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+0)-1])){
 						*(segments+3*(nsegs+i)+0)=*(index+el1*3+k);
 						break;
@@ -343,5 +343,5 @@
 				}
 				for (k=0;k<3;k++){
-					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+1)-1]) & (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
+					if ((x[(int)*(index+el1*3+k)-1]==x[(int)*(segments+3*j+1)-1]) && (y[(int)*(index+el1*3+k)-1]==y[(int)*(segments+3*j+1)-1])){
 						*(segments+3*(nsegs+i)+1)=*(index+el1*3+k);
 						break;
