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

Timestamp:

03/30/12 17:06:38 (12 years ago)

Author:

ymipsl

Message:

remove "date" namespace

ym

File:

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

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -482 +482 @@
  //        ARRAY(double, 1) field_data = field->data_srv;
          ARRAY_CREATE(time_data, double, 1, [1]);
-         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 (field->operation.getValue()=="instant") (*time_data)[0] = Time(*field->last_Write_srv)
+                                                                      -Time(context->calendar->getTimeOrigin());
+         else (*time_data)[0] = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2
+                               -Time(context->calendar->getTimeOrigin());
            
          if (grid->hasAxis()) // 3D
@@ -562 +562 @@
       void CNc4DataOutput::writeTimeAxis_
                   (const boost::shared_ptr<tree::CField>    field,
-                   const boost::shared_ptr<date::CCalendar> cal)
+                   const boost::shared_ptr<CCalendar> cal)
       {
          StdOStringStream oss;
@@ -576 +576 @@
          {
             SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
-            date::CDate timeOrigin=cal->getTimeOrigin() ;
+            CDate timeOrigin=cal->getTimeOrigin() ;
 //            StdOStringStream oss2;
 //            oss2<<initDate.getYear()<<"-"<<initDate.getMonth()<<"-"<<initDate.getDay()<<" "