Reformulated assignment of i_w to avoid a warning in OpenModelica.
Merge branch 'openmodelica'