Index: /XIOS/trunk/src/node/field.cpp
===================================================================
--- /XIOS/trunk/src/node/field.cpp	(revision 650)
+++ /XIOS/trunk/src/node/field.cpp	(revision 651)
@@ -203,6 +203,6 @@
       {
         int rank = it->first;
-        data_srv.insert( pair<int, CArray<double,1>* >(rank, new CArray<double,1>(it->second.numElements())));
-        foperation_srv.insert(pair<int,boost::shared_ptr<func::CFunctor> >(rank,boost::shared_ptr<func::CFunctor>(new func::CInstant(*data_srv[rank]))));
+        data_srv.insert(std::make_pair(rank, CArray<double,1>(it->second.numElements())));
+        foperation_srv.insert(pair<int,boost::shared_ptr<func::CFunctor> >(rank,boost::shared_ptr<func::CFunctor>(new func::CInstant(data_srv[rank]))));
       }
     }
@@ -210,6 +210,6 @@
     CContext* context = CContext::getCurrent();
     const CDate& currDate = context->getCalendar()->getCurrentDate();
-    const CDate opeDate      = *last_operation_srv + freq_operation_srv;
-    const CDate writeDate    = *last_Write_srv     + freq_write_srv;
+    const CDate opeDate      = last_operation_srv + freq_operation_srv;
+    const CDate writeDate    = last_Write_srv     + freq_write_srv;
 
     if (opeDate <= currDate)
@@ -221,5 +221,5 @@
         (*foperation_srv[ranks[n]])(data_tmp);
       }
-      *last_operation_srv = currDate;
+      last_operation_srv = currDate;
     }
 
@@ -231,7 +231,7 @@
       }
 
-      *last_Write_srv = writeDate;
+      last_Write_srv = writeDate;
       writeField();
-      *lastlast_Write_srv = *last_Write_srv;
+      lastlast_Write_srv = last_Write_srv;
     }
   }
@@ -305,5 +305,5 @@
     bool hasData = readField();
 
-    map<int, CArray<double,1>* >::iterator it;
+    map<int, CArray<double,1> >::iterator it;
     for (it = data_srv.begin(); it != data_srv.end(); it++)
     {
@@ -312,5 +312,5 @@
       msg << getId();
       if (hasData)
-        msg << getNStep() - 1 << *it->second;
+        msg << getNStep() - 1 << it->second;
       else
         msg << size_t(-1);
@@ -329,5 +329,5 @@
         {
           for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
-            data_srv.insert(pair<int, CArray<double,1>*>(it->first, new CArray<double,1>(it->second.numElements())));
+            data_srv.insert(std::make_pair(it->first, CArray<double,1>(it->second.numElements())));
         }
 
@@ -483,6 +483,4 @@
 
         solveGridReference();
-
-        lastDataRequestedFromServer.setRelCalendar(*context->getCalendar());
      }
      solveGridDomainAxisRef(doSending2Sever);
@@ -516,10 +514,10 @@
       freq_write_srv     = file->output_freq.getValue();
 
-      lastlast_Write_srv = boost::shared_ptr<CDate>(new CDate(context->getCalendar()->getInitDate()));
-      last_Write_srv     = boost::shared_ptr<CDate>(new CDate(context->getCalendar()->getInitDate()));
-      last_operation_srv = boost::shared_ptr<CDate>(new CDate(context->getCalendar()->getInitDate()));
+      lastlast_Write_srv = context->getCalendar()->getInitDate();
+      last_Write_srv     = context->getCalendar()->getInitDate();
+      last_operation_srv = context->getCalendar()->getInitDate();
 
       const CDuration toffset = freq_operation_srv - freq_offset.getValue() - context->getCalendar()->getTimeStep();
-      *last_operation_srv     = *last_operation_srv - toffset;
+      last_operation_srv     = last_operation_srv - toffset;
 
       if (operation.isEmpty())
@@ -792,20 +790,20 @@
    void CField::scaleFactorAddOffset(double scaleFactor, double addOffset)
    {
-     map<int, CArray<double,1>* >::iterator it;
-     for (it = data_srv.begin(); it != data_srv.end(); it++) *it->second = (*it->second - addOffset) / scaleFactor;
+     map<int, CArray<double,1> >::iterator it;
+     for (it = data_srv.begin(); it != data_srv.end(); it++) it->second = (it->second - addOffset) / scaleFactor;
    }
 
    void CField::invertScaleFactorAddOffset(double scaleFactor, double addOffset)
    {
-     map<int, CArray<double,1>* >::iterator it;
-     for (it = data_srv.begin(); it != data_srv.end(); it++) *it->second = *it->second * scaleFactor + addOffset;
+     map<int, CArray<double,1> >::iterator it;
+     for (it = data_srv.begin(); it != data_srv.end(); it++) it->second = it->second * scaleFactor + addOffset;
    }
 
    void CField::outputField(CArray<double,3>& fieldOut)
    {
-      map<int, CArray<double,1>* >::iterator it;
+      map<int, CArray<double,1> >::iterator it;
       for (it = data_srv.begin(); it != data_srv.end(); it++)
       {
-        grid->outputField(it->first,*it->second, fieldOut.dataFirst());
+        grid->outputField(it->first, it->second, fieldOut.dataFirst());
       }
    }
