Changeset 517 for XIOS/trunk/src/output/onetcdf4.cpp

Timestamp:

11/26/14 12:06:21 (10 years ago)

Author:

rlacroix

Message:

Add a new attribute to the file definition so that the output format can be controlled.

Currently the supported formats are "netcdf4" and "netcdf4_classic". The "format" attribute is optional. The "netcdf4" format will be used when no format is explicitly defined. Since "netcdf4" is the format which was previously used by XIOS, existing configuration files will not be affected by this change.

If "netcdf4_classic" is used, the output file(s) will be created using the classic NetCDF format. This format can be used with the attribute "type" set to "one_file" if the NetCDF4 library was compiled with Parallel NetCDF support (--enable-pnetcdf).

File:

• XIOS/trunk/src/output/onetcdf4.cpp (modified) (4 diffs)

XIOS/trunk/src/output/onetcdf4.cpp

@@ -11 +11 @@
 
       CONetCDF4::CONetCDF4
-         (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
+         (const StdString & filename, bool exist, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
             : path()
+            , useClassicFormat(useClassicFormat)
       {
          this->wmpi = (comm != NULL) && !multifile;
-         this->initialize(filename, exist, comm,multifile);
+         this->initialize(filename, exist, useClassicFormat, comm,multifile);
       }
 
@@ -29 +30 @@
 
       void CONetCDF4::initialize
-         (const StdString & filename, bool exist, const MPI_Comm * comm, bool multifile)
-      {
+         (const StdString & filename, bool exist, bool useClassicFormat, const MPI_Comm * comm, bool multifile)
+      {
+         this->useClassicFormat = useClassicFormat;
+
+         int mode = useClassicFormat ? 0 : NC_NETCDF4;
+         if (!multifile)
+            mode |= useClassicFormat ? NC_PNETCDF : NC_MPIIO;
+
          if (!exist)
          {
             if (comm != NULL)
             {
-               if (!multifile) (CNetCdfInterface::createPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, (this->ncidp)));
-               else (CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp));
+               if (!multifile) CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
+               else CNetCdfInterface::create(filename, mode, this->ncidp);
             }
-            else (CNetCdfInterface::create(filename, NC_NETCDF4, this->ncidp));
+            else CNetCdfInterface::create(filename, mode, this->ncidp);
          }
          else
@@ -44 +51 @@
             if (comm != NULL)
             {
-               if (!multifile) (CNetCdfInterface::openPar(filename, NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, this->ncidp));
-               else (CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp));
+               if (!multifile) CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
+               else CNetCdfInterface::open(filename, mode, this->ncidp);
             }
-            else  (CNetCdfInterface::open(filename, NC_NETCDF4, this->ncidp));
-         }
+            else CNetCdfInterface::open(filename, mode, this->ncidp);
+         }
+
+         // If the classic NetCDF format is used, we enable the "no-fill mode" globally.
+         // This is done per variable for the NetCDF4 format.
+         if (useClassicFormat)
+            CNetCdfInterface::setFill(this->ncidp, false);    
       }
 
@@ -264 +276 @@
          }
 
-         (CNetCdfInterface::defVar(grpid, name, type, dimids.size(), &(dimids[0]), varid));
-
-// set chunksize : size of one record
-// but must not be > 2GB (netcdf or HDF5 problem)
-         totalSize=1 ;
-         for(vector<StdSize>::reverse_iterator it=dimsizes.rbegin(); it!=dimsizes.rend();++it)
-         {
-           totalSize*= *it ;
-           if (totalSize>=maxSize) *it=1 ;
-         }
-
-         (CNetCdfInterface::defVarChunking(grpid, varid, NC_CHUNKED, &(dimsizes[0])));
-         (CNetCdfInterface::defVarFill(grpid, varid, true, NULL));
+         CNetCdfInterface::defVar(grpid, name, type, dimids.size(), &(dimids[0]), varid);
+
+         // The classic NetCDF format does not support chunking nor fill parameters
+         if (!useClassicFormat)
+         {
+            // set chunksize : size of one record
+            // but must not be > 2GB (netcdf or HDF5 problem)
+            totalSize = 1;
+            for (vector<StdSize>::reverse_iterator it = dimsizes.rbegin(); it != dimsizes.rend(); ++it)
+            {
+              totalSize *= *it;
+              if (totalSize >= maxSize) *it = 1;
+            }
+
+            CNetCdfInterface::defVarChunking(grpid, varid, NC_CHUNKED, &dimsizes[0]);
+            CNetCdfInterface::defVarFill(grpid, varid, true, NULL);
+         }
+
          return (varid);
       }