Changeset 1334 for XIOS

Timestamp:

11/20/17 09:49:26 (6 years ago)

Author:

yushan

Message:

omp_dev

Location:

XIOS/dev/branch_openmp

Files:

• bld.cfg (modified) (1 diff)
• extern/remap/src/gridRemap.cpp (modified) (1 diff)
• extern/remap/src/timerRemap.hpp (modified) (1 diff)
• inputs/REMAP/iodef.xml (modified) (1 diff)
• src/array_new.hpp (modified) (1 diff)
• src/calendar.cpp (modified) (1 diff)
• src/client.cpp (modified) (1 diff)
• src/data_output.hpp (modified) (1 diff)
• src/filter/spatial_transform_filter.hpp (modified) (1 diff)
• src/group_factory.cpp (modified) (1 diff)
• src/group_factory.hpp (modified) (1 diff)
• src/group_factory_decl.cpp (modified) (1 diff)
• src/interface/c/icdata.cpp (modified) (1 diff)
• src/io/netCdfInterface.cpp (modified) (1 diff)
• src/io/netCdfInterface_impl.hpp (modified) (1 diff)
• src/node/axis.cpp (modified) (4 diffs)
• src/node/context.cpp (modified) (2 diffs)
• src/node/context.hpp (modified) (1 diff)
• src/node/domain.cpp (modified) (2 diffs)
• src/node/file.cpp (modified) (3 diffs)
• src/node/grid.cpp (modified) (2 diffs)
• src/node/transformation.hpp (modified) (2 diffs)
• src/object_factory.cpp (modified) (1 diff)
• src/object_factory.hpp (modified) (1 diff)
• src/object_factory_decl.cpp (modified) (1 diff)
• src/object_factory_impl.hpp (modified) (10 diffs)
• src/object_template.hpp (modified) (1 diff)
• src/object_template_impl.hpp (modified) (4 diffs)
• src/parse_expr/yacc_parser.cpp (modified) (2 diffs)
• src/parse_expr/yacc_parser.yacc (modified) (2 diffs)
• src/test/test_remap_omp.f90 (modified) (1 diff)
• src/transformation/axis_algorithm_zoom.cpp (modified) (1 diff)
• src/transformation/domain_algorithm_interpolate.cpp (modified) (2 diffs)
• src/transformation/grid_transformation_factory_impl.hpp (modified) (1 diff)
• src/transformation/scalar_algorithm_reduce_axis.cpp (modified) (1 diff)
• src/type/type.hpp (modified) (1 diff)
• src/xml_node.hpp (modified) (1 diff)

XIOS/dev/branch_openmp/bld.cfg

@@ -39 +39 @@
 #bld::target test_unstruct_complete.exe 
 #bld::target test_omp.exe 
-#bld::target test_complete_omp.exe 
+bld::target test_complete_omp.exe 
 #bld::target test_remap.exe 
 bld::target test_remap_ref.exe 

XIOS/dev/branch_openmp/extern/remap/src/gridRemap.cpp

@@ -11 +11 @@
 
 CRemapGrid srcGrid;
+
 CRemapGrid tgtGrid;
 

XIOS/dev/branch_openmp/extern/remap/src/timerRemap.hpp

@@ -28 +28 @@
     //static map<string,CTimer*> allTimer;
     static map<string,CTimer*> *allTimer_ptr;
+    #pragma omp threadprivate(allTimer_ptr)
     static double getTime(void);
     static CTimer& get(string name);

XIOS/dev/branch_openmp/inputs/REMAP/iodef.xml

@@ -39 +39 @@
           <field field_ref="tmp_field_0" name="field_regular_0" enabled=".TRUE."/>
           <field field_ref="dst_field_regular" name="field_regular" enabled=".TRUE."/>
-          <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".FALSE." />
-          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".FALSE." />
+          <field field_ref="dst_field_regular_pole_0" name="field_regular_pole_0" enabled=".TRUE." />
+          <field field_ref="dst_field_regular_pole_1" name="field_regular_pole_1" enabled=".TRUE." />
        </file>
        <file id="output_dst_curvilinear" name="output_dst_curvilinear" enabled=".TRUE." >

