speedup

logical operations replaced to speed up rain field calculation