#21 replace water property in model with direct access of Water constant at various use sites