My basic idea is that as a additional preference of a training room, designating swimming exercises seperately to a training room (which can also be applied to individuals and groups to differentiate swimming skills) will allow dwarves to accrue swimming experience and introduce them to water more regularly, therefore reducing the risk of drowning and fear of pathing into water deliberately or accidentally for whatever purpose.
This in itself has some player influenced architectural implications. For instance, a typical 'kiddie pool' would probably be no bigger than 2x2 and entirely self contained with ramps to promote fast exit even if the room is bigger than that. Introducing larger and deeper pools for more intermediate dwarves, with a spot of live training thrown in on the cards. In these water based scenarios in squads rather than individually the most swimming professional available dwarf is entrusted to act as a lifeguard should any fellow squaddie become dangerously tired and begin to drown, responsible for bringing them to the surface or the shore with at-least one hand free in order to avoid accidents.
Armour training and light encumbrance weapons are essentially vital to these scenarios for safety. It would also help blur the lines on military training and help encourage players to introduce themselves to the military system.
Feedback and opinons on my idea would be great. Thanks.