@@ -813,8 +811,8 @@
    void CField::outputField(CArray<double,2>& fieldOut)
    {
-      map<int, CArray<double,1>* >::iterator it;
+      map<int, CArray<double,1> >::iterator it;
       for(it=data_srv.begin();it!=data_srv.end();it++)
       {
-         grid->outputField(it->first,*it->second, fieldOut.dataFirst()) ;
+         grid->outputField(it->first, it->second, fieldOut.dataFirst()) ;
       }
    }
@@ -822,9 +820,9 @@
    void CField::outputField(CArray<double,1>& fieldOut)
    {
-      map<int, CArray<double,1>* >::iterator it;
+      map<int, CArray<double,1> >::iterator it;
 
       for (it = data_srv.begin(); it != data_srv.end(); it++)
       {
-         grid->outputField(it->first,*it->second, fieldOut.dataFirst()) ;
+         grid->outputField(it->first, it->second, fieldOut.dataFirst()) ;
       }
    }
@@ -832,8 +830,8 @@
    void CField::inputField(CArray<double,3>& fieldOut)
    {
-      map<int, CArray<double,1>*>::iterator it;
+      map<int, CArray<double,1> >::iterator it;
       for (it = data_srv.begin(); it != data_srv.end(); it++)
       {
-        grid->inputField(it->first, fieldOut.dataFirst(), *it->second);
+        grid->inputField(it->first, fieldOut.dataFirst(), it->second);
       }
    }
@@ -841,8 +839,8 @@
    void CField::inputField(CArray<double,2>& fieldOut)
    {
-      map<int, CArray<double,1>*>::iterator it;
+      map<int, CArray<double,1> >::iterator it;
       for(it = data_srv.begin(); it != data_srv.end(); it++)
       {
-         grid->inputField(it->first, fieldOut.dataFirst(), *it->second);
+         grid->inputField(it->first, fieldOut.dataFirst(), it->second);
       }
    }
@@ -850,8 +848,8 @@
    void CField::inputField(CArray<double,1>& fieldOut)
    {
-      map<int, CArray<double,1>*>::iterator it;
+      map<int, CArray<double,1> >::iterator it;
       for (it = data_srv.begin(); it != data_srv.end(); it++)
       {
-         grid->inputField(it->first, fieldOut.dataFirst(), *it->second);
+         grid->inputField(it->first, fieldOut.dataFirst(), it->second);
       }
    }
Index: /XIOS/trunk/src/node/field.hpp
===================================================================
--- /XIOS/trunk/src/node/field.hpp	(revision 650)
+++ /XIOS/trunk/src/node/field.hpp	(revision 651)
@@ -65,16 +65,16 @@
            EVENT_ID_UPDATE_DATA, EVENT_ID_READ_DATA, EVENT_ID_READ_DATA_READY,
            EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP
-         } ;
+         };
 
          /// Constructeurs ///
          CField(void);
-         explicit CField(const StdString & id);
-         CField(const CField & field);       // Not implemented yet.
-         CField(const CField * const field); // Not implemented yet.
+         explicit CField(const StdString& id);
+         CField(const CField& field);       // Not implemented yet.
+         CField(const CField* const field); // Not implemented yet.
 
          /// Accesseurs ///
 
-         CGrid* getRelGrid(void) const ;
-         CFile* getRelFile(void) const ;
+         CGrid* getRelGrid(void) const;
+         CFile* getRelFile(void) const;
 
          func::CFunctor::ETimeType getOperationTimeType() const;
@@ -91,5 +91,5 @@
          void setRelFile(CFile* _file);
          void incrementNStep(void);
-         void resetNStep() ;
+         void resetNStep();
          void resetNStepMax();
 
@@ -98,5 +98,5 @@
        public :
          bool isActive(void) const;
-         bool hasOutputFile ;
+         bool hasOutputFile;
 
          /// Traitements ///
@@ -112,5 +112,5 @@
          boost::shared_ptr<COutputPin> getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
 
-//         virtual void fromBinary(StdIStream & is);
+//         virtual void fromBinary(StdIStream& is);
 
          /// Destructeur ///
@@ -123,10 +123,10 @@
          static ENodeType GetType(void);
 
-        template <int N> void setData(const CArray<double, N>& _data) ;
-        static bool dispatchEvent(CEventServer& event) ;
+        template <int N> void setData(const CArray<double, N>& _data);
+        static bool dispatchEvent(CEventServer& event);
         void sendUpdateData(const CArray<double,1>& data);
-        static void recvUpdateData(CEventServer& event) ;
-        void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers) ;
-        void writeField(void) ;
+        static void recvUpdateData(CEventServer& event);
+        void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers);
+        void writeField(void);
         void sendReadDataRequest(void);
         bool sendReadDataRequestIfNeeded(void);
