added parameters of data and time completion to input file. added auxiliary functions to use this data in other places.
resolving conflicts
Merge branch 'master' of https://github.com/cassisnaro/AMMM_project