Partial Upgrading of Oilsands Bitumen and Heavy Oil: Kinetic Modeling and Reactor Design