Thermal conduction in two-phase materials with spherical and non-spherical inclusions