Add r1h calculation and wind lotation to -W option