Changeset 1109 for XIOS/dev/branch_yushan/src/node/axis.cpp
- Timestamp:
- 05/02/17 16:20:47 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan/src/node/axis.cpp
r1103 r1109 44 44 { /* Ne rien faire de plus */ } 45 45 46 std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 47 48 std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>(); 49 50 bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_); 51 //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_); 48 49 std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; //new std::map<StdString, ETranformationType>(); 50 //bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_ptr); 52 51 53 52 bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) … … 58 57 m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS; 59 58 m["extract_domain"] = TRANS_EXTRACT_DOMAIN_TO_AXIS; 60 61 // m.insert(m.end(), make_pair("zoom_axis", TRANS_ZOOM_AXIS)); printf("zoom_axis insert\n"); 62 // m.insert(m.end(), make_pair("interpolate_axis", TRANS_INTERPOLATE_AXIS)); printf("interpolate_axis insert\n"); 63 // m.insert(m.end(), make_pair("inverse_axis", TRANS_INVERSE_AXIS)); printf("inverse_axis insert\n"); 64 // m.insert(m.end(), make_pair("reduce_domain", TRANS_REDUCE_DOMAIN_TO_AXIS)); printf("reduce_domain insert\n"); 65 // m.insert(m.end(), make_pair("extract_domain", TRANS_EXTRACT_DOMAIN_TO_AXIS)); printf("extract_domain insert\n"); 66 } 59 } 60 61 62 bool CAxis::initializeTransformationMap() 63 { 64 if(CAxis::transformationMapList_ptr == 0) CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>(); 65 (*CAxis::transformationMapList_ptr)["zoom_axis"] = TRANS_ZOOM_AXIS; 66 (*CAxis::transformationMapList_ptr)["interpolate_axis"] = TRANS_INTERPOLATE_AXIS; 67 (*CAxis::transformationMapList_ptr)["inverse_axis"] = TRANS_INVERSE_AXIS; 68 (*CAxis::transformationMapList_ptr)["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS; 69 (*CAxis::transformationMapList_ptr)["extract_domain"] = TRANS_EXTRACT_DOMAIN_TO_AXIS; 70 } 71 67 72 68 73 ///--------------------------------------------------------------- … … 1015 1020 1016 1021 nodeElementName = node.getElementName(); 1017 std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 1018 it = transformationMapList_.find(nodeElementName); 1022 1023 if(transformationMapList_ptr == 0) initializeTransformationMap(); 1024 //transformationMapList_ptr = new std::map<StdString, ETranformationType>(); 1025 1026 std::map<StdString, ETranformationType>::const_iterator ite = (*CAxis::transformationMapList_ptr).end(), it; 1027 it = (*CAxis::transformationMapList_ptr).find(nodeElementName); 1019 1028 if (ite != it) 1020 1029 { … … 1038 1047 1039 1048 } // namespace xios 1049
Note: See TracChangeset
for help on using the changeset viewer.