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

Timestamp:

11/26/14 12:06:21 (9 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/nc4_data_output.cpp (modified) (2 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -29 +29 @@
 
       CNc4DataOutput::CNc4DataOutput
-         (const StdString & filename, bool exist, MPI_Comm comm_file,bool multifile, bool isCollective)
+         (const StdString & filename, bool exist, bool useClassicFormat,
+          MPI_Comm comm_file,bool multifile, bool isCollective)
             : SuperClass()
-            , SuperClassWriter(filename, exist, &comm_file,multifile)
+            , SuperClassWriter(filename, exist, useClassicFormat, &comm_file, multifile)
             , comm_file(comm_file)
             , filename(filename)
@@ -732 +733 @@
            }
            else
-           {
-              double * default_value = NULL;
-              SuperClassWriter::setDefaultValue(fieldid, default_value);
-           }
+              SuperClassWriter::setDefaultValue(fieldid, (double*)NULL);
 
            {  // Ecriture des coordonnées