Use constant intermediate quantities.
Merge remote-tracking branch 'bska/master'

Conflicts:
	ImpesTPFAAD.hpp