20210301 Chiller merge v2 by tkwong | SimScale