Changeset 1046

Timestamp:

02/02/17 14:40:34 (7 years ago)

Author:

ymipsl

Message:

• Add 2 new file attributes to parameter timestamp : time_stamp_name and time_stamp_format.

Default value :
time_stamp_name="timestamp"
time_stamp_format="%Y-%b-%d %H:%M:%S %Z"

• timestamp is now given in UTC time

YM

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• io/nc4_data_output.cpp (modified) (6 diffs)
• io/nc4_data_output.hpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (1 diff)

XIOS/trunk/src/config/file_attribute.conf

@@ -27 +27 @@
 DECLARE_ENUM4(timeseries,    none, only, both, exclusive)
 DECLARE_ATTRIBUTE(StdString, ts_prefix)
-
+DECLARE_ATTRIBUTE(StdString, time_stamp_name)
+DECLARE_ATTRIBUTE(StdString, time_stamp_format)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -16 +16 @@
       /// ////////////////////// Dfinitions ////////////////////// ///
       CNc4DataOutput::CNc4DataOutput
-         (const StdString & filename, bool exist)
+         (CFile* file, const StdString & filename, bool exist)
             : SuperClass()
             , SuperClassWriter(filename, exist)
             , filename(filename)
+            , file(file)
       {
         SuperClass::type = MULTI_FILE;
@@ -25 +26 @@
 
       CNc4DataOutput::CNc4DataOutput
-         (const StdString & filename, bool exist, bool useClassicFormat, bool useCFConvention,
+         (CFile* file, const StdString & filename, bool exist, bool useClassicFormat, bool useCFConvention,
           MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName)
             : SuperClass()
@@ -32 +33 @@
             , filename(filename)
             , isCollective(isCollective)
+            , file(file)
       {
         SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE;
@@ -1971 +1973 @@
          struct tm * timeinfo = NULL;
          char buffer [buffer_size];
-
+         StdString formatStr;
+         if (file->time_stamp_format.isEmpty()) formatStr="%Y-%b-%d %H:%M:%S %Z" ;
+         else formatStr=file->time_stamp_format;
+
+//         time ( &rawtime );
+//         timeinfo = localtime ( &rawtime );
          time ( &rawtime );
-         timeinfo = localtime ( &rawtime );
-         strftime (buffer, buffer_size, "%Y-%b-%d %H:%M:%S %Z", timeinfo);
+         timeinfo = gmtime ( &rawtime );
+         strftime (buffer, buffer_size, formatStr.c_str(), timeinfo);
 
          return (StdString(buffer));
@@ -2010 +2017 @@
               field->getOperationTimeType() != func::CFunctor::once)
           {
-                         double factorUnit;
-                         if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
-                           factorUnit=context->getCalendar()->getDayLengthInSeconds() ; 
-                         else factorUnit=1 ;
+            double factorUnit;
+            if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
+            factorUnit=context->getCalendar()->getDayLengthInSeconds() ;
+            else factorUnit=1 ;
             field->resetNStep(getRecordFromTime(field->last_Write_srv,factorUnit) + 1);
           }
@@ -2561 +2568 @@
            SuperClassWriter::addAttribute("Conventions", conventions);
            // SuperClassWriter::addAttribute("production" , production);
-           SuperClassWriter::addAttribute("timeStamp"  , timeStamp);
+           StdString timeStampStr ;
+           if (file->time_stamp_name.isEmpty()) timeStampStr="timeStamp" ;
+           else timeStampStr=file->time_stamp_name ;
+           SuperClassWriter::addAttribute(timeStampStr, timeStamp);
          }
          catch (CNetCdfException& e)

XIOS/trunk/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,

XIOS/trunk/src/node/file.cpp

@@ -463 +463 @@
          if (isOpen) data_out->closeFile();
 
-        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(oss.str(), append, useClassicFormat, useCFConvention,
+        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
                                                               fileComm, multifile, isCollective, time_counter_name));
         isOpen = true;

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -677 +677 @@
 /*! Redefined some functions of CONetCDF4 to make use of them */
 CDomainAlgorithmInterpolate::WriteNetCdf::WriteNetCdf(const StdString& filename, const MPI_Comm comm)
-  : CNc4DataOutput(filename, false, false, true, comm, false, true) {}
+  : CNc4DataOutput(NULL, filename, false, false, true, comm, false, true) {}
 int CDomainAlgorithmInterpolate::WriteNetCdf::addDimensionWrite(const StdString& name, 
                                                                 const StdSize size)