Generalizing Cloud Overlap Treatment to Include the Effect of Wind Shear