Changeset 532 for XIOS/trunk/src/node/context.cpp

Timestamp:

12/10/14 14:27:09 (9 years ago)

Author:

rlacroix

Message:

Add a new attribute type for dates and use it for the context's start_date and time_origin.

The "xios_date" type should now be used to get/set date attributes through the Fortran interface. This avoids using strings to manipulate dates.

File:

• XIOS/trunk/src/node/context.cpp (modified) (2 diffs)

XIOS/trunk/src/node/context.cpp

@@ -74 +74 @@
       this->calendar = newCalendar;
       calendar_type.fromString(this->calendar->getId());
-      start_date.setValue(this->calendar->getInitDate().toString());
+      start_date.setValue(this->calendar->getInitDate());
    }
 
@@ -87 +87 @@
                << "Impossible to define a calendar (an attribute is missing).");
 
-#define DECLARE_CALENDAR(MType, eType)                                              \
-   if (calendar_type.getValue() == eType)                                           \
-   {                                                                                \
-      if (time_origin.isEmpty())                                                    \
-        this->calendar = boost::shared_ptr<CCalendar>                               \
-            (new C##MType##Calendar(start_date.getValue()));                        \
-      else this->calendar = boost::shared_ptr<CCalendar>                            \
-            (new C##MType##Calendar(start_date.getValue(),time_origin.getValue())); \
-      if (!this->timestep.isEmpty())                                                \
-        this->calendar->setTimeStep                                                 \
-            (CDuration::FromString(this->timestep.getValue()));                     \
-      return;                                                                       \
-   }
+#define DECLARE_CALENDAR(MType, eType)                                             \
+  if (calendar_type.getValue() == eType)                                           \
+  {                                                                                \
+    if (time_origin.isEmpty())                                                     \
+      this->calendar = boost::shared_ptr<CCalendar>                                \
+          (new C##MType##Calendar(start_date.getValue()));                         \
+    else this->calendar = boost::shared_ptr<CCalendar>                             \
+          (new C##MType##Calendar(start_date.getValue(), time_origin.getValue())); \
+                                                                                   \
+    if (!start_date.getValue().setRelCalendar(*this->calendar))                    \
+      ERROR("CContext::solveCalendar(void)",                                       \
+            "start_date: Bad format or date not conform to the calendar");         \
+    if (!time_origin.getValue().setRelCalendar(*this->calendar))                   \
+      ERROR("CContext::solveCalendar(void)",                                       \
+            "time_origin: Bad format or date not conform to the calendar");        \
+                                                                                   \
+    if (!this->timestep.isEmpty())                                                 \
+      this->calendar->setTimeStep                                                  \
+          (CDuration::FromString(this->timestep.getValue()));                      \
+    return;                                                                        \
+  }
 #include "calendar_type.conf"
 #undef DECLARE_CALENDAR