Changeset 1158 for XIOS/dev/dev_olga/src/io/nc4_data_output.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/io/nc4_data_output.hpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/io/nc4_data_output.hpp

@@ -23 +23 @@
             /// Constructeurs ///
             CNc4DataOutput
-               (const StdString & filename, bool exist);
+               (CFile* file, const StdString & filename, bool exist);
             CNc4DataOutput
-               (const StdString & filename, bool exist, bool useClassicFormat,
+               (CFile* file, const StdString & filename, bool exist, bool useClassicFormat,
                 bool useCFConvention,
                 MPI_Comm comm_file, bool multifile, bool isCollective = true,
@@ -96 +96 @@
                                      const StdString & nav_model);
 
-            StdSize getRecordFromTime(Time time);
+            StdSize getRecordFromTime(Time time, double factorUnit);
 
          private :
@@ -123 +123 @@
             std::set<std::string> writtenAxis, writtenCompressedAxis;
             std::set<std::string> writtenScalar;
+
+            enum { none, centered, instant, record} timeCounterType ;
+            bool hasTimeInstant ;
+            bool hasTimeCentered ;
       }; // class CNc4DataOutput