error fixed: number of timesteps with valid discharge data was one too much; implications for r2 and cumulative volume in output discharge file