CFD Simulation of Melting and Solidification of PCM in Thermal Energy Storage Systems of Different Geometry