Index: wflow-py/wflow/wf_DynamicFramework.py
===================================================================
diff -u -r7fa2d7826eac3d0aa65a1a1292f782fa30ff96c1 -r1f872a3d10a5301f8f4f97fc1a43ebc3861ed316
--- wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 7fa2d7826eac3d0aa65a1a1292f782fa30ff96c1)
+++ wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 1f872a3d10a5301f8f4f97fc1a43ebc3861ed316)
@@ -62,7 +62,8 @@
         else:
             self.runStateTime = self.runStartTime
 
-        self.outPutStartTime = self.runStartTime + datetime.timedelta(seconds=self.timeStepSecs)
+        self.currentDateTime = self.runStateTime
+        self.outPutStartTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs)
         self.runTimeSteps = (calendar.timegm(self.runEndTime.utctimetuple()) - calendar.timegm(self.runStateTime.utctimetuple()))/self.timeStepSecs
         self.currentMonth = self.currentDateTime.month
         self.currentYday = self.currentDateTime.timetuple().tm_yday
@@ -90,7 +91,7 @@
                 self.runStateTime = self.runStartTime - datetime.timedelta(seconds=self.timeStepSecs)
             else:
                 self.runStateTime = self.runStartTime
-            self.outPutStartTime = self.runStartTime + datetime.timedelta(seconds=self.timeStepSecs)
+            self.outPutStartTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs)
 
         if datetimestart:
             self.runStartTime = datetimestart
@@ -100,7 +101,9 @@
                 self.runStateTime = self.runStartTime - datetime.timedelta(seconds=self.timeStepSecs)
             else:
                 self.runStateTime = self.runStartTime
-            self.outPutStartTime = self.runStartTime + datetime.timedelta(seconds=self.timeStepSecs)
+                self.currentDateTime = self.runStateTime
+
+            self.outPutStartTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs)
             self.runTimeSteps = (calendar.timegm(self.runEndTime.utctimetuple()) - calendar.timegm(self.runStateTime.utctimetuple()))/self.timeStepSecs
             self.currentMonth = self.currentDateTime.month
             self.currentYday = self.currentDateTime.timetuple().tm_yday
@@ -114,7 +117,9 @@
                 self.runStateTime = self.runStartTime - datetime.timedelta(seconds=self.timeStepSecs)
             else:
                 self.runStateTime = self.runStartTime
-            self.outPutStartTime = self.runStartTime + datetime.timedelta(seconds=self.timeStepSecs)
+                self.currentDateTime = self.runStateTime
+
+            self.outPutStartTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs)
             self.runEndTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs * runTimeSteps)
             self.currentMonth = self.currentDateTime.month
             self.currentYday = self.currentDateTime.timetuple().tm_yday
@@ -126,7 +131,7 @@
 
         if currentTimeStep:
             self.currentTimeStep = currentTimeStep
-            self.currentDateTime = self.runStartTime + datetime.timedelta(seconds=self.timeStepSecs * (self.currentTimeStep))
+            self.currentDateTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs * (self.currentTimeStep -1))
             self.currentMonth = self.currentDateTime.month
             self.currentYday = self.currentDateTime.timetuple().tm_yday
             self.currentHour = self.currentDateTime.hour
@@ -136,7 +141,7 @@
             self.currentMonth = self.currentDateTime.month
             self.currentYday = self.currentDateTime.timetuple().tm_yday
             self.currentHour = self.currentDateTime.hour
-            self.currentTimeStep = (calendar.timegm(self.currentDateTime.utctimetuple()) - calendar.timegm(self.runStateTime.utctimetuple()))/self.timeStepSecs
+            self.currentTimeStep = (calendar.timegm(self.currentDateTime.utctimetuple()) - calendar.timegm(self.runStateTime.utctimetuple()))/self.timeStepSecs +1