Extensions for Multi-Period MINLP Superstructure Formulation for Integration of Thermal Energy Storages in Industrial Processes