Harmonize hydrometry branch with main

[goldma99]

I want to retrieve several more hydrometry variables to use as matching covariates (like flow). This harmonization will let me keep working on branch 17-hydrometry