Development of scaling prediction tools for solar hot water systems. Part B - Development of an improved calcium carbonate scaling rate model - An experimental and analytical investigation