Pump Affinity Laws Modified to Include Viscosity and Gas Effects