Formulas and tables for the calculation of mutual and self-inductance (Revised)