Changeset 1153 for XIOS/dev/branch_yushan_merged/extern/remap/src/intersect.cpp

Timestamp:

06/02/17 17:53:25 (7 years ago)

Author:

yushan

Message:

save modif

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/intersect.cpp (modified) (1 diff)

XIOS/dev/branch_yushan_merged/extern/remap/src/intersect.cpp

@@ -57 +57 @@
     {
       // share a full edge ? be carefull at the orientation
-      /*
-      if(squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ||
-         squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 )
-      {      
-        printf("A : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
-                i, j, squaredist(a.vertex[i], b.vertex[j]), 
-                squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ? true : false);
-        printf("B : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
-                (i+1)%a.n, (j+1)%b.n, squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]),
-                squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 ? true : false);
+      
+      //if(squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ||
+      //   squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 )
+      //{      
+        //printf("A : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
+        //        i, j, squaredist(a.vertex[i], b.vertex[j]), 
+        //        squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ? true : false);
+        //printf("B : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
+        //        (i+1)%a.n, (j+1)%b.n, squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]),
+        //        squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 ? true : false);
 
         assert(squaredist(a.vertex[ i       ], b.vertex[ j       ]) > 1e-10*1e-10 ||
                squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10);
-        exit(0);
-      }*/
+        
+      //}
+
       if (   squaredist(a.vertex[ i       ], b.vertex[ j           ]) < 1e-10*1e-10 &&
              squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+b.n-1)%b.n]) < 1e-10*1e-10)