irrig_netereq calc in routing as before, irrigation_net calculated in hydro when no routing but irrigation. Should solve vegtot problem, but is temporal