Changeset 1681 for XIOS/dev/dev_trunk_omp/src/filter/source_filter.cpp

Timestamp:

07/19/19 15:28:33 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Bug fixed

File:

• XIOS/dev/dev_trunk_omp/src/filter/source_filter.cpp (modified) (3 diffs)

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

@@ -25 +25 @@
   }
 
-  
-  template <int N>
-  void CSourceFilter::streamData(CDate date, const CArray<double, N>& data, const StdString field_id)
+  void CSourceFilter::buildGraph(CDataPacketPtr packet)
   {
-    date = date + offset; // this is a temporary solution, it should be part of a proper temporal filter
-
-    CDataPacketPtr packet(new CDataPacket);
-    packet->date = date;
-    packet->timestamp = date;
-    packet->status = CDataPacket::NO_ERROR;
-
-    packet->data.resize(grid->storeIndex_client.numElements());    
+    bool building_graph = this->tag ? packet->timestamp >= this->field->field_graph_start && packet->timestamp <= this->field->field_graph_end : false;
+    // bool building_graph = this->tag ? packet->timestamp >= this->start_graph && packet->timestamp <= this->end_graph : false;
     
-    if (compression)
-    {
-      packet->data = defaultValue;
-      grid->uncompressField(data, packet->data);    
-    }
-    else
-    {
-      if (mask)
-        grid->maskField(data, packet->data);
-      else
-        grid->inputField(data, packet->data);
-    }
-    // Convert missing values to NaN
-    if (hasMissingValue)
-    {
-      const double nanValue = std::numeric_limits<double>::quiet_NaN();
-      const size_t nbData = packet->data.numElements();
-      for (size_t idx = 0; idx < nbData; ++idx)
-      {
-        if (defaultValue == packet->data(idx))
-          packet->data(idx) = nanValue;
-      }
-    }
-
-    
-    bool building_graph = this->tag ? packet->timestamp >= this->start_graph && packet->timestamp <= this->end_graph : false;
+    // std::cout<<"************************************************source filter 1 : field_id = "<<this->field->getId()<<" this->start_graph = "<<this->start_graph<<" this->end_graph = "<<this->end_graph<<std::endl;
+    // std::cout<<"************************************************source filter 2 : field_id = "<<this->field->getId()<<" this->field->field_graph_start = "<<this->field->field_graph_start<<" this->field->field_graph_end = "<<this->field->field_graph_end<<std::endl;
 
     if(building_graph)
@@ -70 +38 @@
       packet->src_filterID=this->filterID;
       packet->field = this->field;
+      packet->distance = 1;
       
-      if(CXios::isClient) std::cout<<"source filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
+      // if(CXios::isClient) std::cout<<"source filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
     
       CWorkflowGraph::allocNodeEdge();
 
       CWorkflowGraph::addNode(this->filterID, "Source Filter ", 1, 1, 0, packet);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->recordXiosAttributes();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].field_id = this->field->getId();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = 1;
 
       CWorkflowGraph::build_begin = true;
     }
 
-
-    onOutputReady(packet);
+    // if(building_graph) std::cout<<packet->timestamp<<"************************************************ source filter : field_id = "<<this->field->getId()<<" start = "<<this->field->field_graph_start<<" end_graph = "<<this->field->field_graph_end<<std::endl;
   }
-
-  template void CSourceFilter::streamData<1>(CDate date, const CArray<double, 1>& data, const StdString field_id);
-  template void CSourceFilter::streamData<2>(CDate date, const CArray<double, 2>& data, const StdString field_id);
-  template void CSourceFilter::streamData<3>(CDate date, const CArray<double, 3>& data, const StdString field_id);
-  template void CSourceFilter::streamData<4>(CDate date, const CArray<double, 4>& data, const StdString field_id);
-  template void CSourceFilter::streamData<5>(CDate date, const CArray<double, 5>& data, const StdString field_id);
-  template void CSourceFilter::streamData<6>(CDate date, const CArray<double, 6>& data, const StdString field_id);
-  template void CSourceFilter::streamData<7>(CDate date, const CArray<double, 7>& data, const StdString field_id);
 
 
@@ -130 +91 @@
       }
     }
-    this->filterID = InvalidableObject::filterIdGenerator++;
-    packet->src_filterID=this->filterID;
 
-    if(CXios::isClient) std::cout<<"source filter filter tag = "<<this->tag<<std::endl;
+    if(CXios::isClient) buildGraph(packet);
+    
+
 
     onOutputReady(packet);