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

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

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

XIOS/dev/branch_openmp/src/object_factory_impl.hpp

@@ -13 +13 @@
          ERROR("CObjectFactory::GetObjectNum(void)",
                << "please define current context id !");
-      //return (U::AllVectObj[CObjectFactory::CurrContext].size());
       if(U::AllVectObj_ptr == NULL) return 0;
       return (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
@@ -24 +23 @@
          ERROR("CObjectFactory::GetObjectIdNum(void)",
                << "please define current context id !");
-      //return (U::AllMapObj[CObjectFactory::CurrContext].size());
       if(U::AllMapObj_ptr == NULL) return 0;
       return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].size();
@@ -35 +33 @@
          ERROR("CObjectFactory::HasObject(const StdString & id)",
                << "[ id = " << id << " ] please define current context id !");
-      //return (U::AllMapObj[CObjectFactory::CurrContext].find(id) !=
-      //        U::AllMapObj[CObjectFactory::CurrContext].end());
       if(U::AllMapObj_ptr  == NULL)  return false;
       return ((*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr].find(id) !=
@@ -46 +42 @@
       bool CObjectFactory::HasObject(const StdString & context, const StdString & id)
    {
-
-      // if (U::AllMapObj.find(context) == U::AllMapObj.end()) return false ;
-      // else return (U::AllMapObj[context].find(id) !=  U::AllMapObj[context].end());
       if(U::AllMapObj_ptr  == NULL) return false;
 
@@ -56 +49 @@
 
    template <typename U>
-      boost::shared_ptr<U> CObjectFactory::GetObject(const U * const object)
+      std::shared_ptr<U> CObjectFactory::GetObject(const U * const object)
    {
-      if(U::AllVectObj_ptr == NULL) return (boost::shared_ptr<U>());
+      if(U::AllVectObj_ptr == NULL) return (std::shared_ptr<U>());
       if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObject(const U * const object)",
                << "please define current context id !");
-      //std::vector<boost::shared_ptr<U> > & vect = U::AllVectObj[CObjectFactory::CurrContext];
-      std::vector<boost::shared_ptr<U> > & vect = (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr];
+      std::vector<std::shared_ptr<U> > & vect = (*U::AllVectObj_ptr)[*CObjectFactory::CurrContext_ptr];
 
-      typename std::vector<boost::shared_ptr<U> >::const_iterator
+      typename std::vector<std::shared_ptr<U> >::const_iterator
          it = vect.begin(), end = vect.end();
 
       for (; it != end; it++)
       {
-         boost::shared_ptr<U> ptr = *it;
+         std::shared_ptr<U> ptr = *it;
          if (ptr.get() == object)
             return (ptr);
@@ -78 +70 @@
                << "[type = " << U::GetName() << ", adress = " << object << "] "
                << "object was not found.");
-      return (boost::shared_ptr<U>()); // jamais atteint
+      return (std::shared_ptr<U>()); // jamais atteint
    }
 
    template <typename U>
-      boost::shared_ptr<U> CObjectFactory::GetObject(const StdString & id)
+      std::shared_ptr<U> CObjectFactory::GetObject(const StdString & id)
    {
-      if(U::AllMapObj_ptr  == NULL) return (boost::shared_ptr<U>());
+      if(U::AllMapObj_ptr  == NULL) return (std::shared_ptr<U>());
       if (CurrContext_ptr->size() == 0)
          ERROR("CObjectFactory::GetObject(const StdString & id)",
@@ -92 +84 @@
                << "[ id = " << id << ", U = " << U::GetName() << " ] "
                << "object was not found.");
-
-      //cout<<"CObjectFactory::GetObject(const StdString & id)[ id = " << id << ", U = " << U::GetName() << " ] "<<endl;
-      if(id == "src_domain_regular_read")
-      {
-         //cout<<"match"<<endl;
-      }
-
-      //return (U::AllMapObj[CObjectFactory::CurrContext][id]);
       return (*U::AllMapObj_ptr)[*CObjectFactory::CurrContext_ptr][id];
    }
 
    template <typename U>
-      boost::shared_ptr<U> CObjectFactory::GetObject(const StdString & context, const StdString & id)
+      std::shared_ptr<U> CObjectFactory::GetObject(const StdString & context, const StdString & id)
    {
-      if(U::AllMapObj_ptr  == NULL) return (boost::shared_ptr<U>());
+      if(U::AllMapObj_ptr  == NULL) return (std::shared_ptr<U>());
 
       if (!CObjectFactory::HasObject<U>(context,id))
@@ -112 +96 @@
                << "[ id = " << id << ", U = " << U::GetName() <<", context = "<<context<< " ] "
                << "object was not found.");
-
-      //cout<<"CObjectFactory::GetObject(const StdString & context, const StdString & id)[ id = " << id << ", U = " << U::GetName() << " ] "<<endl;
-      if(id == "src_domain_regular_read")
-      {
-         //cout<<"match"<<endl;
-         boost::shared_ptr<U> value;
-      }
-      //return (U::AllMapObj[context][id]);
       return (*U::AllMapObj_ptr)[context][id];
    }
 
    template <typename U>
-   boost::shared_ptr<U> CObjectFactory::CreateObject(const StdString& id)
+   std::shared_ptr<U> CObjectFactory::CreateObject(const StdString& id)
    {
-      if(U::AllVectObj_ptr == NULL) U::AllVectObj_ptr = new xios_map<StdString, std::vector<boost::shared_ptr<U> > >;
-      if(U::AllMapObj_ptr  == NULL) U::AllMapObj_ptr  = new xios_map<StdString, xios_map<StdString, boost::shared_ptr<U> > >;
+      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())
@@ -139 +115 @@
       else
       {
-         boost::shared_ptr<U> value(new U(id.empty() ? CObjectFactory::GenUId<U>() : id));
-
-         //U::AllVectObj[CObjectFactory::CurrContext].insert(U::AllVectObj[CObjectFactory::CurrContext].end(), value);
-         //U::AllMapObj[CObjectFactory::CurrContext].insert(std::make_pair(value->getId(), value));
+         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));
-         //cout<<"CObjectFactory::CreateObject(const StdString& id) [ id = " << id << " ]" <<endl;
 
          return value;
@@ -153 +125 @@
 
    template <typename U>
-      const std::vector<boost::shared_ptr<U> > &
+      const std::vector<std::shared_ptr<U> > &
          CObjectFactory::GetObjectVector(const StdString & context)
    {
-      //return (U::AllVectObj[context]);
       return (*U::AllVectObj_ptr)[context];
    }