Changeset 1460 for XIOS/dev/branch_openmp/src/calendar.cpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/src/calendar.cpp (modified) (6 diffs)

XIOS/dev/branch_openmp/src/calendar.cpp

@@ -9 +9 @@
       CCalendar::CCalendar(void)
          : CObject()
+         , step(0)
          , initDate(*this)
          , timeOrigin(*this)
@@ -16 +17 @@
       CCalendar::CCalendar(const StdString& id)
                : CObject(id)
+               , step(0)
                , initDate(*this)
                , timeOrigin(*this)
@@ -25 +27 @@
                            int hr /*= 0*/, int min /*= 0*/, int sec /*= 0*/)
                : CObject(id)
+               , step(0)
                , initDate(*this)
                , timeOrigin(*this)
@@ -34 +37 @@
       CCalendar::CCalendar(const StdString& id, const CDate& startDate)
                : CObject(id)
+               , step(0)
                , initDate(startDate)
                , timeOrigin(startDate)
@@ -44 +48 @@
       CCalendar::CCalendar(const StdString& id, const CDate& startDate, const CDate& timeOrigin)
                : CObject(id)
+               , step(0)
                , initDate(startDate)
                , timeOrigin(timeOrigin)
@@ -115 +120 @@
       }
 
+      int CCalendar::getStep(void) const
+      {
+        return step;
+      }
+
       const CDate& CCalendar::update(int step)
       {
         #pragma omp critical (_output)
         info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        this->step = step;
         return (this->currentDate = this->getInitDate() + step * this->timestep);
       }