Changeset 1205 for XIOS/dev/branch_yushan_merged/extern/remap/src/libmapper.cpp

Timestamp:

07/10/17 18:17:04 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1200

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/libmapper.cpp (modified) (4 diffs)

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

@@ -14 +14 @@
 #include "mapper.hpp"
 #include "cputime.hpp" // cputime
-#include "gridRemap.hpp"
-
 #include <stdio.h>
 
 using namespace sphereRemap ;
-
-//extern CRemapGrid srcGrid;
-//#pragma omp threadprivate(srcGrid)
-
-//extern CRemapGrid tgtGrid;
-//#pragma omp threadprivate(tgtGrid)
-
 
 /* mapper is a ponter to a global class instance whoes members are allocated in the first step (finding the sizes of the weight arrays)
@@ -42 +33 @@
                      int order, int* n_weights)
 {
-  printf("libmapper callded : remap_get_num_weights\n");
   assert(src_bounds_lon);
   assert(src_bounds_lat);
@@ -125 +115 @@
                      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++)
         {
@@ -149 +138 @@
 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));