XIOS/dev/branch_openmp/src/array_new.hpp

@@ -554 +554 @@
         TinyVector<int,N_rank> vect;
         size_t ne;
-        
+
         ret =  buffer.get(numDim);
         ret &= buffer.get(vect.data(), N_rank);

XIOS/dev/branch_openmp/src/calendar.cpp

@@ -117 +117 @@
       const CDate& CCalendar::update(int step)
       {
-        info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        //info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
         return (this->currentDate = this->getInitDate() + step * this->timestep);
       }

XIOS/dev/branch_openmp/src/client.cpp

@@ -186 +186 @@
 
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
-        info(10)<<"Register new Context : "<<id<<endl ;
+        #pragma omp critical (std_output)
+        {
+          //info(10)<<"Register new Context : "<<id<<endl ;
+        }
 
         MPI_Comm inter ;

XIOS/dev/branch_openmp/src/data_output.hpp

@@ -59 +59 @@
             virtual void writeTimeDimension_(void)           = 0;
             virtual void writeTimeAxis_ (CField*     field,
-                                         const shared_ptr<CCalendar> cal) = 0;
+                                         const boost::shared_ptr<CCalendar> cal) = 0;
 
             /// Propriétés protégées ///

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

@@ -105 +105 @@
       //static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines;
       static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr;
-      #pragma om threadprivate(engines_ptr)
+      #pragma omp threadprivate(engines_ptr)
   }; // class CSpatialTransformFilterEngine
 } // namespace xios

XIOS/dev/branch_openmp/src/group_factory.cpp

