merge discretize_switched from tank_functions into abstract.discretization
update imports after moving discretize_switched, rm tank_functions