Index: wflow-py/Scripts/pcr2netcdf.py =================================================================== diff -u -rc64daff845da4d568722cd9d4114bae4bf5582df -r4176aff676d41c7e8ec3f8fb7274669acf0b4d2c --- wflow-py/Scripts/pcr2netcdf.py (.../pcr2netcdf.py) (revision c64daff845da4d568722cd9d4114bae4bf5582df) +++ wflow-py/Scripts/pcr2netcdf.py (.../pcr2netcdf.py) (revision 4176aff676d41c7e8ec3f8fb7274669acf0b4d2c) @@ -366,10 +366,10 @@ ed = min(dt.datetime(yrs+1,1,1), end) if tdelta == "days": - r = (ed-dt.datetime(yrs,1,1)).days + 1 + r = (ed-dt.datetime(yrs,1,1)).days ret.append([dt.datetime(yrs,1,1)+dt.timedelta(days=i) for i in range(r)]) else: - r = ((ed-dt.datetime(yrs,1,1)).days + 1) * 24 + r = ((ed-dt.datetime(yrs,1,1)).days) * 24 ret.append([dt.datetime(yrs,1,1)+dt.timedelta(hours=i) for i in range(r)]) return ret Index: wflow-py/wflow/wflow_adapt.py =================================================================== diff -u -r4e5a1fe8152659a68db505e39fd3aedea2dac0e9 -r4176aff676d41c7e8ec3f8fb7274669acf0b4d2c --- wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision 4e5a1fe8152659a68db505e39fd3aedea2dac0e9) +++ wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision 4176aff676d41c7e8ec3f8fb7274669acf0b4d2c) @@ -452,6 +452,8 @@ """ Gets the starttime from the FEWS runinfo file """ + + #TODO: return the timezone information... if os.path.exists(xmlfile): file = open(xmlfile, "r") tree = parse(file) @@ -461,6 +463,7 @@ if len(ttime) == 12: # Hack for millisecons in testrunner runinfo.xml... ttime = ttime.split('.')[0] ed = datetime.strptime(edate.attrib['date'] + ttime,'%Y-%m-%d%H:%M:%S') + ed = pa else: return None