Changeset 334 for XIOS/trunk/src/node

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

Location:

XIOS/trunk/src/node

Files:

• context.cpp (modified) (2 diffs)
• field.cpp (modified) (2 diffs)
• field.hpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -87 +87 @@
                << "Impossible de définir un calendrier (un attribut est manquant).");
 
-#define DECLARE_CALENDAR(MType  , mtype)                            \
-   if (calendar_type.getValue().compare(#mtype) == 0)               \
-   {                                                                \
-      this->calendar =  boost::shared_ptr<date::CCalendar>          \
-         (new date::C##MType##Calendar(start_date.getValue()));     \
-      if (!this->timestep.isEmpty())                                \
-       this->calendar->setTimeStep                                  \
-          (date::CDuration::FromString(this->timestep.getValue())); \
-      return;                                                       \
+#define DECLARE_CALENDAR(MType  , mtype)                              \
+   if (calendar_type.getValue().compare(#mtype) == 0)                 \
+   {                                                                  \
+      if (time_origin.isEmpty())                                       \
+        this->calendar =  boost::shared_ptr<date::CCalendar>          \
+           (new date::C##MType##Calendar(start_date.getValue()));     \
+      else this->calendar =  boost::shared_ptr<date::CCalendar>       \
+           (new date::C##MType##Calendar(start_date.getValue(),time_origin.getValue()));     \
+      if (!this->timestep.isEmpty())                                  \
+       this->calendar->setTimeStep                                    \
+          (date::CDuration::FromString(this->timestep.getValue()));   \
+      return;                                                         \
    }
 #include "calendar_type.conf"
@@ -535 +538 @@
    void CContext::updateCalendar(int step)
    {
+      info(50)<<"updateCalendar : before : "<<calendar->getCurrentDate()<<endl ;
       calendar->update(step) ;
+      info(50)<<"updateCalendar : after : "<<calendar->getCurrentDate()<<endl ;
    }
  

XIOS/trunk/src/node/field.cpp

@@ -178 +178 @@
       *last_Write_srv = writeDate;
       writeField() ;
+      *lastlast_Write_srv=*last_Write_srv;
     }
   }
@@ -384 +385 @@
          this->freq_write_srv     =
              CDuration::FromString(this->file->output_freq.getValue());
+         this->lastlast_Write_srv     = boost::shared_ptr<xmlioserver::date::CDate>
+                        (new date::CDate(context->getCalendar()->getInitDate()));
          this->last_Write_srv     = boost::shared_ptr<xmlioserver::date::CDate>
                         (new date::CDate(context->getCalendar()->getInitDate()));

XIOS/trunk/src/node/field.hpp

@@ -141 +141 @@
          StdSize nstep;
          boost::shared_ptr<date::CDate>    last_Write, last_operation;
-         boost::shared_ptr<date::CDate>    last_Write_srv, last_operation_srv;
+         boost::shared_ptr<date::CDate>    lastlast_Write_srv,last_Write_srv, last_operation_srv;
          
          boost::shared_ptr<func::CFunctor> foperation;