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

XIOS/trunk/src/data_output.cpp

@@ -14 +14 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeGrid
-         (const boost::shared_ptr<CGrid> grid)
+      void CDataOutput::writeGrid(CGrid* grid)
       {
          if (grid->domain_ref.isEmpty())
@@ -34 +33 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeFile
-         (const boost::shared_ptr<CFile>  file)
+      void CDataOutput::writeFile(CFile*  file)
       {
          this->writeFile_(file);
@@ -52 +50 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeGrid
-         (const boost::shared_ptr<CDomain> domain,
-          const boost::shared_ptr<CAxis> axis)
+      void CDataOutput::writeGrid(CDomain* domain,CAxis* axis)
       {
          this->writeDomain_(domain);
@@ -62 +58 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeGrid
-         (const boost::shared_ptr<CDomain> domain)
+      void CDataOutput::writeGrid(CDomain* domain)
       {
          this->writeDomain_(domain);
@@ -70 +65 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeField
-         (const boost::shared_ptr<CField> field)
+      void CDataOutput::writeField(CField* field)
       {
-         boost::shared_ptr<CContext> context = CContext::getCurrent() ;
+         CContext* context = CContext::getCurrent() ;
          boost::shared_ptr<CCalendar> calendar = context->getCalendar();
          
@@ -82 +76 @@
       //----------------------------------------------------------------
 
-      void CDataOutput::writeFieldGrid
-         (const boost::shared_ptr<CField> field)
+      void CDataOutput::writeFieldGrid(CField* field)
       {
          this->writeGrid(field->getRelGrid());
@@ -90 +83 @@
       //----------------------------------------------------------------
       
-      void CDataOutput::writeFieldData(const boost::shared_ptr<CField> field)
+      void CDataOutput::writeFieldData(CField* field)
       {
-         boost::shared_ptr<CGrid> grid = CGrid::get(field->grid_ref.getValue());
-         boost::shared_ptr<CDomain> domain = CDomain::get(grid->domain_ref.getValue());
+         CGrid* grid = CGrid::get(field->grid_ref.getValue());
+         CDomain* domain = CDomain::get(grid->domain_ref.getValue());
             
 //         if (domain->isEmpty()) return;