Changeset 1134 for XIOS/dev/branch_yushan_merged/src/node/scalar.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/node/scalar.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/src/node/scalar.cpp

@@ -27 +27 @@
    { /* Ne rien faire de plus */ }
 
-   std::map<StdString, ETranformationType> CScalar::transformationMapList_ = std::map<StdString, ETranformationType>();
-   bool CScalar::dummyTransformationMapList_ = CScalar::initializeTransformationMap(CScalar::transformationMapList_);
+   //std::map<StdString, ETranformationType> CScalar::transformationMapList_ = std::map<StdString, ETranformationType>();
+   //bool CScalar::dummyTransformationMapList_ = CScalar::initializeTransformationMap(CScalar::transformationMapList_);
+
+   std::map<StdString, ETranformationType> *CScalar::transformationMapList_ptr = 0;
+   
    bool CScalar::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
    {
@@ -34 +37 @@
      m["extract_axis"]  = TRANS_EXTRACT_AXIS_TO_SCALAR;
      m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_SCALAR;
+   }
+
+   bool CScalar::initializeTransformationMap()
+   {
+     CScalar::transformationMapList_ptr = new std::map<StdString, ETranformationType>();
+     (*CScalar::transformationMapList_ptr)["reduce_axis"]   = TRANS_REDUCE_AXIS_TO_SCALAR;
+     (*CScalar::transformationMapList_ptr)["extract_axis"]  = TRANS_EXTRACT_AXIS_TO_SCALAR;
+     (*CScalar::transformationMapList_ptr)["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_SCALAR;
    }
 
@@ -164 +175 @@
 
         nodeElementName = node.getElementName();
-        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
-        it = transformationMapList_.find(nodeElementName);
+        if(CScalar::transformationMapList_ptr == 0) initializeTransformationMap();
+        std::map<StdString, ETranformationType>::const_iterator ite = (*CScalar::transformationMapList_ptr).end(), it;
+        it = (*CScalar::transformationMapList_ptr).find(nodeElementName);
         if (ite != it)
         {