Optimized geometrical metrics satisfying free-stream preservation. (15th July 2020)