When I do a water change to my tank I siphon out the required amount of water and then take the temperature of the water remaining in the tank. I then add the freshly treated water at the same temperature as that still in the tank. Job done and no shock to the fish.