Add rs.rech.non.irr dataset, rework recharge processing