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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -55 +55 @@
       //---------------------------------------------------------------
 
-      void CNc4DataOutput::writeDomain_(const boost::shared_ptr<CDomain> domain)
-      {
-         shared_ptr<CContext> context = CContext::getCurrent() ;
+      void CNc4DataOutput::writeDomain_(CDomain* domain)
+      {
+         CContext* context = CContext::getCurrent() ;
          CContextServer* server=context->server ;
          
@@ -221 +221 @@
       //--------------------------------------------------------------
 
-      void CNc4DataOutput::writeAxis_(const boost::shared_ptr<CAxis> axis)
+      void CNc4DataOutput::writeAxis_(CAxis* axis)
       {
          if (axis->IsWritten(this->filename)) return;
@@ -269 +269 @@
       //--------------------------------------------------------------
 
-      void CNc4DataOutput::writeField_(const boost::shared_ptr<CField> field)
-      {
-         shared_ptr<CContext> context = CContext::getCurrent() ;
+      void CNc4DataOutput::writeField_(CField* field)
+      {
+         CContext* context = CContext::getCurrent() ;
          CContextServer* server=context->server ;
 
          std::vector<StdString> dims, coodinates;
-         boost::shared_ptr<CGrid> grid = field->grid;
-         boost::shared_ptr<CDomain> domain = grid->domain;
+         CGrid* grid = field->grid;
+         CDomain* domain = grid->domain;
            
          if (domain->isEmpty()) 
@@ -319 +319 @@
          if (!grid->axis_ref.isEmpty())
          {
-            boost::shared_ptr<CAxis> axis = grid->axis ;
+            CAxis* axis = grid->axis ;
             StdString axisid = (!axis->name.isEmpty()) ? axis->name.getValue() : axis->getId();
             dims.push_back(axisid);
@@ -418 +418 @@
       //--------------------------------------------------------------
 
-      void CNc4DataOutput::writeFile_ (const boost::shared_ptr<CFile> file)
+      void CNc4DataOutput::writeFile_ (CFile* file)
       {
          StdString filename = (!file->name.isEmpty())
@@ -461 +461 @@
       //---------------------------------------------------------------
       
-      void CNc4DataOutput::writeFieldData_ (const boost::shared_ptr<CField>  field)
-      {
-         shared_ptr<CContext> context = CContext::getCurrent() ;
+      void CNc4DataOutput::writeFieldData_ (CField*  field)
+      {
+         CContext* context = CContext::getCurrent() ;
 //          if (field->getRelFile()->isSyncTime()) SuperClassWriter::sync() ;
 
-         boost::shared_ptr<CGrid> grid = field->grid ;
-         boost::shared_ptr<CDomain> domain = grid->domain ;
+         CGrid* grid = field->grid ;
+         CDomain* domain = grid->domain ;
          
          if(SuperClass::type==MULTI_FILE || !isCollective) if (domain->isEmpty()) return;
@@ -489 +489 @@
          if (grid->hasAxis()) // 3D
          {
-            boost::shared_ptr<CAxis> axis = grid->axis ;
+            CAxis* axis = grid->axis ;
             ARRAY_CREATE(field_data3D,double,3,[domain->zoom_ni_srv][domain->zoom_nj_srv][axis->size.getValue()]) ;
             field->outputField(field_data3D);
@@ -561 +561 @@
 
       void CNc4DataOutput::writeTimeAxis_
-                  (const boost::shared_ptr<CField>    field,
+                  (CField*    field,
                    const boost::shared_ptr<CCalendar> cal)
       {