@@ -136,13 +136,13 @@
         static void recvReadDataReady(CEventServer& event);
         void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
-        void outputField(CArray<double,3>& fieldOut) ;
-        void outputField(CArray<double,2>& fieldOut) ;
-        void outputField(CArray<double,1>& fieldOut) ;
+        void outputField(CArray<double,3>& fieldOut);
+        void outputField(CArray<double,2>& fieldOut);
+        void outputField(CArray<double,1>& fieldOut);
         void inputField(CArray<double,3>& fieldOut);
         void inputField(CArray<double,2>& fieldOut);
         void inputField(CArray<double,1>& fieldOut);
-        void scaleFactorAddOffset(double scaleFactor, double addOffset) ;
+        void scaleFactorAddOffset(double scaleFactor, double addOffset);
         void invertScaleFactorAddOffset(double scaleFactor, double addOffset);
-        void parse(xml::CXMLNode & node) ;
+        void parse(xml::CXMLNode& node);
 
         void setVirtualVariableGroup(CVariableGroup* newVVariableGroup);
@@ -150,14 +150,14 @@
         CVariableGroup* getVirtualVariableGroup(void) const;
         vector<CVariable*> getAllVariables(void) const;
-        virtual void solveDescInheritance(bool apply, const CAttributeMap * const parent = 0);
-
-        CVariable* addVariable(const string& id="") ;
-        CVariableGroup* addVariableGroup(const string& id="") ;
-        void sendAddVariable(const string& id="") ;
-        void sendAddVariableGroup(const string& id="") ;
-        static void recvAddVariable(CEventServer& event) ;
-        void recvAddVariable(CBufferIn& buffer) ;
-        static void recvAddVariableGroup(CEventServer& event) ;
-        void recvAddVariableGroup(CBufferIn& buffer) ;
+        virtual void solveDescInheritance(bool apply, const CAttributeMap* const parent = 0);
+
+        CVariable* addVariable(const string& id = "");
+        CVariableGroup* addVariableGroup(const string& id = "");
+        void sendAddVariable(const string& id = "");
+        void sendAddVariableGroup(const string& id = "");
+        static void recvAddVariable(CEventServer& event);
+        void recvAddVariable(CBufferIn& buffer);
+        static void recvAddVariableGroup(CEventServer& event);
+        void recvAddVariableGroup(CBufferIn& buffer);
         void sendAddAllVariables();
 
@@ -167,7 +167,7 @@
       public :
          /// PropriÃ©tÃ©s privÃ©es ///
-         CVariableGroup* vVariableGroup ;
-
-         CGrid*  grid ;
+         CVariableGroup* vVariableGroup;
+
+         CGrid*  grid;
          CFile*  file;
 
@@ -176,11 +176,11 @@
          StdSize nstep, nstepMax;
          bool isEOF;
-         boost::shared_ptr<CDate> lastlast_Write_srv, last_Write_srv, last_operation_srv;
+         CDate lastlast_Write_srv, last_Write_srv, last_operation_srv;
          CDate lastDataRequestedFromServer;
 
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;
 
-         map<int, CArray<double,1>* > data_srv ;
-         string content ;
+         map<int, CArray<double,1> > data_srv;
+         string content;
 
          bool areAllReferenceSolved;
Index: /XIOS/trunk/src/node/file.cpp
===================================================================
--- /XIOS/trunk/src/node/file.cpp	(revision 650)
+++ /XIOS/trunk/src/node/file.cpp	(revision 651)
@@ -25,6 +25,6 @@
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
    {
-     setVirtualFieldGroup() ;
-     setVirtualVariableGroup() ;
+     setVirtualFieldGroup();
+     setVirtualVariableGroup();
    }
 
@@ -33,6 +33,6 @@
       , vFieldGroup(), data_out(), enabledFields(), fileComm(MPI_COMM_NULL)
     {
-      setVirtualFieldGroup() ;
-      setVirtualVariableGroup() ;
+      setVirtualFieldGroup();
+      setVirtualVariableGroup();
     }
 
@@ -129,5 +129,5 @@
       std::vector<CField*> newEnabledFields;
 