@@ -4 +4 @@
 {
    /// ////////////////////// Définitions ////////////////////// ///
-   StdString CGroupFactory::CurrContext("");
+   StdString *CGroupFactory::CurrContext_ptr = 0;
 
    void CGroupFactory::SetCurrentContextId(const StdString & context)
-   { 
-      CGroupFactory::CurrContext = context;
+   {  
+      if(CGroupFactory::CurrContext_ptr == 0 ) CGroupFactory::CurrContext_ptr = new StdString; 
+      CGroupFactory::CurrContext_ptr->assign(context);
    }
 
    StdString & CGroupFactory::GetCurrentContextId(void)
    { 
-      return (CGroupFactory::CurrContext);
+      return (*CGroupFactory::CurrContext_ptr);
    }
 

XIOS/dev/branch_openmp/src/group_factory.hpp

@@ -69 +69 @@
 
          /// Propriétés statiques ///
-         static StdString CurrContext;
-//         #pragma omp threadprivate(CurrContext)
+         static StdString *CurrContext_ptr;
+         #pragma omp threadprivate(CurrContext_ptr)
 
    }; // class CGroupFactory

XIOS/dev/branch_openmp/src/group_factory_decl.cpp

@@ -5 +5 @@
 {
 # define  macro(U) \
-  template void CGroupFactory::AddGroup<U>(shared_ptr<U> pgroup,shared_ptr<U> cgroup); \
-  template void CGroupFactory::AddChild<U>(shared_ptr<U> group, shared_ptr<U::RelChild> child); \
-  template shared_ptr<U>  CGroupFactory::GetGroup<U>(shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(shared_ptr<U> group, const StdString & id); \
-  template int CGroupFactory::GetGroupNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetGroupIdNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetChildNum<U>(shared_ptr<U> group); \
+  template void CGroupFactory::AddGroup<U>(boost::shared_ptr<U> pgroup,boost::shared_ptr<U> cgroup); \
+  template void CGroupFactory::AddChild<U>(boost::shared_ptr<U> group, boost::shared_ptr<U::RelChild> child); \
+  template boost::shared_ptr<U>  CGroupFactory::GetGroup<U>(boost::shared_ptr<U> group, const StdString & id); \
+  template boost::shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(boost::shared_ptr<U> group, const StdString & id); \
+  template int CGroupFactory::GetGroupNum<U>(boost::shared_ptr<U> group); \
+  template int CGroupFactory::GetGroupIdNum<U>(boost::shared_ptr<U> group); \
+  template int CGroupFactory::GetChildNum<U>(boost::shared_ptr<U> group); \
   template int CGroupFactory::GetChildIdNum<U>(boost::shared_ptr<U> group); \
-  template bool CGroupFactory::HasGroup<U>(shared_ptr<U> group, const StdString & id); \
+  template bool CGroupFactory::HasGroup<U>(boost::shared_ptr<U> group, const StdString & id); \
   template bool CGroupFactory::HasChild<U>(boost::shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U> CGroupFactory::CreateGroup<U>(shared_ptr<U> group, const StdString & id ); \
-  template shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(shared_ptr<U> group, const StdString & id);
+  template boost::shared_ptr<U> CGroupFactory::CreateGroup<U>(boost::shared_ptr<U> group, const StdString & id ); \
+  template boost::shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(boost::shared_ptr<U> group, const StdString & id);
 
   macro(CFieldGroup)

XIOS/dev/branch_openmp/src/interface/c/icdata.cpp

@@ -56 +56 @@
       ep_lib::MPI_Comm return_comm;
       
-      ep_lib::fc_comm_map.clear();
+      //ep_lib::fc_comm_map.clear();
 
       if (!cstr2string(client_id, len_client_id, str)) return;

XIOS/dev/branch_openmp/src/io/netCdfInterface.cpp

@@ -102 +102 @@
 int CNetCdfInterface::openPar(const StdString& fileName, int oMode, MPI_Comm comm, MPI_Info info, int& ncId)
 {
-  //int status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
-  int status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
+  int status;
+  #pragma omp critical (_netcdf)
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
+  
   if (NC_NOERR != status)
   {

XIOS/dev/branch_openmp/src/io/netCdfInterface_impl.hpp

@@ -85 +85 @@
   int CNetCdfInterface::getVaraType(int ncid, int varId, const StdSize* start, const StdSize* count, T* data)
   {
-    int status = ncGetVaraType(ncid, varId, start, count, data);
+    int status;
+    #pragma omp critical (_netcdf)
+    status = ncGetVaraType(ncid, varId, start, count, data);
     if (NC_NOERR != status)
     {

XIOS/dev/branch_openmp/src/node/axis.cpp

@@ -44 +44 @@
    { /* Ne rien faire de plus */ }
 
-   //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>();
    std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0;
-   //bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_);
-   
+
    bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
    {
@@ -499 +497 @@
         globalAxisZoom[nZoomCount] = globalZoomIndex;
         ++nZoomCount;
-      } 
+      }
     }
 
@@ -977 +975 @@
         msg << ni << begin << end;
         msg << global_zoom_begin.getValue() << global_zoom_n.getValue();
-        msg << isCompressible_;        
+        msg << isCompressible_;
         msg << zoomIndex;
         if (zoomIndex)
@@ -1156 +1154 @@
 
         nodeElementName = node.getElementName();
-        //std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
+
         if(transformationMapList_ptr == 0) initializeTransformationMap();
-        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it;
-        //it = transformationMapList_.find(nodeElementName);
-        it = transformationMapList_ptr->find(nodeElementName);
+        std::map<StdString, ETranformationType>::const_iterator ite = (*CAxis::transformationMapList_ptr).end(), it;
+        it = (*CAxis::transformationMapList_ptr).find(nodeElementName);
         if (ite != it)
         {

XIOS/dev/branch_openmp/src/node/context.cpp

@@ -23 +23 @@
 namespace xios {
 
-  shared_ptr<CContextGroup> * CContext::root_ptr = 0;
+  boost::shared_ptr<CContextGroup> * CContext::root_ptr = 0;
 
    /// ////////////////////// Dfinitions ////////////////////// ///
@@ -59 +59 @@
    CContextGroup* CContext::getRoot(void)
    {
-      //std::cout<<omp_get_thread_num()<<" get root name = "<<xml::CXMLNode::GetRootName()<<std::endl;
-      if (root_ptr==0) root_ptr = new shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
+      if(root_ptr == 0) root_ptr = new boost::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
       return root_ptr->get();
    }

XIOS/dev/branch_openmp/src/node/context.hpp

@@ -206 +206 @@
 
          // Context root
-         static shared_ptr<CContextGroup> *root_ptr;
+         static boost::shared_ptr<CContextGroup> *root_ptr;
          #pragma omp threadprivate(root_ptr)
 

XIOS/dev/branch_openmp/src/node/domain.cpp

@@ -65 +65 @@
    }
 
-   //std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>();
+
    std::map<StdString, ETranformationType> *CDomain::transformationMapList_ptr = 0;
-   //bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_);
 
    bool CDomain::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
@@ -2363 +2362 @@
         nodeElementName = node.getElementName();
         if(transformationMapList_ptr == 0) initializeTransformationMap();
-        //std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
+
         std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it;
-        //it = transformationMapList_.find(nodeElementName);
+
         it = transformationMapList_ptr->find(nodeElementName);
         if (ite != it)

XIOS/dev/branch_openmp/src/node/file.cpp

@@ -483 +483 @@
          if (isOpen) data_out->closeFile();
 
-        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
+        data_out = boost::shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
                                                               fileComm, multifile, isCollective, time_counter_name));
         isOpen = true;
@@ -598 +598 @@
 
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
       isOpen = true;
     }
@@ -646 +646 @@
 
         // Read necessary value from file
-        this->data_in->readFieldAttributesValues(enabledFields[idx]);
-
+        #pragma omp critical (_func)
+        {
+          this->data_in->readFieldAttributesValues(enabledFields[idx]);
+        }
         // Fill attributes for base reference
         enabledFields[idx]->solveGridDomainAxisBaseRef();

XIOS/dev/branch_openmp/src/node/grid.cpp

@@ -1114 +1114 @@
           outLocalIndexToServer(idx) = itIndex->second;
         }
-        
+
         const std::list<int>& ranks = client->getRanksServerLeader();
         for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
@@ -1750 +1750 @@
         pDom->solveRefInheritance(apply);
         pDom->solveInheritanceTransformation();
-        //cout<<"pDom check"<<endl;
       }
     }

XIOS/dev/branch_openmp/src/node/transformation.hpp

@@ -35 +35 @@
       typedef std::map<ETranformationType, CreateTransformationCallBack> CallBackMap;
       static CallBackMap* transformationCreationCallBacks_;
-      #pragma omp threadprivate(transformationCreationCallBacks_)
+      //#pragma omp threadprivate(transformationCreationCallBacks_)
 
       static bool registerTransformation(ETranformationType transType, CreateTransformationCallBack createFn);
@@ -66 +66 @@
     if (0 == transformationCreationCallBacks_)
       transformationCreationCallBacks_ = new CallBackMap();
-
     return (*transformationCreationCallBacks_).insert(make_pair(transType, createFn)).second;
   }

