Changeset 1642 for XIOS/dev/branch_openmp/src/object_template_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_template_impl.hpp (modified) (6 diffs)

XIOS/dev/branch_openmp/src/object_template_impl.hpp

@@ -24 +24 @@
       xios_map<StdString,
       xios_map<StdString,
-      std::shared_ptr<T> > > *CObjectTemplate<T>::AllMapObj_ptr = 0;
+      std::shared_ptr<T> > > CObjectTemplate<T>::AllMapObj;
 
    template <class T>
       xios_map<StdString,
-      std::vector<std::shared_ptr<T> > > *CObjectTemplate<T>::AllVectObj_ptr = 0;
-
-   template <class T>
-      xios_map<StdString,long int> *CObjectTemplate<T>::GenId_ptr = 0;
+      std::vector<std::shared_ptr<T> > > CObjectTemplate<T>::AllVectObj;
+
+   template <class T>
+      xios_map<StdString,long int> CObjectTemplate<T>::GenId;
 
    template <class T>
@@ -66 +66 @@
          CObjectTemplate<T>::GetAllVectobject(const StdString & contextId)
    {
-     return (CObjectTemplate<T>::AllVectObj_ptr->at(contextId));
+      return (CObjectTemplate<T>::AllVectObj[contextId]);
    }
 
@@ -109 +109 @@
    template <class T>
       void CObjectTemplate<T>::parse(xml::CXMLNode & node)
+   TRY
    {
       xml::THashAttributes attributes = node.getAttributes();
       CAttributeMap::setAttributes(attributes);
    }
+   CATCH
 
    //---------------------------------------------------------------
@@ -426 +428 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
-     const vector< std::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(CObjectFactory::GetCurrentContextId());
+     const vector< std::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
      vector<T*> vect;
 
@@ -475 +477 @@
      oss << iendl;
      oss << "#include <boost/multi_array.hpp>" << iendl;
-     oss << "#include <boostXXX/shared_ptr.hpp>" << iendl;
      oss << "#include \"xios.hpp\"" << iendl;
      oss << "#include \"attribute_template.hpp\"" << iendl;
@@ -509 +510 @@
      oss << "INTERFACE" << iendl++;
      oss << "! Do not call directly / interface FORTRAN 2003 <-> C99";
-     SuperClassMap::generateFortran2003Interface(oss,className);
+     SuperClassMap::generateFortran2003Interface(oss, className);
      oss << iendl--;
      oss << "END INTERFACE" << iendl--;