A Comprehensive Coal Conversion Model Extended to Oxy-Coal Conditions