Changeset 1685 for XIOS/dev/dev_trunk_omp/src/filter
- Timestamp:
- 07/31/19 13:34:37 (5 years ago)
- Location:
- XIOS/dev/dev_trunk_omp/src/filter
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_trunk_omp/src/filter/binary_arithmetic_filter.hpp
r1681 r1685 40 40 std::tuple<int, int, int> virtual buildGraph(std::vector<CDataPacketPtr> data); 41 41 42 // CDataPacketPtr virtual buildGraph_post(CDataPacketPtr packet, std::vector<CDataPacketPtr> data); 42 43 43 }; // class CScalarFieldArithmeticFilter 44 44 -
XIOS/dev/dev_trunk_omp/src/filter/file_writer_filter.cpp
r1681 r1685 38 38 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->record4graphXiosAttributes(); 39 39 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].clusterID =1; 40 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);40 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1; 41 41 42 42 if(CXios::isClient && CWorkflowGraph::build_begin) -
XIOS/dev/dev_trunk_omp/src/filter/output_pin.cpp
r1681 r1685 129 129 } 130 130 131 int COutputPin::getDistance() 132 { 133 int distance = 0; 134 // for(int i=0; i<parent_filters.size(); i++) 135 // { 136 // distance = max(distance, parent_filters[i]->getDistance()+1); 137 // } 138 return distance; 139 } 131 140 132 141 133 -
XIOS/dev/dev_trunk_omp/src/filter/output_pin.hpp
r1681 r1685 18 18 { 19 19 public: 20 // StdString output_field_id;21 20 int tag; 22 21 Time start_graph; … … 86 85 87 86 void virtual setParentFiltersTag(); 88 int virtual getDistance();89 87 90 88 -
XIOS/dev/dev_trunk_omp/src/filter/pass_through_filter.cpp
r1681 r1685 18 18 if(building_graph) 19 19 { 20 std::cout<<"pass through packet->distance = "<<data[0]->distance<<std::endl; 20 21 // std::cout<<"CPassThroughFilter::apply field_id = "<<this->field->getId()<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl; 21 22 this->filterID = InvalidableObject::filterIdGenerator++; … … 25 26 26 27 CWorkflowGraph::addNode(this->filterID, "Pass Through Filter\\n("+data[0]->field->getId()+")", 2, 1, 1, data[0]); 27 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);28 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1; 28 29 29 30 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes(); … … 39 40 40 41 data[0]->src_filterID=this->filterID; 42 data[0]->distance++; 41 43 42 44 } 43 45 44 46 data[0]->field = this->field; 47 45 48 } 46 49 -
XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.cpp
r1681 r1685 75 75 76 76 CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine); 77 CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field , this->getDistance());77 CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field); 78 78 if (outputPacket) 79 79 { … … 112 112 113 113 CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine); 114 CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field , this->getDistance());114 CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field); 115 115 116 116 if (outputPacket) … … 179 179 } 180 180 181 bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field , int distance)181 bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field) 182 182 { 183 183 bool building_graph = tag ? data[0]->timestamp >= start_graph && data[0]->timestamp <= end_graph : false; … … 207 207 } 208 208 209 CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field , int distance)209 CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field) 210 210 { 211 211 212 bool BG = buildGraph(data, tag, start_graph, end_graph, field , distance);212 bool BG = buildGraph(data, tag, start_graph, end_graph, field); 213 213 214 214 CDataPacketPtr packet(new CDataPacket); -
XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp
r1681 r1685 121 121 * \return the result of the grid transformation 122 122 */ 123 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);124 bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0 , int distance=1);123 CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0); 124 bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0); 125 125 126 126 /*! -
XIOS/dev/dev_trunk_omp/src/filter/store_filter.cpp
r1681 r1685 100 100 CWorkflowGraph::allocNodeEdge(); 101 101 102 CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 1, 1, data[0]);102 CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 0, 1, data[0]); 103 103 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance); 104 104 (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes(); -
XIOS/dev/dev_trunk_omp/src/filter/temporal_filter.cpp
r1681 r1685 139 139 packet->src_filterID=this->filterID; 140 140 packet->distance = data[0]->distance+1; 141 std::cout<<"temporal packet->distance = "<<packet->distance<<std::endl; 141 142 this->filterIDoutputs.clear(); 142 143 CWorkflowGraph::build_begin=true;
Note: See TracChangeset
for help on using the changeset viewer.