Changeset 1158 for XIOS/dev/dev_olga/src/duration.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/duration.cpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/duration.cpp

@@ -26 +26 @@
       }
 
+      /*!
+        This operation may not serve much, it's here because of the need of operator== from generic class CType<T>
+      */
+      bool CDuration::operator==(const CDuration& duration)
+      {
+        return (year == duration.year && month  == duration.month  && day == duration.day &&
+                hour == duration.hour && minute == duration.minute && second == duration.second && timestep == duration.timestep);        
+      }
+
       StdOStream& operator<<(StdOStream& out, const CDuration& duration)
       {
@@ -38 +47 @@
         char   c = '/';
         bool   invalidUnit = false;
+        CDuration sentinel = NoneDu;
+
+#define setDuration(unit, value)                                                  \
+        {                                                                         \
+          if (sentinel.unit)                                                      \
+            ERROR("StdIStream& operator>>(StdIStream& in , CDuration& duration)", \
+                  << "Bad duration format: " #unit " has already been set.");      \
+                                                                                  \
+          duration.unit = value;                                                  \
+          sentinel.unit = 1.0;                                                    \
+        }
 
         do
@@ -48 +68 @@
           switch (c)
           {
-            case 'y': duration.year   = v; break;
-            case 'd': duration.day    = v; break;
-            case 'h': duration.hour   = v; break;
-            case 's': duration.second = v; break;
+            case 'y': setDuration(year, v) break;
+            case 'd': setDuration(day, v) break;
+            case 'h': setDuration(hour, v) break;
+            case 's': setDuration(second, v) break;
             case 'm':
             {
               in >> c;
-              if      (c == 'i') duration.minute = v;
-              else if (c == 'o') duration.month  = v;
+              if      (c == 'i') setDuration(minute, v)
+              else if (c == 'o') setDuration(month, v)
               else invalidUnit = true;
               break;
@@ -63 +83 @@
             {
               in >> c;
-              if (c == 's') duration.timestep = v;
+              if (c == 's') setDuration(timestep, v)
               else invalidUnit = true;
               break;
@@ -76 +96 @@
                   << "Bad duration format: invalid unit, unexpected '" << c << "' character.");
         } while (in.peek() != EOF); // check whether there is a next character to read
+
+#undef setDuration
 
         return in;