Swimming and diving ready for 2011-12