Added 'each' qualifier to unit declaration to avoid warning in OpenModelica
Simplified inheritance structure of ConstantPropertyLiquidWater to avoid an error in OpenModelica