Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add waterquality (substance/concentration) tables #1267

Merged
merged 8 commits into from
May 6, 2024
Merged

Conversation

evetion
Copy link
Member

@evetion evetion commented Mar 14, 2024

Fixes #1125. Split from #1137

@evetion evetion changed the title Add waterquality tables Add waterquality (substance/concentration) tables Mar 14, 2024
@evetion
Copy link
Member Author

evetion commented Mar 14, 2024

There can be some bike shedding on the table names, but the tables are all required. Ideally we merge this soon, so we prevent a huge PoC merge later on, as discussed in our retro.

Copy link
Member

@visr visr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't had a look yet, but does this already incorporate the comments on #1125?

@@ -96,6 +100,22 @@ end
urban_runoff::Union{Missing, Float64}
end

@version BasinBoundaryconcentrationV1 begin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BasinBoundaryConcentration

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, that breaks some generation in the Julia code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@version BasinConcentrationV1 begin
    node_id::Int32
    time::DateTime
    substance::String
    basin::Union{Missing, Float64}  # optional, for external calculations
    drainage::Union{Missing, Float64}
    precipitation::Union{Missing, Float64}
end

@evetion
Copy link
Member Author

evetion commented May 6, 2024

After an extensive discussion with @visr, we arrived at the current setup, with split out table for the basin.

For generating concentrations (whether with Delwaq, internal) we need an initial state and boundary conditions. For control on concentrations, we only need a timeseries. Catering to both needs is complex and confusing, so we now decided to split them all out. The External table can be refactored into an external node once the functionality and/or internal concentration calculations are there.

@visr visr merged commit de935b9 into main May 6, 2024
24 checks passed
@visr visr deleted the feat/substance-tables branch May 6, 2024 15:16
SouthEndMusic added a commit that referenced this pull request Jul 29, 2024
Fixes #1610.

It turns out this needed some fixes of
#1267, as names of tables like
`Basin / concentration_external` where not generated and read properly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create external timeseries table specific for concentration timeseries results
2 participants