XIOS/dev/branch_openmp/src/object_factory.cpp

@@ -5 +5 @@
    /// ////////////////////// Définitions ////////////////////// ///
 
-   StdString CObjectFactory::CurrContext("");
+   StdString *CObjectFactory::CurrContext_ptr = 0;
 
    void CObjectFactory::SetCurrentContextId(const StdString & context)
-   { CObjectFactory::CurrContext = context; }
+   {
+     if(CObjectFactory::CurrContext_ptr == 0 ) CObjectFactory::CurrContext_ptr = new StdString;
+     CObjectFactory::CurrContext_ptr->assign(context); 
+   }
 
    StdString & CObjectFactory::GetCurrentContextId(void)
-   { return (CObjectFactory::CurrContext); }
+   { 
+     return (*CObjectFactory::CurrContext_ptr); 
+   }
 
 } // namespace xios

XIOS/dev/branch_openmp/src/object_factory.hpp

@@ -59 +59 @@
 
       /// Propriétés statiques ///
-      static StdString CurrContext;
-//      #pragma omp threadprivate(CurrContext)
+      static StdString *CurrContext_ptr;
+      #pragma omp threadprivate(CurrContext_ptr)
 
   }; // class CObjectFactory

XIOS/dev/branch_openmp/src/object_factory_decl.cpp

