Moved constants from defines.h to namespace in constants.h
moved thermo DEFINES to constants.h