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

Misc fixes in Pump and Tank data models #3

Merged

Conversation

bobeal
Copy link
Collaborator

@bobeal bobeal commented Apr 24, 2020

No description provided.

csweetapple and others added 6 commits April 8, 2020 18:04
Remove attributes from mandatory list that do not have do be specified
or cannot be specified simultaneously.

Remove `head` attribute, as if a `head` is specified in the EPANET
network model this is a head curve. Rename the `pumpCurve` attribute
as `headCurve`.

Remove `headCurve` attribute from example, as either `headCurve` or
`power` is required, not both.
Change tank `volumeCurve` attrubute from a property to a relationship
(to a curve).
Add `valveCurve` attribute to valves. Required only when `valveType` is
`GPV`.
Change pump `efficCurve` attribute to a relationship
`timeStep` is required to define the intervals at which the
`multipliers` are to be applied.
Remove attributes from mandatory list that do not have do be specified
or cannot be specified simultaneously.

Remove `head` attribute, as if a `head` is specified in the EPANET
network model this is a head curve. Rename the `pumpCurve` attribute
as `headCurve`.

Remove `headCurve` attribute from example, as either `headCurve` or
`power` is required, not both.
Change tank `volumeCurve` attrubute from a property to a relationship
(to a curve).
AHABID and others added 4 commits May 12, 2020 14:44
Add `valveCurve` attribute and make `efficCurve` a relationship
fix wrong links
add figure sources
fix $id, fix wrong links, add figure sources
@albertoabellagarcia
Copy link
Contributor

Nice, there are a couple of questions that we will have to adapt later, any how great job.

@albertoabellagarcia albertoabellagarcia merged commit 3640abd into smart-data-models:master May 18, 2020
Copy link
Contributor

@albertoabellagarcia albertoabellagarcia left a comment

Choose a reason for hiding this comment

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

We will have to adapt later spec.md to a new format we are going to adapt (just format to make it more useful for openAPI 3.0)

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.

4 participants