Allow grid based basin and water user definitions and facilitate subsetting of subgrid-df

Allow grid based basin and water user definitions and facilitate subsetting of subgrid-df #1529