-      for ( it = this->enabledFields.begin() ; it != this->enabledFields.end(); it++ )
+      for ( it = this->enabledFields.begin(); it != this->enabledFields.end(); it++ )
       {
          if (!(*it)->enabled.isEmpty()) // Si l'attribut 'enabled' est dÃ©fini ...
@@ -138,5 +138,5 @@
          else // Si l'attribut 'enabled' n'est pas dÃ©fini ...
          {
-            if (!default_enabled) continue ;
+            if (!default_enabled) continue;
 //            { it--; this->enabledFields.erase(it+1); continue; }
          }
@@ -144,17 +144,17 @@
          if (!(*it)->level.isEmpty()) // Si l'attribut 'level' est dÃ©fini ...
          {
-            if ((*it)->level.getValue() > _outputlevel) continue ;
+            if ((*it)->level.getValue() > _outputlevel) continue;
 //            { it--; this->enabledFields.erase(it+1); continue; }
          }
          else // Si l'attribut 'level' n'est pas dÃ©fini ...
          {
-            if (default_level > _outputlevel) continue ;
+            if (default_level > _outputlevel) continue;
 //            { it--; this->enabledFields.erase(it+1); continue; }
          }
 
-//         CField* field_tmp=(*it).get() ;
-//         shared_ptr<CField> sptfield=*it ;
-//         field_tmp->refObject.push_back(sptfield) ;
-         newEnabledFields.push_back(*it) ;
+//         CField* field_tmp=(*it).get();
+//         shared_ptr<CField> sptfield=*it;
+//         field_tmp->refObject.push_back(sptfield);
+         newEnabledFields.push_back(*it);
          // Le champ est finalement actif, on y ajoute sa propre reference.
 //         (*it)->refObject.push_back(*it);
@@ -164,5 +164,5 @@
          // A faire, ajouter les references intermediaires...
       }
-      enabledFields=newEnabledFields ;
+      enabledFields = newEnabledFields;
 
       return (this->enabledFields);
@@ -198,15 +198,15 @@
    bool CFile::isSyncTime(void)
    {
-     CContext* context = CContext::getCurrent() ;
-     const CDate& currentDate = context->calendar->getCurrentDate() ;
+     CContext* context = CContext::getCurrent();
+     const CDate& currentDate = context->calendar->getCurrentDate();
      if (!sync_freq.isEmpty())
      {
-       if (*lastSync + sync_freq.getValue() < currentDate)
+       if (lastSync + sync_freq.getValue() < currentDate)
        {
-         *lastSync=currentDate ;
-         return true ;
+         lastSync = currentDate;
+         return true;
         }
       }
-      return false ;
+      return false;
     }
 
@@ -214,13 +214,13 @@
    void CFile::initFile(void)
    {
-      CContext* context = CContext::getCurrent() ;
-      const CDate& currentDate = context->calendar->getCurrentDate() ;
-      CContextServer* server=context->server ;
-
-      lastSync=new CDate(currentDate) ;
-      lastSplit=new CDate(currentDate) ;
-      isOpen=false ;
-
-      allDomainEmpty=true ;
+      CContext* context = CContext::getCurrent();
+      const CDate& currentDate = context->calendar->getCurrentDate();
+      CContextServer* server = context->server;
+
+      lastSync  = currentDate;
+      lastSplit = currentDate;
+      isOpen = false;
+
+      allDomainEmpty = true;
 
       set<CAxis*> setAxis;
@@ -243,9 +243,7 @@
 
       // create sub communicator for file
-      int color=allDomainEmpty?0:1 ;
-      MPI_Comm_split(server->intraComm,color,server->intraCommRank,&fileComm) ;
-      if (allDomainEmpty) MPI_Comm_free(&fileComm) ;
-      //
-
+      int color = allDomainEmpty ? 0 : 1;
+      MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);
+      if (allDomainEmpty) MPI_Comm_free(&fileComm);
     }
 
@@ -273,16 +271,16 @@
    bool CFile::checkSync(void)
    {
-     CContext* context = CContext::getCurrent() ;
-     const CDate& currentDate = context->calendar->getCurrentDate() ;
+     CContext* context = CContext::getCurrent();
+     const CDate& currentDate = context->calendar->getCurrentDate();
      if (!sync_freq.isEmpty())
      {
-       if (*lastSync + sync_freq.getValue() <= currentDate)
+       if (lastSync + sync_freq.getValue() <= currentDate)
        {
-         *lastSync=currentDate ;
-         data_out->syncFile() ;
-         return true ;
+         lastSync = currentDate;
+         data_out->syncFile();
+         return true;
         }
       }
-      return false ;
+      return false;
     }
 
@@ -295,11 +293,11 @@
     bool CFile::checkSplit(void)
     {
-      CContext* context = CContext::getCurrent() ;
-      const CDate& currentDate = context->calendar->getCurrentDate() ;
+      CContext* context = CContext::getCurrent();
+      const CDate& currentDate = context->calendar->getCurrentDate();
       if (!split_freq.isEmpty())
       {
-        if (currentDate > *lastSplit + split_freq.getValue())
+        if (currentDate > lastSplit + split_freq.getValue())
         {
-          *lastSplit = *lastSplit + split_freq.getValue();
+          lastSplit = lastSplit + split_freq.getValue();
           std::vector<CField*>::iterator it, end = this->enabledFields.end();
           for (it = this->enabledFields.begin(); it != end; it++)
@@ -309,11 +307,11 @@
           }
           if (mode.isEmpty() || mode.getValue() == mode_attr::write)
-            createHeader() ;
+            createHeader();
           else
             openInReadMode();
-          return true ;
+          return true;
         }
       }
-      return false ;
+      return false;
     }
 
