972110 swimming pool

Changes and additions needed to model indoor swimming pools; this work is ready for review