Changeset 347 for XIOS/trunk/src/node/grid.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/grid.cpp (modified) (6 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -25 +25 @@
    CGrid::~CGrid(void)
    { 
-      this->axis.reset() ;
-      this->domain.reset() ;
+ //     this->axis.reset() ;
+//      this->domain.reset() ;
       
       for (StdSize i = 0; i < this->storeIndex.size(); i++)
@@ -73 +73 @@
    //---------------------------------------------------------------
 
-   const boost::shared_ptr<CAxis>   CGrid::getRelAxis  (void) const
+   const CAxis*   CGrid::getRelAxis  (void) const
    { 
       return (this->axis ); 
@@ -80 +80 @@
    //---------------------------------------------------------------
 
-   const boost::shared_ptr<CDomain> CGrid::getRelDomain(void) const
+   const CDomain* CGrid::getRelDomain(void) const
    { 
       return (this->domain ); 
@@ -158 +158 @@
    {
       if (this->isChecked) return;
-      shared_ptr<CContext> context = CContext::getCurrent() ;
+      CContext* context = CContext::getCurrent() ;
       CContextClient* client=context->client ;
       
@@ -306 +306 @@
    //----------------------------------------------------------------
 
-   boost::shared_ptr<CGrid>
-      CGrid::CreateGrid(boost::shared_ptr<CDomain> domain)
+   CGrid* CGrid::createGrid(CDomain* domain)
    {
       StdString new_id = StdString("__") + domain->getId() + StdString("__") ;
-      boost::shared_ptr<CGrid> grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
+      CGrid* grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
       grid->domain_ref.setValue(domain->getId());
       return (grid);
    }
 
-   boost::shared_ptr<CGrid>
-      CGrid::CreateGrid(boost::shared_ptr<CDomain> domain, boost::shared_ptr<CAxis> axis)
+   CGrid* CGrid::createGrid(CDomain* domain, CAxis* axis)
    {
       StdString new_id = StdString("__") + domain->getId() +
                          StdString("_") + axis->getId() + StdString("__") ;
-      boost::shared_ptr<CGrid> grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
+      CGrid* grid = CGridGroup::get("grid_definition")->createChild(new_id) ;
       grid->domain_ref.setValue(domain->getId());
       grid->axis_ref.setValue(axis->getId());
@@ -416 +414 @@
   void CGrid::sendIndex(void)
   {
-    shared_ptr<CContext> context = CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent() ;
     CContextClient* client=context->client ;