@@ -324,6 +322,6 @@
    void CFile::createHeader(void)
    {
-      CContext* context = CContext::getCurrent() ;
-      CContextServer* server=context->server ;
+      CContext* context = CContext::getCurrent();
+      CContextServer* server = context->server;
 
       if (!allDomainEmpty)
@@ -336,5 +334,5 @@
          if (!split_freq.isEmpty())
          {
-           string splitFormat ;
+           string splitFormat;
            if (split_freq_format.isEmpty())
            {
@@ -346,7 +344,7 @@
              else splitFormat = "%y";
            }
-           else splitFormat=split_freq_format ;
-           oss << "_" << lastSplit->getStr(splitFormat)
-               << "-" << (*lastSplit + split_freq.getValue() - 1 * Second).getStr(splitFormat);
+           else splitFormat = split_freq_format;
+           oss << "_" << lastSplit.getStr(splitFormat)
+               << "-" << (lastSplit + split_freq.getValue() - 1 * Second).getStr(splitFormat);
          }
 
@@ -355,9 +353,9 @@
          bool useClassicFormat = !format.isEmpty() && format == format_attr::netcdf4_classic;
 
-         bool multifile=true ;
+         bool multifile = true;
          if (!type.isEmpty())
          {
-           if (type==type_attr::one_file) multifile=false ;
-           else if (type==type_attr::multiple_file) multifile=true ;
+           if (type == type_attr::one_file) multifile = false;
+           else if (type == type_attr::multiple_file) multifile = true;
 
          }
@@ -365,24 +363,24 @@
          if (!multifile)
          {
-            info(0)<<"!!! Warning -> Using non parallel version of netcdf, switching in multiple_file mode for file : "<<filename<<" ..."<<endl ;
-            multifile=true ;
+            info(0) << "!!! Warning -> Using non parallel version of netcdf, switching in multiple_file mode for file : " << filename << " ..." << endl;
+            multifile = true;
           }
 #endif
          if (multifile)
          {
-            int commSize, commRank ;
-            MPI_Comm_size(fileComm,&commSize) ;
-            MPI_Comm_rank(fileComm,&commRank) ;
+            int commSize, commRank;
+            MPI_Comm_size(fileComm, &commSize);
+            MPI_Comm_rank(fileComm, &commRank);
 
             if (server->intraCommSize > 1)
             {
-              oss << "_"  ;
-              int width=0 ; int n=commSize-1 ;
-              while(n != 0) { n=n/10 ; width++ ;}
+              oss << "_" ;
+              int width=0; int n = commSize-1;
+              while (n != 0) { n = n / 10; width++;}
               if (!min_digits.isEmpty())
-                if (width<min_digits) width=min_digits ;
-              oss.width(width) ;
-              oss.fill('0') ;
-              oss<<right<< commRank;
+                if (width < min_digits) width = min_digits;
+              oss.width(width);
+              oss.fill('0');
+              oss << right << commRank;
             }
          }
@@ -416,5 +414,5 @@
           }
 
-          vector<CVariable*> listVars = getAllVariables() ;
+          vector<CVariable*> listVars = getAllVariables();
           for (vector<CVariable*>::iterator it = listVars.begin(); it != listVars.end(); it++)
             this->data_out->writeAttribute(*it);
@@ -431,5 +429,5 @@
   {
     CContext* context = CContext::getCurrent();
-    CContextServer* server=context->server;
+    CContextServer* server = context->server;
 
     if (!allDomainEmpty)
@@ -452,7 +450,7 @@
           else splitFormat = "%y";
         }
-        else splitFormat=split_freq_format;
-        oss << "_" << lastSplit->getStr(splitFormat)
-        << "-" << (*lastSplit + split_freq.getValue() - 1 * Second).getStr(splitFormat);
+        else splitFormat = split_freq_format;
+        oss << "_" << lastSplit.getStr(splitFormat)
+        << "-" << (lastSplit + split_freq.getValue() - 1 * Second).getStr(splitFormat);
       }
 
@@ -478,5 +476,5 @@
         if (server->intraCommSize > 1)
         {
-          oss << "_" ;
+          oss << "_";
           int width = 0, n = commSize - 1;
           while (n != 0) { n = n / 10; width++; }
@@ -502,6 +500,4 @@
    void CFile::close(void)
    {
-     delete lastSync ;
-     delete lastSplit ;
      if (!allDomainEmpty)
        if (isOpen)
@@ -512,5 +508,5 @@
           this->data_in->closeFile();
        }
-      if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm) ;
+      if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm);
    }
    //----------------------------------------------------------------
@@ -530,5 +526,5 @@
            if (node.getElementName()=="field" || node.getElementName()=="field_group") this->getVirtualFieldGroup()->parseChild(node);
            else if (node.getElementName()=="variable" || node.getElementName()=="variable_group") this->getVirtualVariableGroup()->parseChild(node);
-        } while (node.goToNextElement()) ;
+        } while (node.goToNextElement());
         node.goToParentElement();
       }
@@ -649,5 +645,5 @@
    CField* CFile::addField(const string& id)
    {
-     return vFieldGroup->createChild(id) ;
+     return vFieldGroup->createChild(id);
    }
 
