Changeset 1357

Timestamp:

12/06/17 08:34:31 (6 years ago)

Author:

rlacroix

Message:

Add some extra checks when switching to the next timestep.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/calendar.cpp (modified) (6 diffs)
• dev/XIOS_DEV_CMIP6/src/calendar.hpp (modified) (2 diffs)
• dev/XIOS_DEV_CMIP6/src/node/context.cpp (modified) (1 diff)
• trunk/src/calendar.cpp (modified) (6 diffs)
• trunk/src/calendar.hpp (modified) (2 diffs)
• trunk/src/node/context.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/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)
       {
         info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        this->step = step;
         return (this->currentDate = this->getInitDate() + step * this->timestep);
       }

XIOS/dev/XIOS_DEV_CMIP6/src/calendar.hpp

@@ -70 +70 @@
             virtual StdString getType(void) const;
 
+            int getStep(void) const;
+
             virtual int getMonthLength(const CDate& date) const;
 
@@ -112 +114 @@
 
          private :
+            int step;
 
             /// Propriétés privées ///

XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp

@@ -1833 +1833 @@
    void CContext::updateCalendar(int step)
    {
-      info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
-      calendar->update(step);
-      info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
-#ifdef XIOS_MEMTRACK_LIGHT
-      info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
-#endif
-      //if (hasClient) 
-      if (hasClient && !hasServer) // For now we only use server level 1 to read data
+      int prevStep = calendar->getStep();
+
+      if (prevStep < step)
       {
-        doPostTimestepOperationsForEnabledReadModeFiles();
-        garbageCollector.invalidate(calendar->getCurrentDate());
+        info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
+        calendar->update(step);
+        info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
+  #ifdef XIOS_MEMTRACK_LIGHT
+        info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
+  #endif
+
+        if (hasClient && !hasServer) // For now we only use server level 1 to read data
+        {
+          doPostTimestepOperationsForEnabledReadModeFiles();
+          garbageCollector.invalidate(calendar->getCurrentDate());
+        }
       }
+      else if (prevStep == step)
+        info(50) << "updateCalendar: already at step " << step << ", no operation done." << endl;
+      else // if (prevStep > step)
+        ERROR("void CContext::updateCalendar(int step)",
+              << "Illegal calendar update: previous step was " << prevStep << ", new step " << step << "is in the past!")
    }
 

XIOS/trunk/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)
       {
         info(20) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        this->step = step;
         return (this->currentDate = this->getInitDate() + step * this->timestep);
       }

XIOS/trunk/src/calendar.hpp

@@ -70 +70 @@
             virtual StdString getType(void) const;
 
+            int getStep(void) const;
+
             virtual int getMonthLength(const CDate& date) const;
 
@@ -112 +114 @@
 
          private :
+            int step;
 
             /// Propriétés privées ///

XIOS/trunk/src/node/context.cpp

@@ -1202 +1202 @@
    void CContext::updateCalendar(int step)
    {
-      info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
-      calendar->update(step);
-      info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
-#ifdef XIOS_MEMTRACK_LIGHT
-      info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
-#endif
-      if (hasClient)
+      int prevStep = calendar->getStep();
+
+      if (prevStep < step)
       {
-        doPostTimestepOperationsForEnabledReadModeFiles();
-        garbageCollector.invalidate(calendar->getCurrentDate());
+        info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
+        calendar->update(step);
+        info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
+  #ifdef XIOS_MEMTRACK_LIGHT
+        info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
+  #endif
+
+        if (hasClient)
+        {
+          doPostTimestepOperationsForEnabledReadModeFiles();
+          garbageCollector.invalidate(calendar->getCurrentDate());
+        }
       }
+      else if (prevStep == step)
+        info(50) << "updateCalendar: already at step " << step << ", no operation done." << endl;
+      else // if (prevStep > step)
+        ERROR("void CContext::updateCalendar(int step)",
+              << "Illegal calendar update: previous step was " << prevStep << ", new step " << step << "is in the past!")
    }