Changeset 528 for XIOS/trunk/src/output

Timestamp:

12/03/14 17:54:33 (10 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.

Location:

XIOS/trunk/src/output

Files:

• onetcdf4.cpp (modified) (7 diffs)
• onetcdf4.hpp (modified) (3 diffs)

XIOS/trunk/src/output/onetcdf4.cpp

@@ +1 @@
+#include <fstream>
+
 #include "onetcdf4.hpp"
 #include "group_template.hpp"
@@ -11 +13 @@
 
       CONetCDF4::CONetCDF4
-         (const StdString & filename, bool exist, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
+         (const StdString & filename, bool append, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
             : path()
             , useClassicFormat(useClassicFormat)
+            , recordOffset(0)
       {
          this->wmpi = (comm != NULL) && !multifile;
-         this->initialize(filename, exist, useClassicFormat, comm,multifile);
+         this->initialize(filename, append, useClassicFormat, comm,multifile);
       }
 
@@ -30 +33 @@
 
       void CONetCDF4::initialize
-         (const StdString & filename, bool exist, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
+         (const StdString & filename, bool append, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
       {
          this->useClassicFormat = useClassicFormat;
@@ -38 +41 @@
             mode |= useClassicFormat ? NC_PNETCDF : NC_MPIIO;
 
-         if (!exist)
+         // If the file does not exist, we always create it
+         if (!append || !std::ifstream(filename.c_str()))
          {
             if (comm != NULL)
@@ -46 +50 @@
             }
             else CNetCdfInterface::create(filename, mode, this->ncidp);
+
+            this->appendMode = false;
+            this->recordOffset = 0;
          }
          else
          {
+            mode |= NC_WRITE;
             if (comm != NULL)
             {
@@ -55 +63 @@
             }
             else CNetCdfInterface::open(filename, mode, this->ncidp);
+
+            this->appendMode = true;
+            // Find out how many temporal records have been written already to the file we are opening
+            int ncUnlimitedDimId;
+            CNetCdfInterface::inqUnLimDim(this->ncidp, ncUnlimitedDimId);
+            if (ncUnlimitedDimId != -1)
+               CNetCdfInterface::inqDimLen(this->ncidp, ncUnlimitedDimId, this->recordOffset);
+            else
+               this->recordOffset = 0;
          }
 
@@ -424 +441 @@
          if (iddims.begin()->compare(this->getUnlimitedDimensionName()) == 0)
          {
-            sstart.push_back(record);
+            sstart.push_back(record + recordOffset);
             scount.push_back(1); 
             if ((start == NULL) &&

XIOS/trunk/src/output/onetcdf4.hpp

@@ -26 +26 @@
 
             /// Constructeurs ///
-            CONetCDF4(const StdString & filename, bool exist, bool useClassicFormat = false,
+            CONetCDF4(const StdString & filename, bool append, bool useClassicFormat = false,
                       const MPI_Comm * comm = NULL, bool multifile = true);
 
@@ -34 +34 @@
 
             /// Initialisation ///
-            void initialize(const StdString & filename, bool exist, bool useClassicFormat,
+            void initialize(const StdString & filename, bool append, bool useClassicFormat,
                             const MPI_Comm * comm, bool multifile);
             void close(void) ;
@@ -118 +118 @@
             int ncidp;
             bool wmpi;
+            /*! Number of records already written when opening an existing file.
+             *  always 0 when creating a new file */
+            size_t recordOffset;
             map<int,size_t> timeAxis ;
       }; // class CONetCDF4