Merged new psychrometric functions from Annex60