Changeset 1095 for XIOS/dev/branch_yushan/src/filter

Timestamp:

04/13/17 14:34:48 (7 years ago)

Author:

yushan

Message:

modif for Curie, CurrContext?->CurrContext_ptr in object_factory and group_factory

Location:

XIOS/dev/branch_yushan/src/filter

Files:

• spatial_transform_filter.cpp (modified) (2 diffs)
• spatial_transform_filter.hpp (modified) (1 diff)

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

@@ -64 +64 @@
   }
 
-  std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *CSpatialTransformFilterEngine::engines_ptr = 0;
+  std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines;
 
   CSpatialTransformFilterEngine* CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation)
@@ -71 +71 @@
       ERROR("CSpatialTransformFilterEngine& CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation)",
             "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_ptr->find(gridTransformation);
-    if (it == engines_ptr->end())
+
+    std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation);
+    if (it == engines.end())
     {
       boost::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation));
-      it = engines_ptr->insert(std::make_pair(gridTransformation, engine)).first;
+      it = engines.insert(std::make_pair(gridTransformation, engine)).first;
     }
 

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

@@ -103 +103 @@
       //! The allocated engines
       static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines;
-      static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr;
-      #pragma omp threadprivate(engines_ptr)
+      // #pragma omp threadprivate(engines)
       
   }; // class CSpatialTransformFilterEngine