Changeset 1089


Ignore:
Timestamp:
04/12/17 16:02:29 (5 years ago)
Author:
yushan
Message:

save

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

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/src/group_factory.cpp

    r1088 r1089  
    99   void CGroupFactory::SetCurrentContextId(const StdString & context) 
    1010   {  
    11       CGroupFactory::CurrContext = context; 
     11      //CGroupFactory::CurrContext = context; 
    1212      *CGroupFactory::CurrContext_ptr = context; 
    1313   } 
  • XIOS/dev/branch_yushan/src/group_factory.hpp

    r1088 r1089  
    6969 
    7070         /// Propriétés statiques /// 
    71          static StdString CurrContext; 
     71         //static StdString CurrContext; 
    7272         static StdString *CurrContext_ptr; 
    7373         #pragma omp threadprivate(CurrContext_ptr) 
  • XIOS/dev/branch_yushan/src/node/axis.cpp

    r1088 r1089  
    4545 
    4646   //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 
    47    std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>; 
     47   std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; 
    4848   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr); 
    4949   bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 
     
    10051005 
    10061006        nodeElementName = node.getElementName(); 
    1007         std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it; 
     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; 
    10081010        it = transformationMapList_ptr->find(nodeElementName); 
    10091011        if (ite != it) 
  • XIOS/dev/branch_yushan/src/object_factory.cpp

    r1088 r1089  
    55   /// ////////////////////// Définitions ////////////////////// /// 
    66 
    7    StdString CObjectFactory::CurrContext(""); 
     7   //StdString CObjectFactory::CurrContext(""); 
    88         StdString *CObjectFactory::CurrContext_ptr = new StdString; 
    99 
    1010   void CObjectFactory::SetCurrentContextId(const StdString & context) 
    1111   {  
    12          CObjectFactory::CurrContext = context;  
     12         //CObjectFactory::CurrContext = context;  
    1313         *CObjectFactory::CurrContext_ptr = context;  
    1414   } 
  • XIOS/dev/branch_yushan/src/object_factory.hpp

    r1088 r1089  
    5959 
    6060         /// Propriétés statiques /// 
    61          static StdString CurrContext; 
     61         //static StdString CurrContext; 
    6262         static StdString *CurrContext_ptr; 
    6363         #pragma omp threadprivate(CurrContext_ptr) 
Note: See TracChangeset for help on using the changeset viewer.