The selection of water property formulae for volume and flow calibration and measurement*This updates the paper first published in [001]. (14th September 2018)