This work presents an extension of the Freeflow-2D environment to support simulation of incompressible non-isothermal free-surface flows. Two mathematical models were analysed and implemented: the Boussinesq approximation, and a modification in the model proposed by V. Casulli (Casulli, 1980). The conservation equation (momentum, mass and energy) and the associated boundary conditions are discretized using finite differences on staggered grids. Numerical results obtained from simulations with the two models are presented and discussed.