Index: wflow-py/UnitTests/TestBMI.py =================================================================== diff -u -r9c33accc4863cd353267f08290367eded8705ea0 -rc3eed6a0f362cbe559022b2d24a46abf43e91dc9 --- wflow-py/UnitTests/TestBMI.py (.../TestBMI.py) (revision 9c33accc4863cd353267f08290367eded8705ea0) +++ wflow-py/UnitTests/TestBMI.py (.../TestBMI.py) (revision c3eed6a0f362cbe559022b2d24a46abf43e91dc9) @@ -63,12 +63,18 @@ print("-------------- Current time: ") print(bmiobj.get_current_time()) + a= bmiobj.get_current_time() #print(time.localtime(bmiobj.get_current_time())) os.environ['TZ'] = 'Europe/London' print("-------------- Current time (set to london): ") print(bmiobj.get_current_time()) + b = bmiobj.get_current_time() + + self.assertAlmostEquals(a,b) + + #print(time.localtime(bmiobj.get_current_time())) print("-------------- update: ") Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r9c33accc4863cd353267f08290367eded8705ea0 -rc3eed6a0f362cbe559022b2d24a46abf43e91dc9 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 9c33accc4863cd353267f08290367eded8705ea0) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision c3eed6a0f362cbe559022b2d24a46abf43e91dc9) @@ -41,6 +41,7 @@ from pcraster.framework import * from wflow_lib import * import time +import calendar def log_uncaught_exceptions(ex_cls, ex, tb): global logging @@ -1427,7 +1428,7 @@ :return: current time as seconds since epoch """ - seconds_since_epoch = time.mktime(self.datetime_firststep.utctimetuple()) + seconds_since_epoch = calendar.timegm(self.datetime_firststep.utctimetuple()) return seconds_since_epoch + (self._d_lastTimestep - self._d_firstTimestep + 1) * self._userModel().timestepsecs @@ -1436,7 +1437,7 @@ gets the start time of the model run :return: current time as seconds since epoch """ - seconds_since_epoch = time.mktime(self.datetime_firststep.utctimetuple()) + seconds_since_epoch = calendar.timegm(self.datetime_firststep.utctimetuple()) return seconds_since_epoch @@ -1450,7 +1451,8 @@ """ - seconds_since_epoch = time.mktime(self.currentdatetime.utctimetuple()) + seconds_since_epoch = calendar.timegm(self.currentdatetime.utctimetuple()) + return seconds_since_epoch def wf_supplyEpoch(self):