@@ -5 +5 @@
 {
 #define macro(U) \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \
   template int CObjectFactory::GetObjectNum<U>(void); \
   template int CObjectFactory::GetObjectIdNum<U>(void); \
-  template const std::vector<shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
+  template const std::vector<boost::shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
   template bool CObjectFactory::HasObject<U>(const StdString& id); \
   template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString& id); \

XIOS/dev/branch_openmp/src/object_factory_impl.hpp

@@ -10 +10 @@
        int CObjectFactory::GetObjectNum(void)
    {
-      if (CurrContext.size() == 0)
+      if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObjectNum(void)",
                << "please define current context id !");
       //return (U::AllVectObj[CObjectFactory::CurrContext].size());
       if(U::AllVectObj_ptr == NULL) return 0;
-      return (*U::AllVectObj_ptr)[CObjectFactory::CurrContext].size();
+      return (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
    }
 
@@ -21 +21 @@
       int CObjectFactory::GetObjectIdNum(void)
    {
-      if (CurrContext.size() == 0)
+      if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObjectIdNum(void)",
                << "please define current context id !");
       //return (U::AllMapObj[CObjectFactory::CurrContext].size());
       if(U::AllMapObj_ptr == NULL) return 0;
-      return (*U::AllMapObj_ptr)[CObjectFactory::CurrContext].size();
+      return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
    }
 
@@ -32 +32 @@
       bool CObjectFactory::HasObject(const StdString & id)
    {
-      if (CurrContext.size() == 0)
+      if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::HasObject(const StdString & id)",
                << "[ id = " << id << " ] please define current context id !");
@@ -38 +38 @@
       //        U::AllMapObj[CObjectFactory::CurrContext].end());
       if(U::AllMapObj_ptr  == NULL)  return false;
-      return ((*U::AllMapObj_ptr)[CObjectFactory::CurrContext].find(id) !=
-              (*U::AllMapObj_ptr)[CObjectFactory::CurrContext].end());
+      return ((*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].find(id) !=
+              (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].end());
 
    }
@@ -59 +59 @@
    {
       if(U::AllVectObj_ptr == NULL) return (boost::shared_ptr<U>());
-      if (CurrContext.size() == 0)
+      if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObject(const U * const object)",
                << "please define current context id !");
       //std::vector<boost::shared_ptr<U> > & vect = U::AllVectObj[CObjectFactory::CurrContext];
-      std::vector<boost::shared_ptr<U> > & vect = (*U::AllVectObj_ptr)[CObjectFactory::CurrContext];
+      std::vector<boost::shared_ptr<U> > & vect = (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr];
 
       typename std::vector<boost::shared_ptr<U> >::const_iterator
@@ -85 +85 @@
    {
       if(U::AllMapObj_ptr  == NULL) return (boost::shared_ptr<U>());
-      if (CurrContext.size() == 0)
+      if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObject(const StdString & id)",
                << "[ id = " << id << " ] please define current context id !");
@@ -100 +100 @@
 
       //return (U::AllMapObj[CObjectFactory::CurrContext][id]);
-      return (*U::AllMapObj_ptr)[CObjectFactory::CurrContext][id];
+      return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr][id];
    }
 
@@ -129 +129 @@
       if(U::AllMapObj_ptr  == NULL) U::AllMapObj_ptr  = new xios_map<StdString, xios_map<StdString, boost::shared_ptr<U> > >;
 
-      if (CurrContext.empty())
+      if (CurrContext_ptr->empty())
          ERROR("CObjectFactory::CreateObject(const StdString& id)",
                << "[ id = " << id << " ] please define current context id !");
@@ -144 +144 @@
          //U::AllMapObj[CObjectFactory::CurrContext].insert(std::make_pair(value->getId(), value));
 
