An axisymmetric non-hydrostatic model for double-diffusive water systems