Changeset 1646 for XIOS/dev/dev_trunk_omp/extern/remap/src/polyg.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/extern/remap/src/polyg.cpp (modified) (5 diffs)

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

@@ -218 +218 @@
 int packedPolygonSize(const Elt& e)
 {
-  return sizeof(e.id) + sizeof(e.src_id) + sizeof(e.x) + sizeof(e.val) +
+  return sizeof(e.id) + sizeof(e.src_id) + sizeof(e.x) + sizeof(e.val)  + sizeof(e.given_area)+
          sizeof(e.n) + e.n*(sizeof(double)+sizeof(Coord));
 }
@@ -235 +235 @@
   pos += sizeof(e.val);
 
+  *((double*) &(buffer[pos])) = e.given_area;
+  pos += sizeof(e.val);
+
   *((int *) & (buffer[pos])) = e.n;
   pos += sizeof(e.n);
@@ -262 +265 @@
   pos += sizeof(double);
 
+  e.given_area = *((double *) & (buffer[pos]));
+  pos += sizeof(double);
+
   e.n = *((int *) & (buffer[pos]));
   pos += sizeof(int);
@@ -291 +297 @@
     *((double *) &(buffer[pos])) = e.area;
     pos += sizeof(double);
+
 
     *((GloId *) &(buffer[pos])) = (*it)->id;
@@ -322 +329 @@
     pos += sizeof(double);
 
+
     Polyg *polygon = new Polyg;