Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r77cf4f27a67426009f3cdc6df0af96528d662aee -r397ac653447d63972f55fe1129e2f600094f2b39 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 77cf4f27a67426009f3cdc6df0af96528d662aee) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 397ac653447d63972f55fe1129e2f600094f2b39) @@ -134,10 +134,8 @@ self.currentDateTime = self.runStateTime self.outPutStartTime = self.currentDateTime + 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 - self.currentHour = self.currentDateTime.hour + if self.runTimeSteps < 1: # End time before start time self.runTimeSteps = 1 self.runEndTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs * self.runTimeSteps) @@ -159,10 +157,8 @@ self.outPutStartTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs) self.currentDateTime = self.runStartTime self.runEndTime = self.runStateTime + datetime.timedelta(seconds=self.timeStepSecs * runTimeSteps) - self.currentMonth = self.currentDateTime.month - self.currentYday = self.currentDateTime.timetuple().tm_yday - self.currentHour = self.currentDateTime.hour + if datetimeend: self.runEndTime = datetimeend self.runTimeSteps = (calendar.timegm(self.runEndTime.utctimetuple()) - calendar.timegm(self.runStateTime.utctimetuple()))/self.timeStepSecs @@ -174,9 +170,6 @@ self.currentTimeStep = 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 if incrementStep: self.currentTimeStep = self.currentTimeStep + 1 @@ -185,14 +178,14 @@ if currentDatetime: self.currentDateTime = currentDatetime - 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 +1 self.nextDateTime = self.currentDateTime + datetime.timedelta(seconds=self.timeStepSecs) self.lastTimeStep = self.runTimeSteps + self.currentMonth = self.currentDateTime.month + self.currentYday = self.currentDateTime.timetuple().tm_yday + self.currentHour = self.currentDateTime.hour