Changeset 2481

Timestamp:

03/23/23 16:22:23 (15 months ago)

Author:

jderouillat

Message:

Chunk must be defined for non fields variables too in parallel write

Location:

XIOS3/trunk/src/io

Files:

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

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -1810 +1810 @@
         try
         {
-           SuperClassWriter::addVariable(fieldid, type, dims);
+           SuperClassWriter::addVariable(fieldid, type, dims, false);
            SuperClassWriter::addChunk(field, type, dims);
 

XIOS3/trunk/src/io/onetcdf4.cpp

@@ -308 +308 @@
 
       int CONetCDF4::addVariable(const StdString& name, nc_type type,
-                                 const std::vector<StdString>& dim, int compressionLevel)
+                                 const std::vector<StdString>& dim, bool defineChunking)
       {
          int varid = 0;
@@ -315 +315 @@
          int dimSize = dim.size();
 
+         StdSize size;
+
          int grpid = this->getCurrentGroup();
 
@@ -323 +325 @@
             const StdString& dimid = *it;
             dimids.push_back(this->getDimension(dimid));
+            CNetCdfInterface::inqDimLen(grpid, this->getDimension(dimid), size);
+            if (size == NC_UNLIMITED) size = 1;
+            dimsizes.push_back(size);
          }
 
          CNetCdfInterface::defVar(grpid, name, type, dimids.size(), &dimids[0], varid);
+
+         if (defineChunking) {
+           int storageType = (0 == dimSize) ? NC_CONTIGUOUS : NC_CHUNKED;
+           CNetCdfInterface::defVarChunking(grpid, varid, storageType, &dimsizes[0]);
+           CNetCdfInterface::defVarFill(grpid, varid, true, NULL);
+         }
+
          
          return varid;
@@ -509 +521 @@
            ERROR("void CONetCDF4::setCompressionLevel(const StdString& varname, int compressionLevel)",
                  "Impossible to use compression for variable \"" << varname << "\" when using parallel mode.");
-
          int grpid = this->getCurrentGroup();
          int varid = this->getVariable(varname);

XIOS3/trunk/src/io/onetcdf4.hpp

@@ -49 +49 @@
             int addDimension(const StdString& name, const StdSize size = UNLIMITED_DIM);
             int addVariable(const StdString& name, nc_type type,
-                            const std::vector<StdString>& dim, int compressionLevel=0);
+                            const std::vector<StdString>& dim, bool defineChunking=true);
             int addChunk(CField* field, nc_type type,
                          const std::vector<StdString>& dim, int compressionLevel=0);