Changed the evaluation of omega to be a function of both omega in the viscous
sublayer and omega in the log region