Removed dublicat declaration of medium model and reformulated assignment of i_w to avoid a warning in OpenModelica.
Merge branch 'master' of https://github.com/iea-annex60/modelica-annex60