Changeset 607 for XIOS/branchs

Timestamp:

06/05/15 10:03:37 (9 years ago)

Author:

rlacroix

Message:

Improve the error message when compression cannot be used.

Location:

XIOS/branchs/xios-1.0/src/output

Files:

• nc4_data_output.cpp (modified) (1 diff)
• onetcdf4.cpp (modified) (1 diff)

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

@@ -739 +739 @@
            if (field->compression_level.isEmpty())
              field->compression_level = field->file->compression_level.isEmpty() ? 0 : field->file->compression_level;
-           if (field->compression_level < 0 || field->compression_level > 9)
-             ERROR("void CNc4DataOutput::writeField_(CField* field)",
-                   "Invalid compression level, the value should range between 0 and 9.");
            SuperClassWriter::setCompressionLevel(fieldid, field->compression_level);
 

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

@@ -290 +290 @@
       void CONetCDF4::setCompressionLevel(const StdString& varname, int compressionLevel)
       {
+         if (compressionLevel < 0 || compressionLevel > 9)
+           ERROR("void CONetCDF4::setCompressionLevel(const StdString& varname, int compressionLevel)",
+                 "Invalid compression level for variable \"" << varname << "\", the value should range between 0 and 9.");
+         if (compressionLevel && wmpi)
+           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);