Changeset 535 for XIOS/branchs/xios-1.0/src/node/context.cpp

Timestamp:

12/11/14 11:45:48 (9 years ago)

Author:

rlacroix

Message:

Backport r534 to XIOS 1.0: Add an error message when the timestep was not configured by the user.

Previously no error message was displayed but the output file(s) was not written.

Also improve the error message when the calendar type or the start date is missing.

File:

• XIOS/branchs/xios-1.0/src/node/context.cpp (modified) (2 diffs)

XIOS/branchs/xios-1.0/src/node/context.cpp

@@ -73 +73 @@
    {
       if (this->calendar.get() != NULL) return;
-      if (calendar_type.isEmpty() || start_date.isEmpty())
+      if (calendar_type.isEmpty())
          ERROR(" CContext::solveCalendar(void)",
                << "[ context id = " << this->getId() << " ] "
-               << "Impossible to define a calendar (an attribute is missing).");
+               << "Impossible to define a calendar: the calendar type is missing.");
+      if (start_date.isEmpty())
+         ERROR(" CContext::solveCalendar(void)",
+               << "[ context id = " << this->getId() << " ] "
+               << "Impossible to define a calendar: the start date is missing.");
+      if (timestep.isEmpty())
+         ERROR(" CContext::solveCalendar(void)",
+               << "[ context id = " << this->getId() << " ] "
+               << "Impossible to define a calendar: the timestep is missing.");
 
 #define DECLARE_CALENDAR(MType  , mtype)                              \
@@ -86 +94 @@
       else this->calendar =  boost::shared_ptr<CCalendar>       \
            (new C##MType##Calendar(start_date.getValue(),time_origin.getValue()));     \
-      if (!this->timestep.isEmpty())                                  \
-       this->calendar->setTimeStep                                    \
+      this->calendar->setTimeStep                                     \
           (CDuration::FromString(this->timestep.getValue()));   \
       return;                                                         \