Changeset 1542 for XIOS/trunk/src/filter
- Timestamp:
- 06/13/18 16:48:53 (6 years ago)
- Location:
- XIOS/trunk/src/filter
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/filter/binary_arithmetic_filter.hpp
r642 r1542 5 5 #include <string> 6 6 #include "operator_expr.hpp" 7 #include <unordered_map> 7 8 8 9 namespace xios -
XIOS/trunk/src/filter/data_packet.hpp
r643 r1542 2 2 #define __XIOS_CDataPacket__ 3 3 4 #include < boost/shared_ptr.hpp>4 #include <memory> 5 5 6 6 #include "array_new.hpp" … … 43 43 }; // struct CDataPacket 44 44 45 typedef boost::shared_ptr<CDataPacket> CDataPacketPtr;46 typedef boost::shared_ptr<const CDataPacket> CConstDataPacketPtr;45 typedef std::shared_ptr<CDataPacket> CDataPacketPtr; 46 typedef std::shared_ptr<const CDataPacket> CConstDataPacketPtr; 47 47 } // namespace xios 48 48 -
XIOS/trunk/src/filter/output_pin.cpp
r1358 r1542 9 9 { /* Nothing to do */ } 10 10 11 void COutputPin::connectOutput( boost::shared_ptr<CInputPin> inputPin, size_t inputSlot)11 void COutputPin::connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot) 12 12 { 13 13 if (!inputPin) … … 42 42 "The packet cannot be null."); 43 43 44 std::vector<std::pair< boost::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;44 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd; 45 45 for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it) 46 46 it->first->setInput(it->second, packet); … … 68 68 bool COutputPin::mustAutoTrigger() const 69 69 { 70 std::vector<std::pair< boost::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;70 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd; 71 71 for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it) 72 72 { … … 80 80 void COutputPin::setOutputTriggers() 81 81 { 82 std::vector<std::pair< boost::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;82 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd; 83 83 for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it) 84 84 it->first->setInputTrigger(it->second, this); … … 87 87 bool COutputPin::isDataExpected(const CDate& date) const 88 88 { 89 std::vector<std::pair< boost::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;89 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd; 90 90 for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it) 91 91 { -
XIOS/trunk/src/filter/output_pin.hpp
r1358 r1542 29 29 * \param inputSlot the input slot number 30 30 */ 31 void connectOutput( boost::shared_ptr<CInputPin> inputPin, size_t inputSlot);31 void connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot); 32 32 33 33 /*! … … 93 93 94 94 //!< The list of connected filters and the corresponding slot numbers 95 std::vector<std::pair< boost::shared_ptr<CInputPin>, size_t> > outputs;95 std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> > outputs; 96 96 97 97 //! Output buffer, store the packets until the output is triggered -
XIOS/trunk/src/filter/spatial_transform_filter.cpp
r1474 r1542 11 11 { /* Nothing to do */ } 12 12 13 std::pair< boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >13 std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> > 14 14 CSpatialTransformFilter::buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double missingValue) 15 15 { 16 16 if (!srcGrid || !destGrid) 17 ERROR("std::pair< boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >"17 ERROR("std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> >" 18 18 "buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid)", 19 19 "Impossible to build the filter graph if either the source or the destination grid are null."); 20 20 21 boost::shared_ptr<CSpatialTransformFilter> firstFilter, lastFilter;21 std::shared_ptr<CSpatialTransformFilter> firstFilter, lastFilter; 22 22 // Note that this loop goes from the last transformation to the first transformation 23 23 do … … 36 36 for (it=algoList.begin();it!=algoList.end();++it) if (it->second.first == TRANS_TEMPORAL_SPLITTING) isSpatialTemporal=true ; 37 37 38 boost::shared_ptr<CSpatialTransformFilter> filter ;39 if( isSpatialTemporal) filter = boost::shared_ptr<CSpatialTransformFilter>(new CSpatialTemporalFilter(gc, engine, gridTransformation, defaultValue, inputCount));40 else filter = boost::shared_ptr<CSpatialTransformFilter>(new CSpatialTransformFilter(gc, engine, defaultValue, inputCount));38 std::shared_ptr<CSpatialTransformFilter> filter ; 39 if( isSpatialTemporal) filter = std::shared_ptr<CSpatialTransformFilter>(new CSpatialTemporalFilter(gc, engine, gridTransformation, defaultValue, inputCount)); 40 else filter = std::shared_ptr<CSpatialTransformFilter>(new CSpatialTransformFilter(gc, engine, defaultValue, inputCount)); 41 41 42 42 … … 140 140 } 141 141 142 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines;142 std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines; 143 143 144 144 CSpatialTransformFilterEngine* CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation) … … 148 148 "Impossible to get the requested engine, the grid transformation is invalid."); 149 149 150 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation);150 std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation); 151 151 if (it == engines.end()) 152 152 { 153 boost::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation));153 std::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation)); 154 154 it = engines.insert(std::make_pair(gridTransformation, engine)).first; 155 155 } -
XIOS/trunk/src/filter/spatial_transform_filter.hpp
r1275 r1542 36 36 * \return the first and the last filters of the filter graph 37 37 */ 38 static std::pair< boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >38 static std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> > 39 39 buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double defaultValue); 40 40 … … 141 141 142 142 //! The allocated engines 143 static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines;143 static std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> > engines; 144 144 }; // class CSpatialTransformFilterEngine 145 145 } // namespace xios
Note: See TracChangeset
for help on using the changeset viewer.