A refined diagnostic wind model