Ignore:
Timestamp:
06/18/18 20:32:55 (6 years ago)
Author:
yushan
Message:

branch_openmp merged with trunk r1544

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/src/node/scalar.cpp

    r1460 r1545  
    2727   { /* Ne rien faire de plus */ } 
    2828 
    29    //std::map<StdString, ETranformationType> CScalar::transformationMapList_ = std::map<StdString, ETranformationType>(); 
     29 
    3030   std::map<StdString, ETranformationType> *CScalar::transformationMapList_ptr = 0; 
    31    //bool CScalar::dummyTransformationMapList_ = CScalar::initializeTransformationMap(CScalar::transformationMapList_); 
     31 
    3232   bool CScalar::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 
    3333   { 
     
    175175 
    176176        nodeElementName = node.getElementName(); 
    177         //std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 
    178177        if(CScalar::transformationMapList_ptr == 0) initializeTransformationMap(); 
    179178        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it; 
    180         //it = transformationMapList_.find(nodeElementName); 
    181179        it = transformationMapList_ptr->find(nodeElementName); 
    182180        if (ite != it) 
Note: See TracChangeset for help on using the changeset viewer.