-         (*U::AllVectObj_ptr)[CObjectFactory::CurrContext].insert((*U::AllVectObj_ptr)[CObjectFactory::CurrContext].end(), value);
-         (*U::AllMapObj_ptr) [CObjectFactory::CurrContext].insert(std::make_pair(value->getId(), value));
+         (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].insert((*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].end(), value);
+         (*U::AllMapObj_ptr) [*CObjectFactory::CurrContext_ptr].insert(std::make_pair(value->getId(), value));
          //cout<<"CObjectFactory::CreateObject(const StdString& id) [ id = " << id << " ]" <<endl;
 
@@ -172 +172 @@
       StdOStringStream oss;
       if(U::GenId_ptr == NULL) U::GenId_ptr = new xios_map< StdString, long int >;
-      oss << GetUIdBase<U>() << (*U::GenId_ptr)[CObjectFactory::CurrContext]++;
+      oss << GetUIdBase<U>() << (*U::GenId_ptr)[*CObjectFactory::CurrContext_ptr]++;
       return oss.str();
    }

XIOS/dev/branch_openmp/src/object_template.hpp

@@ -77 +77 @@
       static T* get(const string& contextId, const string& id) ;
       T* get(void) ;
-      shared_ptr<T> getShared(void) ;
-      static shared_ptr<T> getShared(const T* ptr) ;
+      boost::shared_ptr<T> getShared(void) ;
+      static boost::shared_ptr<T> getShared(const T* ptr) ;
+
 
       static T* create(const string& id=string("")) ;

XIOS/dev/branch_openmp/src/object_template_impl.hpp

@@ -325 +325 @@
 
    template <typename T>
