Changeset 1642 for XIOS/dev/branch_openmp/src/object_factory_impl.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/object_factory_impl.hpp (modified) (12 diffs)

XIOS/dev/branch_openmp/src/object_factory_impl.hpp

@@ -10 +10 @@
        int CObjectFactory::GetObjectNum(void)
    {
-      if (CurrContext_ptr->size() == 0)
+      if (CurrContext.size() == 0)
          ERROR("CObjectFactory::GetObjectNum(void)",
                << "please define current context id !");
-      if(U::AllVectObj_ptr == NULL) return 0;
-      return (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
+      return (U::AllVectObj[CObjectFactory::CurrContext].size());
    }
 
@@ -20 +19 @@
       int CObjectFactory::GetObjectIdNum(void)
    {
-      if (CurrContext_ptr->size() == 0)
+      if (CurrContext.size() == 0)
          ERROR("CObjectFactory::GetObjectIdNum(void)",
                << "please define current context id !");
-      if(U::AllMapObj_ptr == NULL) return 0;
-      return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
+      return (U::AllMapObj[CObjectFactory::CurrContext].size());
    }
 
@@ -30 +28 @@
       bool CObjectFactory::HasObject(const StdString & id)
    {
-      if (CurrContext_ptr->size() == 0)
+      if (CurrContext.size() == 0)
          ERROR("CObjectFactory::HasObject(const StdString & id)",
                << "[ id = " << id << " ] please define current context id !");
-      if(U::AllMapObj_ptr  == NULL)  return false;
-      return ((*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].find(id) !=
-              (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].end());
-
+      return (U::AllMapObj[CObjectFactory::CurrContext].find(id) !=
+              U::AllMapObj[CObjectFactory::CurrContext].end());
    }
 
@@ -42 +38 @@
       bool CObjectFactory::HasObject(const StdString & context, const StdString & id)
    {
-      if(U::AllMapObj_ptr  == NULL) return false;
-
-      if (U::AllMapObj_ptr->find(context) == U::AllMapObj_ptr->end()) return false ;
-      else return ((*U::AllMapObj_ptr)[context].find(id) !=  (*U::AllMapObj_ptr)[context].end());
+      if (U::AllMapObj.find(context) == U::AllMapObj.end()) return false ;
+      else return (U::AllMapObj[context].find(id) !=  U::AllMapObj[context].end());
    }
 
@@ -51 +45 @@
       std::shared_ptr<U> CObjectFactory::GetObject(const U * const object)
    {
-      if(U::AllVectObj_ptr == NULL) return (std::shared_ptr<U>());
-      if (CurrContext_ptr->size() == 0)
+      if (CurrContext.size() == 0)
          ERROR("CObjectFactory::GetObject(const U * const object)",
                << "please define current context id !");
-      std::vector<std::shared_ptr<U> > & vect = (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr];
+      std::vector<std::shared_ptr<U> > & vect =
+                     U::AllVectObj[CObjectFactory::CurrContext];
 
       typename std::vector<std::shared_ptr<U> >::const_iterator
@@ -76 +70 @@
       std::shared_ptr<U> CObjectFactory::GetObject(const StdString & id)
    {
-      if(U::AllMapObj_ptr  == NULL) return (std::shared_ptr<U>());
-      if (CurrContext_ptr->size() == 0)
+      if (CurrContext.size() == 0)
          ERROR("CObjectFactory::GetObject(const StdString & id)",
                << "[ id = " << id << " ] please define current context id !");
@@ -84 +77 @@
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << "object was not found.");
-      return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr][id];
+      return (U::AllMapObj[CObjectFactory::CurrContext][id]);
    }
 
@@ -90 +83 @@
       std::shared_ptr<U> CObjectFactory::GetObject(const StdString & context, const StdString & id)
    {
-      if(U::AllMapObj_ptr  == NULL) return (std::shared_ptr<U>());
-
       if (!CObjectFactory::HasObject<U>(context,id))
          ERROR("CObjectFactory::GetObject(const StdString & id)",
                << "[ id = " << id << ", U = " << U::GetName() <<", context = "<<context<< " ] "
                << "object was not found.");
-      return (*U::AllMapObj_ptr)[context][id];
+      return (U::AllMapObj[context][id]);
    }
 
@@ -102 +93 @@
    std::shared_ptr<U> CObjectFactory::CreateObject(const StdString& id)
    {
-      if(U::AllVectObj_ptr == NULL) U::AllVectObj_ptr = new xios_map<StdString, std::vector<std::shared_ptr<U> > >;
-      if(U::AllMapObj_ptr  == NULL) U::AllMapObj_ptr  = new xios_map<StdString, xios_map<StdString, std::shared_ptr<U> > >;
-
-      if (CurrContext_ptr->empty())
+      if (CurrContext.empty())
          ERROR("CObjectFactory::CreateObject(const StdString& id)",
                << "[ id = " << id << " ] please define current context id !");
@@ -117 +105 @@
          std::shared_ptr<U> value(new U(id.empty() ? CObjectFactory::GenUId<U>() : id));
 
-         (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].insert((*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].end(), value);
-         (*U::AllMapObj_ptr) [*CObjectFactory::CurrContext_ptr].insert(std::make_pair(value->getId(), value));
+         U::AllVectObj[CObjectFactory::CurrContext].insert(U::AllVectObj[CObjectFactory::CurrContext].end(), value);
+         U::AllMapObj[CObjectFactory::CurrContext].insert(std::make_pair(value->getId(), value));
 
          return value;
@@ -128 +116 @@
          CObjectFactory::GetObjectVector(const StdString & context)
    {
-      return (*U::AllVectObj_ptr)[context];
+      return (U::AllVectObj[context]);
    }
 
@@ -142 +130 @@
    {
       StdOStringStream oss;
-      if(U::GenId_ptr == NULL) U::GenId_ptr = new xios_map< StdString, long int >;
-      oss << GetUIdBase<U>() << (*U::GenId_ptr)[*CObjectFactory::CurrContext_ptr]++;
+      oss << GetUIdBase<U>() << U::GenId[CObjectFactory::CurrContext]++;
       return oss.str();
    }