This is just an extension of #753 and #754 to both other model types. Tasks - [ ] `ShallowWaterModel` and all components therein - [ ] `PrimitiveDryModel` and all components therein - [ ] `PrimitiveWetModel` and all components therein