Add additional engine displacements to friction power calculation.  The friction power for the additional displacements is assumed to vary linearly with displacement, based on one of the engines with data from Lycoming.

Correct logic error that caused crash if using displacement = '540S' (or similar) to designate geared supercharged engines.