@@ -661,5 +657,5 @@
    CFieldGroup* CFile::addFieldGroup(const string& id)
    {
-     return vFieldGroup->createChildGroup(id) ;
+     return vFieldGroup->createChildGroup(id);
    }
 
@@ -676,5 +672,5 @@
    CVariable* CFile::addVariable(const string& id)
    {
-     return vVariableGroup->createChild(id) ;
+     return vVariableGroup->createChild(id);
    }
 
@@ -688,5 +684,5 @@
    CVariableGroup* CFile::addVariableGroup(const string& id)
    {
-     return vVariableGroup->createChildGroup(id) ;
+     return vVariableGroup->createChildGroup(id);
    }
 
@@ -697,22 +693,22 @@
    void CFile::sendAddField(const string& id)
    {
-    CContext* context=CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent();
 
     if (! context->hasServer )
     {
-       CContextClient* client=context->client ;
-
-       CEventClient event(this->getType(),EVENT_ID_ADD_FIELD) ;
+       CContextClient* client = context->client;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_FIELD);
        if (client->isServerLeader())
        {
-         CMessage msg ;
-         msg<<this->getId() ;
-         msg<<id ;
+         CMessage msg;
+         msg << this->getId();
+         msg << id;
          const std::list<int>& ranks = client->getRanksServerLeader();
          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
            event.push(*itRank,1,msg);
-         client->sendEvent(event) ;
+         client->sendEvent(event);
        }
-       else client->sendEvent(event) ;
+       else client->sendEvent(event);
     }
 
@@ -725,21 +721,21 @@
    void CFile::sendAddFieldGroup(const string& id)
    {
-    CContext* context=CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent();
     if (! context->hasServer )
     {
-       CContextClient* client=context->client ;
-
-       CEventClient event(this->getType(),EVENT_ID_ADD_FIELD_GROUP) ;
+       CContextClient* client = context->client;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_FIELD_GROUP);
        if (client->isServerLeader())
        {
-         CMessage msg ;
-         msg<<this->getId() ;
-         msg<<id ;
+         CMessage msg;
+         msg << this->getId();
+         msg << id;
          const std::list<int>& ranks = client->getRanksServerLeader();
          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
            event.push(*itRank,1,msg);
-         client->sendEvent(event) ;
+         client->sendEvent(event);
        }
-       else client->sendEvent(event) ;
+       else client->sendEvent(event);
     }
 
@@ -753,8 +749,8 @@
    {
 
-      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      CBufferIn* buffer = event.subEvents.begin()->buffer;
       string id;
-      *buffer>>id ;
-      get(id)->recvAddField(*buffer) ;
+      *buffer>>id;
+      get(id)->recvAddField(*buffer);
    }
 
@@ -765,7 +761,7 @@
    void CFile::recvAddField(CBufferIn& buffer)
    {
-      string id ;
-      buffer>>id ;
-      addField(id) ;
+      string id;
+      buffer>>id;
+      addField(id);
    }
 
@@ -777,8 +773,8 @@
    {
 
-      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      CBufferIn* buffer = event.subEvents.begin()->buffer;
       string id;
-      *buffer>>id ;
-      get(id)->recvAddFieldGroup(*buffer) ;
+      *buffer>>id;
+      get(id)->recvAddFieldGroup(*buffer);
    }
 
@@ -789,7 +785,7 @@
    void CFile::recvAddFieldGroup(CBufferIn& buffer)
    {
-      string id ;
-      buffer>>id ;
-      addFieldGroup(id) ;
+      string id;
+      buffer>>id;
+      addFieldGroup(id);
    }
 
@@ -828,22 +824,22 @@
    void CFile::sendAddVariable(const string& id)
    {
-    CContext* context=CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent();
 
     if (! context->hasServer )
     {
-       CContextClient* client=context->client ;
-
-       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE) ;
+       CContextClient* client = context->client;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE);
        if (client->isServerLeader())
        {
-         CMessage msg ;
-         msg<<this->getId() ;
-         msg<<id ;
+         CMessage msg;
+         msg << this->getId();
+         msg << id;
          const std::list<int>& ranks = client->getRanksServerLeader();
          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
            event.push(*itRank,1,msg);
-         client->sendEvent(event) ;
+         client->sendEvent(event);
        }
-       else client->sendEvent(event) ;
+       else client->sendEvent(event);
     }
 
@@ -856,21 +852,21 @@
    void CFile::sendAddVariableGroup(const string& id)
    {
-    CContext* context=CContext::getCurrent() ;
+    CContext* context = CContext::getCurrent();
     if (! context->hasServer )
     {
-       CContextClient* client=context->client ;
-
-       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE_GROUP) ;
+       CContextClient* client = context->client;
+
+       CEventClient event(this->getType(),EVENT_ID_ADD_VARIABLE_GROUP);
        if (client->isServerLeader())
        {
-         CMessage msg ;
-         msg<<this->getId() ;
-         msg<<id ;
+         CMessage msg;
+         msg << this->getId();
+         msg << id;
          const std::list<int>& ranks = client->getRanksServerLeader();
          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
            event.push(*itRank,1,msg);
-         client->sendEvent(event) ;
+         client->sendEvent(event);
        }
-       else client->sendEvent(event) ;
+       else client->sendEvent(event);
     }
 
