If you want to order tap water though in a restaurant, please specify Un vaso de agua (a glass of water) or Agua de grifo (Tap water). They should not make you pay for that. Enjoy your time in Barcelona, since it seems you finally are not having that bad luck with the weather....