Changeset 1095


Ignore:
Timestamp:
04/13/17 14:34:48 (5 years ago)
Author:
yushan
Message:

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

Location:
XIOS/dev/branch_yushan/src
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/src/attribute_map.hpp

    r1088 r1095  
    6969            /// Propriété statique /// 
    7070            static CAttributeMap * Current; 
    71             #pragma omp threadprivate (Current) 
     71            //#pragma omp threadprivate (Current) 
    7272 
    7373      };  // class CAttributeMap 
  • XIOS/dev/branch_yushan/src/buffer_client.hpp

    r1088 r1095  
    1616    public: 
    1717      static size_t maxRequestSize; 
    18       #pragma omp threadprivate(maxRequestSize) 
     18      //#pragma omp threadprivate(maxRequestSize) 
    1919 
    2020      CClientBuffer(MPI_Comm intercomm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents); 
  • XIOS/dev/branch_yushan/src/cxios.hpp

    r1088 r1095  
    6666       
    6767      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers 
    68      
     68 
    6969       
    7070       
  • XIOS/dev/branch_yushan/src/event_client.hpp

    r1088 r1095  
    1212    public: 
    1313      static const size_t headerSize; 
     14      //#pragma omp threadprivate(headerSize) 
    1415 
    1516      CEventClient(int classId, int typeId); 
  • XIOS/dev/branch_yushan/src/filter/spatial_transform_filter.cpp

    r1088 r1095  
    6464  } 
    6565 
    66   std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *CSpatialTransformFilterEngine::engines_ptr = 0; 
     66  std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines; 
    6767 
    6868  CSpatialTransformFilterEngine* CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation) 
     
    7171      ERROR("CSpatialTransformFilterEngine& CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation)", 
    7272            "Impossible to get the requested engine, the grid transformation is invalid."); 
    73      
    74     if(engines_ptr == NULL) engines_ptr = new std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >; 
    75  
    76     std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines_ptr->find(gridTransformation); 
    77     if (it == engines_ptr->end()) 
     73 
     74    std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation); 
     75    if (it == engines.end()) 
    7876    { 
    7977      boost::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation)); 
    80       it = engines_ptr->insert(std::make_pair(gridTransformation, engine)).first; 
     78      it = engines.insert(std::make_pair(gridTransformation, engine)).first; 
    8179    } 
    8280 
  • XIOS/dev/branch_yushan/src/filter/spatial_transform_filter.hpp

    r1088 r1095  
    103103      //! The allocated engines 
    104104      static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines; 
    105       static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr; 
    106       #pragma omp threadprivate(engines_ptr) 
     105      // #pragma omp threadprivate(engines) 
    107106       
    108107  }; // class CSpatialTransformFilterEngine 
  • XIOS/dev/branch_yushan/src/group_factory.cpp

    r1094 r1095  
    44{ 
    55   /// ////////////////////// Définitions ////////////////////// /// 
    6    StdString *CGroupFactory::CurrContext_ptr = new StdString; 
    76   StdString *CGroupFactory::CurrContext_ptr = new StdString; 
    87 
  • XIOS/dev/branch_yushan/src/indent.hpp

    r1088 r1095  
    1010    public: 
    1111    static int defaultIncSize; 
    12     #pragma omp threadprivate(defaultIncSize) 
     12    //#pragma omp threadprivate(defaultIncSize) 
    1313     
    1414    static int index ; 
    15     #pragma omp threadprivate(index) 
     15    //#pragma omp threadprivate(index) 
    1616     
    1717    int incSize ; 
  • XIOS/dev/branch_yushan/src/indent_xml.cpp

    r1088 r1095  
    1515   { 
    1616      static unsigned int LineNB = 1; 
    17       #pragma omp threadprivate(LineNB) 
     17      //#pragma omp threadprivate(LineNB) 
    1818       
    1919      if (CIndent::WithLine) out << LineNB++ << ". "; 
  • XIOS/dev/branch_yushan/src/indent_xml.hpp

    r1088 r1095  
    2222         /// Propriétés  statiques /// 
    2323         static unsigned int Indent; 
    24          #pragma omp threadprivate(Indent) 
     24         //#pragma omp threadprivate(Indent) 
    2525 
    2626         static StdString    Increm; 
    27          #pragma omp threadprivate(Increm) 
     27         //#pragma omp threadprivate(Increm) 
    2828 
    2929         static bool         WithLine; 
    30          #pragma omp threadprivate(WithLine) 
     30         //#pragma omp threadprivate(WithLine) 
    3131 
    3232   }; // class CIndent 
  • XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

    r1088 r1095  
    131131      
    132132     CContext* context = CContext::getCurrent(); 
    133      //printf("Check : CContext::getCurrent() = %p\n", CContext::getCurrent()); 
     133     printf("Check : CContext::getCurrent() = %p\n", CContext::getCurrent()); 
    134134     context->finalize(); 
    135135           
  • XIOS/dev/branch_yushan/src/io/netCdf_cf_constant.hpp

    r1088 r1095  
    2828  static const std::set<StdString> XIOS_CF_Longitude_units; 
    2929 
     30  // #pragma omp threadprivate(XIOS_CF_Latitude_units, XIOS_CF_Longitude_units) 
     31 
    3032private: 
    3133  CCFConvention(); 
  • XIOS/dev/branch_yushan/src/memtrack.cpp

    r1088 r1095  
    6868        private:    // static member variables 
    6969            static BlockHeader *ourFirstNode; 
    70             #pragma omp threadprivate(ourFirstNode) 
     70            //#pragma omp threadprivate(ourFirstNode) 
    7171     
    7272        private:    // member variables 
     
    245245            static const unsigned int SIGNATURE1 = 0xCAFEBABE; 
    246246            static const unsigned int SIGNATURE2 = 0xFACEFACE; 
     247 
     248            //#pragma omp threadprivate(SIGNATURE1, SIGNATURE2) 
    247249         
    248250        private:    // member variables 
  • XIOS/dev/branch_yushan/src/node/axis.cpp

    r1089 r1095  
    4444   { /* Ne rien faire de plus */ } 
    4545 
    46    //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 
    47    std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; 
    48    bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr); 
     46   std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 
     47   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_); 
    4948   bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 
    5049   { 
     
    10051004 
    10061005        nodeElementName = node.getElementName(); 
    1007         if(transformationMapList_ptr == NULL) transformationMapList_ptr = new std::map<StdString, ETranformationType>; 
    1008  
    1009         std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it; 
    1010         it = transformationMapList_ptr->find(nodeElementName); 
     1006        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 
     1007        it = transformationMapList_.find(nodeElementName); 
    10111008        if (ite != it) 
    10121009        { 
  • XIOS/dev/branch_yushan/src/node/axis.hpp

    r1088 r1095  
    166166       private: 
    167167         static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m); 
    168          //static std::map<StdString, ETranformationType> transformationMapList_; 
    169          static std::map<StdString, ETranformationType> *transformationMapList_ptr; 
    170          #pragma omp threadprivate(transformationMapList_ptr) 
     168         static std::map<StdString, ETranformationType> transformationMapList_; 
     169         // #pragma omp threadprivate(transformationMapList_) 
    171170 
    172171         static bool dummyTransformationMapList_; 
    173          #pragma omp threadprivate(dummyTransformationMapList_) 
     172         //#pragma omp threadprivate(dummyTransformationMapList_) 
    174173 
    175174         DECLARE_REF_FUNC(Axis,axis) 
  • XIOS/dev/branch_yushan/src/node/compute_connectivity_domain.hpp

    r1088 r1095  
    6060      static CTransformation<CDomain>* create(const StdString& id, xml::CXMLNode* node); 
    6161      static bool _dummyRegistered; 
    62       #pragma omp threadprivate(_dummyRegistered) 
     62      //#pragma omp threadprivate(_dummyRegistered) 
    6363       
    6464  }; // class CComputeConnectivityDomain 
  • XIOS/dev/branch_yushan/src/node/domain.cpp

    r1088 r1095  
    6565   } 
    6666 
    67    std::map<StdString, ETranformationType> * CDomain::transformationMapList_ptr = new std::map<StdString, ETranformationType>; 
    68    bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(*CDomain::transformationMapList_ptr); 
     67   std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>(); 
     68   bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_); 
    6969 
    7070   bool CDomain::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 
     
    21892189 
    21902190        nodeElementName = node.getElementName(); 
    2191         std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it; 
    2192         it = transformationMapList_ptr->find(nodeElementName); 
     2191        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 
     2192        it = transformationMapList_.find(nodeElementName); 
    21932193        if (ite != it) 
    21942194        { 
  • XIOS/dev/branch_yushan/src/node/domain.hpp

    r1088 r1095  
    211211       private: 
    212212         static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m); 
    213          static std::map<StdString, ETranformationType> *transformationMapList_ptr; 
     213         static std::map<StdString, ETranformationType> transformationMapList_; 
    214214         static bool _dummyTransformationMapList; 
    215          #pragma omp threadprivate(transformationMapList_ptr, _dummyTransformationMapList) 
     215         //#pragma omp threadprivate(_dummyTransformationMapList) 
    216216 
    217217         DECLARE_REF_FUNC(Domain,domain) 
  • XIOS/dev/branch_yushan/src/node/expand_domain.hpp

    r1088 r1095  
    6060      static CTransformation<CDomain>* create(const StdString& id, xml::CXMLNode* node); 
    6161      static bool _dummyRegistered; 
    62       #pragma omp threadprivate(_dummyRegistered) 
     62      //#pragma omp threadprivate(_dummyRegistered) 
    6363       
    6464  }; // class CExpandDomain 
  • XIOS/dev/branch_yushan/src/node/extract_axis_to_scalar.hpp

    r1088 r1095  
    6060      static CTransformation<CScalar>* create(const StdString& id, xml::CXMLNode* node); 
    6161      static bool _dummyRegistered; 
    62       #pragma omp threadprivate(_dummyRegistered) 
     62      //#pragma omp threadprivate(_dummyRegistered) 
    6363  }; // class CExtractAxisToScalar 
    6464 
Note: See TracChangeset for help on using the changeset viewer.