Analysis of the high-resolution water spectrum up to the Second Triad and to J=30