Changeset 798 for XIOS/branchs/xios-1.0/src/output

Timestamp:

11/27/15 09:55:05 (9 years ago)

Author:

rlacroix

Message:

Append mode

Location:

XIOS/branchs/xios-1.0/src/output

Files:

• nc4_data_output.cpp (modified) (1 diff)
• onetcdf4.cpp (modified) (5 diffs)
• onetcdf4.hpp (modified) (3 diffs)

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -937 +937 @@
                                      this->getTimeStamp());
 
-           SuperClassWriter::addDimension("axis_nbounds", 2);
+           if (!appendMode)
+             SuperClassWriter::addDimension("axis_nbounds", 2);
          }
          catch (CNetCdfException& e)

XIOS/branchs/xios-1.0/src/output/onetcdf4.cpp

@@ -11 +11 @@
 
       CONetCDF4::CONetCDF4
-         (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
+         (const StdString & filename, bool append, const MPI_Comm * comm, bool multifile)
             : path()
             , wmpi(false)
       {
-         this->initialize(filename, exist, comm,multifile);
+         this->initialize(filename, append, comm,multifile);
       }
 
@@ -29 +29 @@
 
       void CONetCDF4::initialize
-         (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
+         (const StdString & filename, bool append, const MPI_Comm * comm, bool multifile)
       {
          // Don't use parallel mode if there is only one process
@@ -41 +41 @@
          wmpi = comm && !multifile;
 
-         if (!exist)
+         // If the file does not exist, we always create it
+         if (!append || !std::ifstream(filename.c_str()))
          {
             if (wmpi)
@@ -47 +48 @@
             else
                CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp);
+
+            this->appendMode = false;
+            this->recordOffset = 0;
          }
          else
          {
             if (wmpi)
-               CNetCdfInterface::openPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp);
+               CNetCdfInterface::openPar(filename, NC_NETCDF4|NC_MPIIO|NC_WRITE, *comm, MPI_INFO_NULL, this->ncidp);
             else
-               CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp);
+               CNetCdfInterface::open(filename, NC_NETCDF4|NC_WRITE, 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;
          }
       }
@@ -429 +442 @@
          if (iddims.begin()->compare(this->getUnlimitedDimensionName()) == 0)
          {
-            sstart.push_back(record);
+            sstart.push_back(record + recordOffset);
             scount.push_back(1);
             if ((start == NULL) &&

XIOS/branchs/xios-1.0/src/output/onetcdf4.hpp

@@ -26 +26 @@
 
             /// Constructeurs ///
-            CONetCDF4(const StdString & filename, bool exist, const MPI_Comm * comm = NULL, bool multifile=true);
+            CONetCDF4(const StdString & filename, bool append, const MPI_Comm * comm = NULL, bool multifile=true);
 
             CONetCDF4(const CONetCDF4 & onetcdf4);       // Not implemented.
@@ -33 +33 @@
 
             /// Initialisation ///
-            void initialize(const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile);
+            void initialize(const StdString & filename, bool append, const MPI_Comm * comm, bool multifile);
             void close(void) ;
             void sync(void) ;
@@ -116 +116 @@
             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