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

Timestamp:

03/27/12 10:49:42 (12 years ago)

Author:

ymipsl

Message:

• Add new attribut : time_origin for time axis origin which appear in nectdf file
• centered time averaging for time axis
• correct bug in calendar due to call of virtual function in the constructor

YM

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (2 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -483 +483 @@
  //        ARRAY(double, 1) field_data = field->data_srv;
          ARRAY_CREATE(time_data, double, 1, [1]);
-         (*time_data)[0] = date::Time(*field->last_Write_srv);
-         
+         if (field->operation.getValue()=="instant") (*time_data)[0] = date::Time(*field->last_Write_srv)
+                                                                      -date::Time(context->calendar->getTimeOrigin());
+         else (*time_data)[0] = (date::Time(*field->last_Write_srv)+date::Time(*field->lastlast_Write_srv))/2
+                               -date::Time(context->calendar->getTimeOrigin());
+           
          if (grid->hasAxis()) // 3D
          {
@@ -574 +577 @@
          {
             SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
-            date::CDate initDate=cal->getInitDate() ;
+            date::CDate timeOrigin=cal->getTimeOrigin() ;
 //            StdOStringStream oss2;
 //            oss2<<initDate.getYear()<<"-"<<initDate.getMonth()<<"-"<<initDate.getDay()<<" "
 //                <<initDate.getHour()<<"-"<<initDate.getMinute()<<"-"<<initDate.getSecond() ;
 //            StdString strInitdate=oss2.str() ;
-            StdString strInitdate=initDate.toString() ;
+            StdString strTimeOrigin=timeOrigin.toString() ;
             this->writeTimeAxisAttributes
                (axisid, cal->getType(),
-                StdString("seconds since ").append(strInitdate),
-                strInitdate);
+                StdString("seconds since ").append(strTimeOrigin),
+                strTimeOrigin);
          }