Changeset 988 for XIOS/trunk/src/filter

Timestamp:

11/16/16 14:53:16 (7 years ago)

Author:

mhnguyen

Message:

Correcting a bug on reading non-distributed data in server mode.

+) Non distributed data read by all servers then transfered back to ALL clients

Test
+) On Curie
+) Work

File:

• XIOS/trunk/src/filter/source_filter.cpp (modified) (2 diffs)

XIOS/trunk/src/filter/source_filter.cpp

@@ -48 +48 @@
     packet->status = CDataPacket::NO_ERROR;
 
-    if (data.size() != grid->storeIndex_toSrv.size())
+    // if (data.size() != grid->storeIndex_toSrv.size())
+    if (data.size() != grid->storeIndex_fromSrv.size())
       ERROR("CSourceFilter::streamDataFromServer(CDate date, const std::map<int, CArray<double, 1> >& data)",
             << "Incoherent data received from servers,"
-            << " expected " << grid->storeIndex_toSrv.size() << " chunks but " << data.size() << " were given.");
+            << " expected " << grid->storeIndex_fromSrv.size() << " chunks but " << data.size() << " were given.");
 
     packet->data.resize(grid->storeIndex_client.numElements());
@@ -57 +58 @@
     for (it = data.begin(); it != itEnd; it++)
     {
-      CArray<int,1>& index = grid->storeIndex_toSrv[it->first];
-
+      // CArray<int,1>& index = grid->storeIndex_toSrv[it->first];
+      CArray<int,1>& index = grid->storeIndex_fromSrv[it->first];
       for (int n = 0; n < index.numElements(); n++)
         packet->data(index(n)) = it->second(n);