In the first version SWADEX-I we were able to observe outward transport of the angular momentum in viscoelastic shear flows. However, the shear flow profile was not that of an accretion disk. For this, the water surface must have a 1/r profile and not the one at the bottom. For SWADEX-II, a water tornado should now enable the 1/r profile at the water surface. We have developed a prototype for the generation of a stable water tornado.