Changeset 1685 for XIOS/dev/dev_trunk_omp/src

Timestamp:

07/31/19 13:34:37 (5 years ago)

Author:

yushan

Message:

dev for graph

Location:

XIOS/dev/dev_trunk_omp/src

Files:

• filter/binary_arithmetic_filter.hpp (modified) (1 diff)
• filter/file_writer_filter.cpp (modified) (1 diff)
• filter/output_pin.cpp (modified) (1 diff)
• filter/output_pin.hpp (modified) (2 diffs)
• filter/pass_through_filter.cpp (modified) (3 diffs)
• filter/spatial_transform_filter.cpp (modified) (4 diffs)
• filter/spatial_transform_filter.hpp (modified) (1 diff)
• filter/store_filter.cpp (modified) (1 diff)
• filter/temporal_filter.cpp (modified) (1 diff)
• node/field.cpp (modified) (3 diffs)
• node/field_impl.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/src/filter/binary_arithmetic_filter.hpp

@@ -40 +40 @@
       std::tuple<int, int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
       
-      // CDataPacketPtr virtual buildGraph_post(CDataPacketPtr packet, std::vector<CDataPacketPtr> data);
+
   }; // class CScalarFieldArithmeticFilter
 

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

@@ -38 +38 @@
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->record4graphXiosAttributes();
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].clusterID =1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       if(CXios::isClient && CWorkflowGraph::build_begin) 

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

@@ -129 +129 @@
   }
 
-  int COutputPin::getDistance()
-  {
-    int distance = 0;
-    // for(int i=0; i<parent_filters.size(); i++)
-    // {
-    //   distance = max(distance, parent_filters[i]->getDistance()+1);
-    // }
-    return distance;
-  }
+
 
 

XIOS/dev/dev_trunk_omp/src/filter/output_pin.hpp

@@ -18 +18 @@
   {
     public:
-      // StdString output_field_id;
       int tag;
       Time start_graph;
@@ -86 +85 @@
 
       void virtual setParentFiltersTag();
-      int virtual getDistance();
 
 

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

@@ -18 +18 @@
     if(building_graph)
     {
+      std::cout<<"pass through packet->distance = "<<data[0]->distance<<std::endl;
       // std::cout<<"CPassThroughFilter::apply field_id = "<<this->field->getId()<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
       this->filterID = InvalidableObject::filterIdGenerator++;
@@ -25 +26 @@
 
       CWorkflowGraph::addNode(this->filterID, "Pass Through Filter\\n("+data[0]->field->getId()+")", 2, 1, 1, data[0]);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
@@ -39 +40 @@
       
       data[0]->src_filterID=this->filterID;
+      data[0]->distance++;
 
     }
 
     data[0]->field = this->field;
+
   }
 

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

@@ -75 +75 @@
 
     CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
-    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field, this->getDistance());
+    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field);
     if (outputPacket)
     {
@@ -112 +112 @@
 
     CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
-    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field, this->getDistance());
+    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field);
 
     if (outputPacket)
@@ -179 +179 @@
   }
 
-  bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field, int distance)
+  bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field)
   {
     bool building_graph = tag ? data[0]->timestamp >= start_graph && data[0]->timestamp <= end_graph : false;
@@ -207 +207 @@
   }
 
-  CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field, int distance)
+  CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field)
   {
     
-    bool BG = buildGraph(data, tag, start_graph, end_graph, field, distance);
+    bool BG = buildGraph(data, tag, start_graph, end_graph, field);
 
     CDataPacketPtr packet(new CDataPacket);

XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp

@@ -121 +121 @@
        * \return the result of the grid transformation
        */
-      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0, int distance=1);
-      bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0, int distance=1);
+      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0);
+      bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0);
 
        /*!

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

@@ -100 +100 @@
       CWorkflowGraph::allocNodeEdge();
  
-      CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 1, 1, data[0]);
+      CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 0, 1, data[0]);
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();

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

@@ -139 +139 @@
           packet->src_filterID=this->filterID;
           packet->distance = data[0]->distance+1;
+          std::cout<<"temporal packet->distance = "<<packet->distance<<std::endl;
           this->filterIDoutputs.clear();
           CWorkflowGraph::build_begin=true;

XIOS/dev/dev_trunk_omp/src/node/field.cpp

@@ -1319 +1319 @@
            storeFilter->end_graph = filter_end;
            storeFilter->field = this;
-           storeFilter->distance = instantDataFilter->getDistance()+1;
+           storeFilter->distance = instantDataFilter->distance+1;
          }
 
@@ -1334 +1334 @@
            fileWriterFilter->start_graph = filter_start;
            fileWriterFilter->end_graph = filter_end;
-           fileWriterFilter->distance = getTemporalDataFilter(gc, file->output_freq)->getDistance()+1;
+           fileWriterFilter->distance = getTemporalDataFilter(gc, file->output_freq)->distance+1;
 
            // std::cout<<"CFileWriterFilter filter start = "<<filter_start<<" end = "<<filter_end<<" field = "<<this->getId()<<std::endl;
@@ -1560 +1560 @@
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty()  && detect_missing_value == true);
-       std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, CContext::getCurrent()->getCalendar()->getInitDate(),
-                                                                             freq_op, freq_offset, outFreq,
-                                                                             detectMissingValues));
+       std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
+                                                                             CContext::getCurrent()->getCalendar()->getInitDate(),
+                                                                             freq_op, freq_offset, outFreq, detectMissingValues));
 
        instantDataFilter->connectOutput(temporalFilter, 0);

XIOS/dev/dev_trunk_omp/src/node/field_impl.hpp

@@ -23 +23 @@
       if (check_if_active.isEmpty() || (!check_if_active.isEmpty() && (!check_if_active) || isActive(true)))
         clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data);
-        // clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data, this->getId());
     }
     else if (instantDataFilter)