Changeset 347 for XIOS/trunk/src/node/field.cpp

Timestamp:

05/21/12 17:57:22 (12 years ago)

Author:

ymipsl

Message:

• Supress lot of shared_ptr
• instrument code for vampir-trace and timer diagnostic

YM

File:

• XIOS/trunk/src/node/field.cpp (modified) (15 diffs)

XIOS/trunk/src/node/field.cpp

@@ -36 +36 @@
    CField::~CField(void)
    {
-      this->grid.reset() ;
-      this->file.reset() ;
+//      this->grid.reset() ;
+//      this->file.reset() ;
       this->foperation.reset() ;
       this->data.reset() ;
@@ -94 +94 @@
   void CField::sendUpdateData(void)
   {
-    shared_ptr<CContext> context = CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent() ;
     CContextClient* client=context->client ;
     
@@ -150 +150 @@
     }
 
-    shared_ptr<CContext> context = CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent() ;
     const CDate & currDate = context->getCalendar()->getCurrentDate();
     const CDate opeDate      = *last_operation_srv + freq_operation_srv;
@@ -192 +192 @@
    //----------------------------------------------------------------
 
-   void CField::setRelFile(const boost::shared_ptr<CFile> _file)
+   void CField::setRelFile(CFile* _file)
    { 
       this->file = _file; 
@@ -205 +205 @@
    //----------------------------------------------------------------
 
-   boost::shared_ptr<CGrid> CField::getRelGrid(void) const
+   CGrid* CField::getRelGrid(void) const
    { 
       return (this->grid); 
@@ -212 +212 @@
    //----------------------------------------------------------------
 
-   boost::shared_ptr<CFile> CField::getRelFile(void) const
+   CFile* CField::getRelFile(void) const
    { 
       return (this->file);
@@ -234 +234 @@
    //----------------------------------------------------------------
 
-   boost::shared_ptr<CField> CField::getDirectFieldReference(void) const
+   CField* CField::getDirectFieldReference(void) const
    {
       if (this->field_ref.isEmpty())
@@ -249 +249 @@
    //----------------------------------------------------------------
 
-   const boost::shared_ptr<CField> CField::getBaseFieldReference(void) const
+   CField* CField::getBaseFieldReference(void) const
    { 
       return (baseRefObject); 
@@ -256 +256 @@
    //----------------------------------------------------------------
 
-   const std::vector<boost::shared_ptr<CField> > & CField::getAllReference(void) const 
+   const std::vector<CField*>& CField::getAllReference(void) const 
    { 
       return (refObject);
@@ -325 +325 @@
    {
       std::set<CField *> sset;
-      boost::shared_ptr<CField> refer_sptr;
+      CField* refer_sptr;
       CField * refer_ptr = this;
       
@@ -333 +333 @@
       {
          refer_sptr = refer_ptr->getDirectFieldReference();
-         refer_ptr  = refer_sptr.get();
+         refer_ptr  = refer_sptr;
 
          if(sset.end() != sset.find(refer_ptr))
@@ -356 +356 @@
        
       StdString id = this->getBaseFieldReference()->getId();
-      boost::shared_ptr<CContext> context = CContext::getCurrent();
+      CContext* context = CContext::getCurrent();
 
       if (operation.isEmpty() || freq_op.isEmpty() || this->file->output_freq.isEmpty())
@@ -442 +442 @@
    void CField::solveGridReference(void)
    {
-      boost::shared_ptr<CDomain> domain;
-      boost::shared_ptr<CAxis> axis;
+      CDomain* domain;
+      CAxis* axis;
 
       if (!domain_ref.isEmpty())
@@ -486 +486 @@
             if (!axis_ref.isEmpty())
             {
-               this->grid = CGrid::CreateGrid(domain, axis) ;
+               this->grid = CGrid::createGrid(domain, axis) ;
                this->grid_ref.setValue(this->grid->getId());
             }
             else
             {
-               this->grid = CGrid::CreateGrid(domain) ;
+               this->grid = CGrid::createGrid(domain) ;
                this->grid_ref.setValue(this->grid->getId());
             }
@@ -518 +518 @@
                << " invalid group name !");
 
-      boost::shared_ptr<CFieldGroup> group = CFieldGroup::get(gref);
-      boost::shared_ptr<CFieldGroup> owner = CFieldGroup::get(boost::polymorphic_downcast<CFieldGroup*>(this));
-
-      std::vector<boost::shared_ptr<CField> > allChildren  = group->getAllChildren();
-      std::vector<boost::shared_ptr<CField> >::iterator 
+      CFieldGroup* group = CFieldGroup::get(gref);
+      CFieldGroup* owner = CFieldGroup::get(boost::polymorphic_downcast<CFieldGroup*>(this));
+
+      std::vector<CField*> allChildren  = group->getAllChildren();
+      std::vector<CField*>::iterator 
          it = allChildren.begin(), end = allChildren.end();
       
       for (; it != end; it++)
       {
-         boost::shared_ptr<CField> child = *it;
+         CField* child = *it;
          if (child->hasId()) owner->createChild()->field_ref.setValue(child->getId()) ;