Changeset 1176 for XIOS/dev/branch_yushan_merged/extern/remap/src

Timestamp:

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

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/extern/remap/src

Files:

• libmapper.cpp (modified) (5 diffs)
• polyg.cpp (modified) (3 diffs)
• triple.cpp (modified) (1 diff)

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

@@ -16 +16 @@
 #include "gridRemap.hpp"
 
+#include <stdio.h>
+
 using namespace sphereRemap ;
 
-extern CRemapGrid srcGrid;
-#pragma omp threadprivate(srcGrid)
+//extern CRemapGrid srcGrid;
+//#pragma omp threadprivate(srcGrid)
 
-extern CRemapGrid tgtGrid;
-#pragma omp threadprivate(tgtGrid)
+//extern CRemapGrid tgtGrid;
+//#pragma omp threadprivate(tgtGrid)
 
 
@@ -40 +42 @@
                      int order, int* n_weights)
 {
-        assert(src_bounds_lon);
-        assert(src_bounds_lat);
-        assert(n_vert_per_cell_src >= 3);
-        assert(n_cell_src >= 4);
-        assert(dst_bounds_lon);
-        assert(dst_bounds_lat);
-        assert(n_vert_per_cell_dst >= 3);
-        assert(n_cell_dst >= 4);
-        assert(1 <= order && order <= 2);
+  printf("libmapper callded : remap_get_num_weights\n");
+  assert(src_bounds_lon);
+  assert(src_bounds_lat);
+  assert(n_vert_per_cell_src >= 3);
+  assert(n_cell_src >= 4);
+  assert(dst_bounds_lon);
+  assert(dst_bounds_lat);
+  assert(n_vert_per_cell_dst >= 3);
+  assert(n_cell_dst >= 4);
+  assert(1 <= order && order <= 2);
 
   mapper = new Mapper(MPI_COMM_WORLD);
@@ -87 +90 @@
         double tic = cputime();
         mapper = new Mapper(MPI_COMM_WORLD);
-  mapper->setVerbosity(PROGRESS) ;
+        mapper->setVerbosity(PROGRESS) ;
         mapper->buildSSTree(src_msh, dst_msh);
         double tac = cputime();
@@ -122 +125 @@
                      double* centre_lon, double* centre_lat, double* areas)
 {
+  printf("libmapper callded : remap_get_barycentres_and_areas\n");
         for (int i = 0; i < n_cell; i++)
         {
@@ -145 +149 @@
 extern "C" void remap_get_weights(double* weights, int* src_indices, int* dst_indices)
 {
+  printf("libmapper callded : remap_get_weights\n");
         memcpy(weights, mapper->remapMatrix, mapper->nWeights*sizeof(double));
         memcpy(src_indices, mapper->srcAddress, mapper->nWeights*sizeof(int));

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;

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

@@ -3 +3 @@
 namespace sphereRemap {
 
-extern const Coord ORIGIN(0.0, 0.0, 0.0);
+const Coord ORIGIN(0.0, 0.0, 0.0);
 
 std::ostream& operator<<(std::ostream& os, const Coord& c) {