Comparative Evaluation of Circular Truncated-Cone and Paraboloid Shapes for Thermal Energy Storage Tank based on Thermal Stratification Performance