Changeset 528 for XIOS/trunk/src/node/file.cpp

Timestamp:

12/03/14 17:54:33 (9 years ago)

Author:

rlacroix

Message:

Add the ability to append data to existing output file(s).

By default existing file(s) will still be overwritten. Set the new file attribute "append" to true if you wish to append data to existing NetCDF file(s).

Note that the append mode is currently not supported when file splitting is used and that the structure of the output file cannot be changed.

File:

• XIOS/trunk/src/node/file.cpp (modified) (2 diffs)

XIOS/trunk/src/node/file.cpp

@@ -322 +322 @@
          }
 
+        bool append = !this->append.isEmpty() && this->append.getValue();
+        
          bool useClassicFormat = !format.isEmpty() && format == format_attr::netcdf4_classic;
 
@@ -362 +364 @@
          if (isOpen) data_out->closeFile();
 
-         data_out=shared_ptr<CDataOutput>(new CNc4DataOutput(oss.str(), false, useClassicFormat,
-                                                             fileComm, multifile, isCollective));
-         isOpen=true ;
-
-         data_out->writeFile(CFile::get(this));
-         std::vector<CField*>::iterator it, end = this->enabledFields.end();
-         for (it = this->enabledFields.begin() ;it != end; it++)
-         {
+        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(oss.str(), append, useClassicFormat,
+                                                              fileComm, multifile, isCollective));
+        isOpen = true;
+
+        data_out->writeFile(CFile::get(this));
+
+        // Do not recreate the file structure if opening an existing file
+        if (!data_out->IsInAppendMode())
+        {
+          std::vector<CField*>::iterator it, end = this->enabledFields.end();
+          for (it = this->enabledFields.begin(); it != end; it++)
+          {
             CField* field = *it;
             this->data_out->writeFieldGrid(field);
-         }
-         this->data_out->writeTimeDimension();
-
-         for (it = this->enabledFields.begin() ;it != end; it++)
-         {
+          }
+          this->data_out->writeTimeDimension();
+
+          for (it = this->enabledFields.begin(); it != end; it++)
+          {
             CField* field = *it;
             this->data_out->writeField(field);
-         }
-
-         vector<CVariable*> listVars = getAllVariables() ;
-         for (vector<CVariable*>::iterator it = listVars.begin() ;it != listVars.end(); it++) this-> data_out-> writeAttribute(*it) ;
-
-         this->data_out->definition_end();
+          }
+
+          vector<CVariable*> listVars = getAllVariables() ;
+          for (vector<CVariable*>::iterator it = listVars.begin(); it != listVars.end(); it++)
+            this->data_out->writeAttribute(*it);
+
+          this->data_out->definition_end();
+        }
       }
    }