@@ -884,8 +880,8 @@
    {
 
-      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      CBufferIn* buffer = event.subEvents.begin()->buffer;
       string id;
-      *buffer>>id ;
-      get(id)->recvAddVariable(*buffer) ;
+      *buffer>>id;
+      get(id)->recvAddVariable(*buffer);
    }
 
@@ -896,7 +892,7 @@
    void CFile::recvAddVariable(CBufferIn& buffer)
    {
-      string id ;
-      buffer>>id ;
-      addVariable(id) ;
+      string id;
+      buffer>>id;
+      addVariable(id);
    }
 
@@ -908,8 +904,8 @@
    {
 
-      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      CBufferIn* buffer = event.subEvents.begin()->buffer;
       string id;
-      *buffer>>id ;
-      get(id)->recvAddVariableGroup(*buffer) ;
+      *buffer>>id;
+      get(id)->recvAddVariableGroup(*buffer);
    }
 
@@ -920,7 +916,7 @@
    void CFile::recvAddVariableGroup(CBufferIn& buffer)
    {
-      string id ;
-      buffer>>id ;
-      addVariableGroup(id) ;
+      string id;
+      buffer>>id;
+      addVariableGroup(id);
    }
 
@@ -955,5 +951,5 @@
    bool CFile::dispatchEvent(CEventServer& event)
    {
-      if (SuperClass::dispatchEvent(event)) return true ;
+      if (SuperClass::dispatchEvent(event)) return true;
       else
       {
@@ -961,25 +957,25 @@
         {
            case EVENT_ID_ADD_FIELD :
-             recvAddField(event) ;
-             return true ;
-             break ;
+             recvAddField(event);
+             return true;
+             break;
 
            case EVENT_ID_ADD_FIELD_GROUP :
-             recvAddFieldGroup(event) ;
-             return true ;
-             break ;
+             recvAddFieldGroup(event);
+             return true;
+             break;
 
             case EVENT_ID_ADD_VARIABLE :
-             recvAddVariable(event) ;
-             return true ;
-             break ;
+             recvAddVariable(event);
+             return true;
+             break;
 
            case EVENT_ID_ADD_VARIABLE_GROUP :
-             recvAddVariableGroup(event) ;
-             return true ;
-             break ;
+             recvAddVariableGroup(event);
+             return true;
+             break;
            default :
-              ERROR("bool CFile::dispatchEvent(CEventServer& event)", <<"Unknown Event") ;
-           return false ;
+              ERROR("bool CFile::dispatchEvent(CEventServer& event)", << "Unknown Event");
+           return false;
         }
       }
Index: /XIOS/trunk/src/node/file.hpp
===================================================================
--- /XIOS/trunk/src/node/file.hpp	(revision 650)
+++ /XIOS/trunk/src/node/file.hpp	(revision 651)
@@ -53,7 +53,7 @@
          enum EEventId
          {
-           EVENT_ID_ADD_FIELD=0,EVENT_ID_ADD_FIELD_GROUP, EVENT_ID_ADD_VARIABLE,
+           EVENT_ID_ADD_FIELD, EVENT_ID_ADD_FIELD_GROUP, EVENT_ID_ADD_VARIABLE,
            EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_CREATE_ENABLED_FIELDS
-         } ;
+         };
 
          typedef CFileAttributes RelAttributes;
@@ -62,7 +62,7 @@
          /// Constructeurs ///
          CFile(void);
-         explicit CFile(const StdString & id);
-         CFile(const CFile & file);       // Not implemented yet.
-         CFile(const CFile * const file); // Not implemented yet.
+         explicit CFile(const StdString& id);
+         CFile(const CFile& file);       // Not implemented yet.
+         CFile(const CFile* const file); // Not implemented yet.
 
          /// Destructeur ///
@@ -84,9 +84,9 @@
       public :
          // Some functions to verify state of file
-         bool isSyncTime(void) ;
-         bool checkSplit(void) ;
-         bool checkSync(void) ;
-         void checkFile(void) ;
-         void initFile(void) ;
+         bool isSyncTime(void);
+         bool checkSplit(void);
+         bool checkSync(void);
+         void checkFile(void);
+         void initFile(void);
 
          /// Mutateurs ///
@@ -99,9 +99,9 @@
          void createHeader(void);
          void openInReadMode(void);
-         void close(void) ;
+         void close(void);
 
          // Some processing on file
          void solveFieldRefInheritance(bool apply);
-         void processEnabledFile(void) ;
+         void processEnabledFile(void);
          void solveAllRefOfEnabledFields(bool sendToServer);
          void buildFilterGraphOfEnabledFields(CGarbageCollector& gc);
@@ -110,29 +110,29 @@
 
          // Add component into file
