Changeset 286 for XMLIO_V2/dev/common/src/xmlio/manager/tree_manager.cpp

Timestamp:

10/21/11 19:01:35 (13 years ago)

Author:

ymipsl

Message:

reprise en main de la version de H. Ozdoba. Correction de différentes erreurs de conception et bug.
Version NEMO operationnel en client/server, interoperabilita avec OASIS, reconstition de fichiers via netcdf4/HDF5

YM

File:

• XMLIO_V2/dev/common/src/xmlio/manager/tree_manager.cpp (modified) (9 diffs)

XMLIO_V2/dev/common/src/xmlio/manager/tree_manager.cpp

@@ -129 +129 @@
                   
                   
-//         std::cout << "Nombre de contexte :" << ctxtnb << std::endl;
 
          for (StdSize i = 0; i < ctxtnb; i++)
@@ -148 +147 @@
                is.read (const_cast<char *>(id.data()), size * sizeof(char));
                
-//               std::cout << "context ::::" << id << std::endl;
                
                CTreeManager::SetCurrentContextId(id);               
@@ -187 +185 @@
          os.write (reinterpret_cast<const char*>(&genum) , sizeof(ENodeType)); 
          os.write (reinterpret_cast<const char*>(&size) , sizeof(StdSize));
-         
+
          for (StdSize i = 0; i < size; i++)
          {
@@ -232 +230 @@
                      
                   os.write (reinterpret_cast<const char*>(&idsize), sizeof(StdSize));
-                  os.write (id.data(), idsize * sizeof(char));         
+                  os.write (id.data(), idsize * sizeof(char));  
                }         
                domain->toBinary(os);               
@@ -273 +271 @@
          const StdSize size = def_vector.size();  
                   
-         is.read (reinterpret_cast<char*>(&renum), sizeof(StdSize));   
-         is.read (reinterpret_cast<char*>(&ctxtnb), sizeof(ENodeType));
+         is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType));   
+         is.read (reinterpret_cast<char*>(&ctxtnb), sizeof(StdSize));
 
          if (renum != CContextGroup::GetType())
@@ -282 +280 @@
          if (size != ctxtnb)
             ERROR("CTreeManager::DomainsFromBinary(StdIStream & is)",
-                  << "[ size = " << size << "] Bad context group size !");
+                  << "[ size = " << size << "] != "<<ctxtnb<<" : Bad context group size !");
                   
          for (StdSize i = 0; i < ctxtnb; i++)
@@ -330 +328 @@
                      
             // Lecture successive des informations binaires de domaine.
+              
             for (StdSize j = 0; j < alldomain_size; j++)
             {
@@ -352 +351 @@
                   if (domain->getId().compare(id) != 0)
                      ERROR("CTreeManager::DomainsFromBinary(StdIStream & is)",
-                           << "[ id = " << id << "] Bad id !"); 
+                           << "[ id = " <<  id <<" != "<<domain->getId()<< "] Bad id !"); 
                }
                domain->fromBinary(is);
@@ -380 +379 @@
                   if (grid->getId().compare(id) != 0)
                      ERROR("CTreeManager::DomainsFromBinary(StdIStream & is)",
-                           << "[ id = " << id << "] Bad id !"); 
+                           << "[ id = " << id <<" != "<<grid->getId()<< "] Bad id !"); 
                }
                grid->fromBinary(is);