Towards an improved and more flexible representation of water stress in coupled photosynthesis