-         CField* addField(const string& id="") ;
-         CFieldGroup* addFieldGroup(const string& id="") ;
-         CVariable* addVariable(const string& id="") ;
-         CVariableGroup* addVariableGroup(const string& id="") ;
+         CField* addField(const string& id = "");
+         CFieldGroup* addFieldGroup(const string& id = "");
+         CVariable* addVariable(const string& id = "");
+         CVariableGroup* addVariableGroup(const string& id = "");
 
          // Send info to serever
          void sendEnabledFields();
-         void sendAddField(const string& id="") ;
-         void sendAddFieldGroup(const string& id="") ;
+         void sendAddField(const string& id = "");
+         void sendAddFieldGroup(const string& id = "");
          void sendAddAllVariables();
-         void sendAddVariable(const string& id="") ;
-         void sendAddVariableGroup(const string& id="") ;
+         void sendAddVariable(const string& id = "");
+         void sendAddVariableGroup(const string& id = "");
 
          // Receive info from client
-         static void recvAddField(CEventServer& event) ;
-         void recvAddField(CBufferIn& buffer) ;
-         static void recvAddFieldGroup(CEventServer& event) ;
-         void recvAddFieldGroup(CBufferIn& buffer) ;
-         static void recvAddVariable(CEventServer& event) ;
-         void recvAddVariable(CBufferIn& buffer) ;
-         static void recvAddVariableGroup(CEventServer& event) ;
-         void recvAddVariableGroup(CBufferIn& buffer) ;
+         static void recvAddField(CEventServer& event);
+         void recvAddField(CBufferIn& buffer);
+         static void recvAddFieldGroup(CEventServer& event);
+         void recvAddFieldGroup(CBufferIn& buffer);
+         static void recvAddVariable(CEventServer& event);
+         void recvAddVariable(CBufferIn& buffer);
+         static void recvAddVariableGroup(CEventServer& event);
+         void recvAddVariableGroup(CBufferIn& buffer);
 
          // Dispatch event
-         static bool dispatchEvent(CEventServer& event) ;
+         static bool dispatchEvent(CEventServer& event);
 
       public:
@@ -144,22 +144,22 @@
       public:
          /// Traitements ///
-         virtual void solveDescInheritance(bool apply, const CAttributeMap * const parent = 0);
+         virtual void solveDescInheritance(bool apply, const CAttributeMap* const parent = 0);
 
           /// Autres ///
-         virtual void parse(xml::CXMLNode & node);
+         virtual void parse(xml::CXMLNode& node);
          virtual StdString toString(void) const;
       public:
 
-         CDate* lastSync ;
-         CDate* lastSplit ;
+         CDate lastSync;
+         CDate lastSplit;
          int nbAxis, nbDomains;
-         bool isOpen ;
-         bool allDomainEmpty ;
-         MPI_Comm fileComm ;
+         bool isOpen;
+         bool allDomainEmpty;
+         MPI_Comm fileComm;
 
       private :
          /// PropriÃ©tÃ©s privÃ©es ///
          CFieldGroup* vFieldGroup;
-         CVariableGroup* vVariableGroup ;
+         CVariableGroup* vVariableGroup;
          boost::shared_ptr<CDataOutput> data_out;
          boost::shared_ptr<CDataInput> data_in;
@@ -167,6 +167,6 @@
 
       public:
-        //         virtual void toBinary  (StdOStream & os) const;
-        //         virtual void fromBinary(StdIStream & is);
+        //         virtual void toBinary  (StdOStream& os) const;
+        //         virtual void fromBinary(StdIStream& is);
 
    }; // class CFile
Index: /XIOS/trunk/src/output/nc4_data_output.cpp
===================================================================
--- /XIOS/trunk/src/output/nc4_data_output.cpp	(revision 650)
+++ /XIOS/trunk/src/output/nc4_data_output.cpp	(revision 651)
@@ -1154,13 +1154,13 @@
         if (wtime)
         {
-          time_counter(0)= (Time(*field->last_Write_srv) + Time(*field->lastlast_Write_srv)) / 2;
+          time_counter(0)= (Time(field->last_Write_srv) + Time(field->lastlast_Write_srv)) / 2;
           if (field->getOperationTimeType() == func::CFunctor::instant)
-            time_data(0) = Time(*field->last_Write_srv);
+            time_data(0) = Time(field->last_Write_srv);
           else if (field->getOperationTimeType() == func::CFunctor::centered) time_data(0) = time_counter(0);
 
-          time_counter_bound(0) = Time(*field->lastlast_Write_srv);
-          time_counter_bound(1) = Time(*field->last_Write_srv);
+          time_counter_bound(0) = Time(field->lastlast_Write_srv);
+          time_counter_bound(1) = Time(field->last_Write_srv);
           if (field->getOperationTimeType() == func::CFunctor::instant)
-            time_data_bound(0) = time_data_bound(1) = Time(*field->last_Write_srv);
+            time_data_bound(0) = time_data_bound(1) = Time(field->last_Write_srv);
           else if (field->getOperationTimeType() == func::CFunctor::centered)
           {
