Toroidal rotation in DIII-D in electron cyclotron heating and Ohmic H-mode discharges