Move sustr and svstr calc before calc of ustar