Added new boiler model implementations

New boiler model implementations as described in https://github.com/open-ideas/IDEAS/issues/45#.
I'm not sure I understand why you have this extra if-statement.