Changeset 1545 for XIOS/dev/branch_openmp/src/filter

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

Location:

XIOS/dev/branch_openmp/src/filter

Files:

• binary_arithmetic_filter.hpp (modified) (1 diff)
• data_packet.hpp (modified) (2 diffs)
• output_pin.cpp (modified) (5 diffs)
• output_pin.hpp (modified) (2 diffs)
• spatial_transform_filter.cpp (modified) (4 diffs)
• spatial_transform_filter.hpp (modified) (2 diffs)
• temporal_filter.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 #include <string>
 #include "operator_expr.hpp"
+#include <unordered_map>
 
 namespace xios

XIOS/dev/branch_openmp/src/filter/data_packet.hpp

@@ -2 +2 @@
 #define __XIOS_CDataPacket__
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "array_new.hpp"
@@ -43 +43 @@
   }; // struct CDataPacket
 
-  typedef boost::shared_ptr<CDataPacket> CDataPacketPtr;
-  typedef boost::shared_ptr<const CDataPacket> CConstDataPacketPtr;
+  typedef std::shared_ptr<CDataPacket> CDataPacketPtr;
+  typedef std::shared_ptr<const CDataPacket> CConstDataPacketPtr;
 } // namespace xios
 

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

@@ -9 +9 @@
   { /* Nothing to do */ }
 
-  void COutputPin::connectOutput(boost::shared_ptr<CInputPin> inputPin, size_t inputSlot)
+  void COutputPin::connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot)
   {
     if (!inputPin)
@@ -42 +42 @@
             "The packet cannot be null.");
 
-    std::vector<std::pair<boost::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;
+    std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;
     for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it)
       it->first->setInput(it->second, packet);
@@ -68 +68 @@
   bool COutputPin::mustAutoTrigger() const
   {
-    std::vector<std::pair<boost::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;
+    std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;
     for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it)
     {
@@ -80 +80 @@
   void COutputPin::setOutputTriggers()
   {
-    std::vector<std::pair<boost::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;
+    std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::iterator it, itEnd;
     for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it)
       it->first->setInputTrigger(it->second, this);
@@ -87 +87 @@
   bool COutputPin::isDataExpected(const CDate& date) const
   {
-    std::vector<std::pair<boost::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;
+    std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> >::const_iterator it, itEnd;
     for (it = outputs.begin(), itEnd = outputs.end(); it != itEnd; ++it)
     {

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

@@ -29 +29 @@
        * \param inputSlot the input slot number
        */
-      void connectOutput(boost::shared_ptr<CInputPin> inputPin, size_t inputSlot);
+      void connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot);
 
       /*!
@@ -93 +93 @@
 
       //!< The list of connected filters and the corresponding slot numbers
-      std::vector<std::pair<boost::shared_ptr<CInputPin>, size_t> > outputs;
+      std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> > outputs;
 
       //! Output buffer, store the packets until the output is triggered

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

@@ -13 +13 @@
   { /* Nothing to do */ }
 
-  std::pair<boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >
+  std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> >
   CSpatialTransformFilter::buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double missingValue)
   {
     if (!srcGrid || !destGrid)
-      ERROR("std::pair<boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >"
+      ERROR("std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> >"
             "buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid)",
             "Impossible to build the filter graph if either the source or the destination grid are null.");
 
-    boost::shared_ptr<CSpatialTransformFilter> firstFilter, lastFilter;
+    std::shared_ptr<CSpatialTransformFilter> firstFilter, lastFilter;
     // Note that this loop goes from the last transformation to the first transformation
     do
@@ -38 +38 @@
       for (it=algoList.begin();it!=algoList.end();++it)  if (it->second.first == TRANS_TEMPORAL_SPLITTING) isSpatialTemporal=true ;
 
-      boost::shared_ptr<CSpatialTransformFilter> filter ;
-      if( isSpatialTemporal) filter = boost::shared_ptr<CSpatialTransformFilter>(new CSpatialTemporalFilter(gc, engine, gridTransformation, defaultValue, inputCount));
-      else filter = boost::shared_ptr<CSpatialTransformFilter>(new CSpatialTransformFilter(gc, engine, defaultValue, inputCount));
+      std::shared_ptr<CSpatialTransformFilter> filter ;
+      if( isSpatialTemporal) filter = std::shared_ptr<CSpatialTransformFilter>(new CSpatialTemporalFilter(gc, engine, gridTransformation, defaultValue, inputCount));
+      else filter = std::shared_ptr<CSpatialTransformFilter>(new CSpatialTransformFilter(gc, engine, defaultValue, inputCount));
 
       
@@ -142 +142 @@
   }
 
-  //std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines;
-  std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *CSpatialTransformFilterEngine::engines_ptr = 0;
+  std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> > *CSpatialTransformFilterEngine::engines_ptr = 0;
 
   CSpatialTransformFilterEngine* CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation)
@@ -151 +150 @@
             "Impossible to get the requested engine, the grid transformation is invalid.");
     
-    if(engines_ptr == NULL) engines_ptr = new std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >;
-
-    //std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation);
-    std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines_ptr->find(gridTransformation);
-    //if (it == engines.end())
+    if(engines_ptr == NULL) engines_ptr = new std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> >;
+
+
+    std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines_ptr->find(gridTransformation);
     if (it == engines_ptr->end())
     {
-      boost::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation));
-      //it = engines.insert(std::make_pair(gridTransformation, engine)).first;
+      std::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation));
       it = engines_ptr->insert(std::make_pair(gridTransformation, engine)).first;
     }

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

@@ -36 +36 @@
        * \return the first and the last filters of the filter graph
        */
-      static std::pair<boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >
+      static std::pair<std::shared_ptr<CSpatialTransformFilter>, std::shared_ptr<CSpatialTransformFilter> >
       buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, bool hasMissingValue, double defaultValue);
 
@@ -141 +141 @@
 
       //! The allocated engines
-      //static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines;
-      static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr;
+
+      static std::map<CGridTransformation*, std::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr;
       #pragma omp threadprivate(engines_ptr)
   }; // class CSpatialTransformFilterEngine

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

@@ -22 +22 @@
                         this->samplingOffset.second, this->samplingOffset.timestep)
     , initDate(initDate)
-    , nextSamplingDate(initDate + (this->samplingOffset + initDate.getRelCalendar().getTimeStep()))
+    , nextSamplingDate(initDate + offsetMonth + ( offsetAllButMonth + initDate.getRelCalendar().getTimeStep()))
     , nbOperationDates(1)
     , nbSamplingDates(0)