To provide practitioners with the means to tackle problems related to poor indoor environments, building simulation and computational fluid dynamics can usefully be integrated within a sin- gle computational framework. This paper describes the outcomes from a research project sponsored by the European Com- mission, which furthered the CFD modelling aspects of the ESP-r system. The paper sum- marises the form of the CFD model and describes the method used to integrate the thermal and flow domains.