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

XIOS/trunk/src/node/file.cpp

@@ -45 +45 @@
    }
 
-   boost::shared_ptr<CFieldGroup> CFile::getVirtualFieldGroup(void) const
+   CFieldGroup* CFile::getVirtualFieldGroup(void) const
    {
       return (this->vFieldGroup);
    }
 
-   std::vector<boost::shared_ptr<CField> > CFile::getAllFields(void) const
+   std::vector<CField*> CFile::getAllFields(void) const
    {
       return (this->vFieldGroup->getAllChildren());
@@ -57 +57 @@
    //----------------------------------------------------------------
 
-   std::vector<boost::shared_ptr<CField> > CFile::getEnabledFields
-      (int default_outputlevel, int default_level, bool default_enabled)
+   std::vector<CField*> CFile::getEnabledFields(int default_outputlevel, 
+                                                int default_level,
+                                                bool default_enabled)
    {
       if (!this->enabledFields.empty())
@@ -65 +66 @@
       const int _outputlevel =
          (!output_level.isEmpty()) ? output_level.getValue() : default_outputlevel;
-      std::vector<boost::shared_ptr<CField> >::iterator it;
+      std::vector<CField*>::iterator it;
       this->enabledFields = this->getAllFields();
 
-      std::vector<boost::shared_ptr<CField> > newEnabledFields;
+      std::vector<CField*> newEnabledFields;
       
       for ( it = this->enabledFields.begin() ; it != this->enabledFields.end(); it++ )
@@ -112 +113 @@
    //----------------------------------------------------------------
 
-   void CFile::setVirtualFieldGroup(boost::shared_ptr<CFieldGroup> newVFieldGroup)
+   void CFile::setVirtualFieldGroup(CFieldGroup* newVFieldGroup)
    { 
       this->vFieldGroup = newVFieldGroup; 
@@ -127 +128 @@
    bool CFile::isSyncTime(void)
    {
-     shared_ptr<CContext> context = CContext::getCurrent() ;
+     CContext* context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
@@ -142 +143 @@
    void CFile::initFile(void)
    {
-      shared_ptr<CContext> context = CContext::getCurrent() ;
+      CContext* context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       
@@ -163 +164 @@
    bool CFile::checkSync(void)
    {
-     shared_ptr<CContext> context = CContext::getCurrent() ;
+     CContext* context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
      if (! sync_freq.isEmpty())
@@ -180 +181 @@
     bool CFile::checkSplit(void)
     {
-      shared_ptr<CContext> context = CContext::getCurrent() ;
+      CContext* context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       if (! split_freq.isEmpty())
@@ -188 +189 @@
           *lastSplit=currentDate-outputFreq ;
         
-          std::vector<boost::shared_ptr<CField> >::iterator it, end = this->enabledFields.end();
+          std::vector<CField*>::iterator it, end = this->enabledFields.end();
           for (it = this->enabledFields.begin() ;it != end; it++)  (*it)->resetNStep() ;
           createHeader() ;
@@ -199 +200 @@
    void CFile::createHeader(void)
    {
-      shared_ptr<CContext> context = CContext::getCurrent() ;
+      CContext* context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
       
-      std::vector<boost::shared_ptr<CField> >::iterator it, end = this->enabledFields.end();
+      std::vector<CField*>::iterator it, end = this->enabledFields.end();
 
       AllDomainEmpty=true ;
@@ -208 +209 @@
       for (it = this->enabledFields.begin() ;it != end; it++)
       {
-         boost::shared_ptr<CField> field = *it;
+         CField* field = *it;
          AllDomainEmpty&=field->grid->domain->isEmpty() ;
-         setDomain.insert(field->grid->domain.get()) ;
+         setDomain.insert(field->grid->domain) ;
       }
       nbDomain=setDomain.size() ;
@@ -260 +261 @@
          for (it = this->enabledFields.begin() ;it != end; it++)
          {
-            boost::shared_ptr<CField> field = *it;
+            CField* field = *it;
             this->data_out->writeFieldGrid(field);
          }
@@ -266 +267 @@
          for (it = this->enabledFields.begin() ;it != end; it++)
          {
-            boost::shared_ptr<CField> field = *it;
+            CField* field = *it;
             this->data_out->writeField(field);
          }
@@ -306 +307 @@
          oss << " id=\"" << this->getId() << "\" ";
       oss << SuperClassAttribute::toString() << ">" << std::endl;
-      if (this->getVirtualFieldGroup().get() != NULL)
+      if (this->getVirtualFieldGroup() != NULL)
          oss << *this->getVirtualFieldGroup() << std::endl;
       oss << "</" << CFile::GetName() << " >";
@@ -325 +326 @@
    {
       // Résolution des héritages par référence de chacun des champs contenus dans le fichier.
-      std::vector<boost::shared_ptr<CField> > allF = this->getAllFields();
+      std::vector<CField*> allF = this->getAllFields();
       for (unsigned int i = 0; i < allF.size(); i++)
          allF[i]->solveRefInheritance();
@@ -351 +352 @@
    {
       ENodeType genum = CFileGroup::GetType();
-      bool hasVFG = (this->getVirtualFieldGroup().get() != NULL);
+      bool hasVFG = (this->getVirtualFieldGroup() != NULL);
       SuperClass::toBinary(os);
       
@@ -381 +382 @@
    }
    
-   shared_ptr<CField> CFile::addField(const string& id)
+   CField* CFile::addField(const string& id)
    {
      return vFieldGroup->createChild(id) ;
    }
 
-   shared_ptr<CFieldGroup> CFile::addFieldGroup(const string& id)
+   CFieldGroup* CFile::addFieldGroup(const string& id)
    {
      return vFieldGroup->createChildGroup(id) ;
@@ -394 +395 @@
    void CFile::sendAddField(const string& id)
    {
-    shared_ptr<CContext> context=CContext::getCurrent() ;
+    CContext* context=CContext::getCurrent() ;
     
     if (! context->hasServer )
@@ -416 +417 @@
    void CFile::sendAddFieldGroup(const string& id)
    {
-    shared_ptr<CContext> context=CContext::getCurrent() ;
+    CContext* context=CContext::getCurrent() ;
     if (! context->hasServer )
     {