Changeset 1053 for XIOS/dev/branch_yushan/src/filter

Timestamp:

02/17/17 17:55:37 (7 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

Location:

XIOS/dev/branch_yushan/src/filter

Files:

• filter.cpp (modified) (1 diff)
• input_pin.cpp (modified) (1 diff)
• output_pin.cpp (modified) (1 diff)
• source_filter.cpp (modified) (1 diff)
• spatial_transform_filter.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan/src/filter/filter.cpp

@@ -14 +14 @@
     CDataPacketPtr outputPacket = engine->apply(data);
     if (outputPacket)
+    {
+      printf("filter/filter.cpp : deliverOuput(outputPacket)\n");
       deliverOuput(outputPacket);
+      printf("filter/filter.cpp : deliverOuput(outputPacket) OKOK\n");
+    }
   }
 } // namespace xios

XIOS/dev/branch_yushan/src/filter/input_pin.cpp

@@ -33 +33 @@
       // Unregister before calling onInputReady in case the filter registers again
       gc.unregisterFilter(this, packet->timestamp);
+      printf("filter/input_pin.cpp : onInputReady\n");
       onInputReady(it->second.packets);
+      printf("filter/input_pin.cpp : onInputReady OKOK\n");
       inputs.erase(it);
     }

XIOS/dev/branch_yushan/src/filter/output_pin.cpp

@@ -22 +22 @@
     for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it)
     {
+      printf("filter/output_pin.cpp : setInput\n");
       it->first->setInput(it->second, packet);
+      printf("filter/output_pin.cpp : setInput OKOK\n");
     }
   }

XIOS/dev/branch_yushan/src/filter/source_filter.cpp

@@ -29 +29 @@
     grid->inputField(data, packet->data);
 
+    printf("filter/source_filter.cpp : deliverOuput(packet) \n");
     deliverOuput(packet);
+    printf("filter/source_filter.cpp : deliverOuput(packet) OKOK\n");
   }
 

XIOS/dev/branch_yushan/src/filter/spatial_transform_filter.cpp

@@ -150 +150 @@
 
       idxSendBuff = 0;
-      std::vector<MPI_Request> sendRecvRequest;
+      std::vector<ep_lib::MPI_Request> sendRecvRequest;
       for (itSend = itbSend; itSend != iteSend; ++itSend, ++idxSendBuff)
       {
@@ -160 +160 @@
           sendBuff[idxSendBuff][idx] = dataCurrentSrc(localIndex_p(idx));
         }
-        sendRecvRequest.push_back(MPI_Request());
+        sendRecvRequest.push_back(ep_lib::MPI_Request());
         MPI_Isend(sendBuff[idxSendBuff], countSize, MPI_DOUBLE, destRank, 12, client->intraComm, &sendRecvRequest.back());
       }
@@ -178 +178 @@
         int srcRank = itRecv->first;
         int countSize = itRecv->second.size();
-        sendRecvRequest.push_back(MPI_Request());
+        sendRecvRequest.push_back(ep_lib::MPI_Request());
         MPI_Irecv(recvBuff + currentBuff, countSize, MPI_DOUBLE, srcRank, 12, client->intraComm, &sendRecvRequest.back());
         currentBuff += countSize;
       }
-      std::vector<MPI_Status> status(sendRecvRequest.size());
+      std::vector<ep_lib::MPI_Status> status(sendRecvRequest.size());
       MPI_Waitall(sendRecvRequest.size(), &sendRecvRequest[0], &status[0]);