Changeset 1089 for XIOS

Timestamp:

04/12/17 16:02:29 (7 years ago)

Author:

yushan

Message:

save

Location:

XIOS/dev/branch_yushan/src

Files:

• group_factory.cpp (modified) (1 diff)
• group_factory.hpp (modified) (1 diff)
• node/axis.cpp (modified) (2 diffs)
• object_factory.cpp (modified) (1 diff)
• object_factory.hpp (modified) (1 diff)

XIOS/dev/branch_yushan/src/group_factory.cpp

@@ -9 +9 @@
    void CGroupFactory::SetCurrentContextId(const StdString & context)
    { 
-      CGroupFactory::CurrContext = context;
+      //CGroupFactory::CurrContext = context;
       *CGroupFactory::CurrContext_ptr = context;
    }

XIOS/dev/branch_yushan/src/group_factory.hpp

@@ -69 +69 @@
 
          /// Propriétés statiques ///
-         static StdString CurrContext;
+         //static StdString CurrContext;
          static StdString *CurrContext_ptr;
          #pragma omp threadprivate(CurrContext_ptr)

XIOS/dev/branch_yushan/src/node/axis.cpp

@@ -45 +45 @@
 
    //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>();
-   std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>;
+   std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0;
    bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr);
    bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
@@ -1005 +1005 @@
 
         nodeElementName = node.getElementName();
-        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ptr->end(), it;
+        if(transformationMapList_ptr == NULL) transformationMapList_ptr = new std::map<StdString, ETranformationType>;
+
+        std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it;
         it = transformationMapList_ptr->find(nodeElementName);
         if (ite != it)

XIOS/dev/branch_yushan/src/object_factory.cpp

@@ -5 +5 @@
    /// ////////////////////// Définitions ////////////////////// ///
 
-   StdString CObjectFactory::CurrContext("");
+   //StdString CObjectFactory::CurrContext("");
          StdString *CObjectFactory::CurrContext_ptr = new StdString;
 
    void CObjectFactory::SetCurrentContextId(const StdString & context)
    { 
-         CObjectFactory::CurrContext = context; 
+         //CObjectFactory::CurrContext = context; 
          *CObjectFactory::CurrContext_ptr = context; 
    }

XIOS/dev/branch_yushan/src/object_factory.hpp

@@ -59 +59 @@
 
          /// Propriétés statiques ///
-         static StdString CurrContext;
+         //static StdString CurrContext;
          static StdString *CurrContext_ptr;
          #pragma omp threadprivate(CurrContext_ptr)