Changeset 1037 for XIOS/dev/branch_yushan/src/filter/store_filter.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/filter/store_filter.cpp (modified) (4 diffs)

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

@@ -8 +8 @@
   CStoreFilter::CStoreFilter(CGarbageCollector& gc, CContext* context, CGrid* grid)
     : CInputPin(gc, 1)
-    , gc(gc)
     , context(context)
     , grid(grid)
@@ -24 +23 @@
     CTimer timer("CStoreFilter::getPacket");
     CConstDataPacketPtr packet;
-    const double timeout = CXios::recvFieldTimeout;
+    const double timeout = 10; // 10 seconds timeout
 
     do
     {
-      if (canBeTriggered())
-        trigger(timestamp);
-
       timer.resume();
 
@@ -43 +39 @@
 
     if (!packet)
-    {
-      std::map<Time, CDataPacketPtr>::const_iterator it ;
-      info(0)<<"Impossible to get the packet with timestamp = " << timestamp<<std::endl<<"Available timestamp are : "<<std::endl ;
-      for(it=packets.begin();it!=packets.end();++it) info(0)<<it->first<<"  ";
-      info(0)<<std::endl ;
       ERROR("CConstDataPacketPtr CStoreFilter::getPacket(Time timestamp) const",
             << "Impossible to get the packet with timestamp = " << timestamp);
-    }
+
     return packet;
   }
@@ -78 +69 @@
     // The packet is always destroyed by the garbage collector
     // so we register but never unregister
-    gc.registerObject(this, data[0]->timestamp);
+    gc.registerFilter(this, data[0]->timestamp);
   }