Changeset 1176 for XIOS/dev/branch_yushan_merged/extern/remap/src/polyg.cpp

Timestamp:

06/21/17 09:09:59 (7 years ago)

Author:

yushan

Message:

save modif

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/polyg.cpp (modified) (3 diffs)

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

@@ -3 +3 @@
 #include <cassert>
 #include <iostream>
+#include <stdio.h>
 #include "elt.hpp"
 #include "errhandle.hpp"
@@ -161 +162 @@
 {
         if (N < 3)
-                return 0; /* polygons with less then three vertices have zero area */
+                return 0; /* polygons with less than three vertices have zero area */
         Coord t[3];
         t[0] = barycentre(x, N);
@@ -174 +175 @@
                 t[2] = x[ii];
                 double sc=scalarprod(crossprod(t[1] - t[0], t[2] - t[0]), t[0]) ;
-                assert(sc >= -1e-10); // Error: tri a l'env (wrong orientation)
+                //assert(sc >= -1e-10); // Error: tri a l'env (wrong orientation)
+                if(sc < -1e-10)
+                {
+                  printf("N=%d, sc = %f, t[0]=(%f,%f,%f), t[1]=(%f,%f,%f), t[2]=(%f,%f,%f)\n", N, sc,
+                                                                                         t[0].x, t[0].y, t[0].z, 
+                                                                                         t[1].x, t[1].y, t[1].z,
+                                                                                         t[2].x, t[2].y, t[2].z);
+                  assert(sc >= -1e-10);
+                }
                 double area_gc = triarea(t[0], t[1], t[2]);
                 double area_sc_gc_moon = 0;