-   shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
+   boost::shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
    {
      return CObjectFactory::GetObject<T>(ptr);
@@ -331 +331 @@
 
    template <typename T>
-   shared_ptr<T> CObjectTemplate<T>::getShared(void)
+   boost::shared_ptr<T> CObjectTemplate<T>::getShared(void)
    {
      return CObjectFactory::GetObject<T>((T*)this);
@@ -339 +339 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
-     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
+     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
      vector<T*> vect;
 
-     typename vector<shared_ptr<T> >::const_iterator it;
+     typename vector<boost::shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;
@@ -350 +350 @@
    const vector<T*> CObjectTemplate<T>::getAll(const string & id)
    {
-     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
+     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
      vector<T*> vect;
 
-     typename vector<shared_ptr<T> >::const_iterator it;
+     typename vector<boost::shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;

XIOS/dev/branch_openmp/src/parse_expr/yacc_parser.cpp

@@ -80 +80 @@
 }
 
-  IFilterExprNode* parsed;
-  std::string globalInputText;
-  size_t globalReadOffset = 0;
-
+  static IFilterExprNode* parsed;
+  static std::string globalInputText;
+  static std::string *globalInputText_ptr = 0;
+  static size_t globalReadOffset = 0;
+  #pragma omp threadprivate(parsed, globalInputText_ptr, globalReadOffset)
+  
   int readInputForLexer(char* buffer, size_t* numBytesRead, size_t maxBytesToRead)
   {
+    if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
     size_t numBytesToRead = maxBytesToRead;
-    size_t bytesRemaining = globalInputText.length()-globalReadOffset;
+    size_t bytesRemaining = (*globalInputText_ptr).length()-globalReadOffset;
     size_t i;
     if (numBytesToRead > bytesRemaining) numBytesToRead = bytesRemaining;
-    for (i = 0; i < numBytesToRead; i++) buffer[i] = globalInputText.c_str()[globalReadOffset + i];
+    for (i = 0; i < numBytesToRead; i++) buffer[i] = (*globalInputText_ptr).c_str()[globalReadOffset + i];
     *numBytesRead = numBytesToRead;
     globalReadOffset += numBytesToRead;
@@ -2002 +2005 @@
   IFilterExprNode* parseExpr(const string& strExpr)
   {
-    globalInputText = strExpr;
-    globalReadOffset = 0;
-    yyparse();
+    #pragma omp critical (_parser)
+    {
+      if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
+      (*globalInputText_ptr).assign (strExpr);
+      globalReadOffset = 0;
+      yyparse();
+    }
     return parsed;
   }

XIOS/dev/branch_openmp/src/parse_expr/yacc_parser.yacc

@@ -15 +15 @@
 }
 
-  IFilterExprNode* parsed;
-  std::string globalInputText;
-  size_t globalReadOffset = 0;
+  static IFilterExprNode* parsed;
+  static std::string globalInputText;
+  static std::string *globalInputText_ptr = 0;
+  static size_t globalReadOffset = 0;
+  #pragma omp threadprivate(parsed, globalInputText_ptr, globalReadOffset)
 
   int readInputForLexer(char* buffer, size_t* numBytesRead, size_t maxBytesToRead)
   {
+    if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
     size_t numBytesToRead = maxBytesToRead;
-    size_t bytesRemaining = globalInputText.length()-globalReadOffset;
+    size_t bytesRemaining = (*globalInputText_ptr).length()-globalReadOffset;
     size_t i;
     if (numBytesToRead > bytesRemaining) numBytesToRead = bytesRemaining;
-    for (i = 0; i < numBytesToRead; i++) buffer[i] = globalInputText.c_str()[globalReadOffset + i];
+    for (i = 0; i < numBytesToRead; i++) buffer[i] = (*globalInputText_ptr).c_str()[globalReadOffset + i];
     *numBytesRead = numBytesToRead;
     globalReadOffset += numBytesToRead;
@@ -145 +148 @@
   IFilterExprNode* parseExpr(const string& strExpr)
   {
-    globalInputText = strExpr;
-    globalReadOffset = 0;
-    yyparse();
+    #pragma omp critical (_parser)
+    {
+      if(globalInputText_ptr == 0) globalInputText_ptr = new std::string;
+      (*globalInputText_ptr).assign (strExpr);
+      globalReadOffset = 0;
+      yyparse();
+    }
     return parsed;
   }

XIOS/dev/branch_openmp/src/test/test_remap_omp.f90

@@ -53 +53 @@
   if(rank < size-2) then
  
-  !$omp parallel default(private) 
+  !$omp parallel default(firstprivate) 
 
 !!! XIOS Initialization (get the local communicator)

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_zoom.cpp

@@ -44 +44 @@
   zoomBegin_ = zoomAxis->begin.getValue();
   zoomSize_  = zoomAxis->n.getValue();
-  zoomEnd_   = zoomBegin_ + zoomSize_ - 1;  
+  zoomEnd_   = zoomBegin_ + zoomSize_ - 1;
 
   if (zoomSize_ > axisSource->n_glo.getValue())

XIOS/dev/branch_openmp/src/transformation/domain_algorithm_interpolate.cpp

@@ -114 +114 @@
   nVertexSrc = nVertexDest = constNVertex;
 
-
-
   // First of all, try to retrieve the boundary values of domain source and domain destination
   int localDomainSrcSize = domainSrc_->i_index.numElements();
@@ -283 +281 @@
     globalSrc[idx] = globalIndex;
   }
-
 
   for (int idx = 0; idx < nDstLocal; ++idx)

XIOS/dev/branch_openmp/src/transformation/grid_transformation_factory_impl.hpp

@@ -57 +57 @@
   typedef std::map<ETranformationType, CreateTransformationCallBack> CallBackMap;
   static CallBackMap* transformationCreationCallBacks_;
+  #pragma omp threadprivate(transformationCreationCallBacks_)
   static bool registerTransformation(ETranformationType transType, CreateTransformationCallBack createFn);
   static bool unregisterTransformation(ETranformationType transType);

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
-
 #include "reduction.hpp"
 

XIOS/dev/branch_openmp/src/type/type.hpp

@@ -94 +94 @@
     const CType_ref& operator = (CType<T>& val) const ;
     const CType_ref& operator = (const CType_ref& val) const;
-    operator T&() const;    
+    operator T&() const;
 
     inline virtual CBaseType* clone(void) const   { return _clone(); }

XIOS/dev/branch_openmp/src/xml_node.hpp

@@ -49 +49 @@
 
         static StdString RootName;
-        #pragma omp threadprivate(RootName)
+        //#pragma omp threadprivate(RootName)
 
     }; //class CXMLParser