-
Notifications
You must be signed in to change notification settings - Fork 145
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
Hydronic: new fields, abstracts and equipment types #1484
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
607786b
hydronic: new fields, abstracts, equipment types
evgeniya-engel f513009
hydronic: new additions
evgeniya-engel d66984d
hydronic: new types
evgeniya-engel e0f7832
Add GUIDs to new entity types
db-robot 7b09daf
resolved conflicts
evgeniya-engel 2d38e7d
remove trailing spaces
evgeniya-engel 591a362
changed one CT type
evgeniya-engel f043fd4
changed one CT type
evgeniya-engel 7e6b661
addressed comments
evgeniya-engel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -133,6 +133,18 @@ CHWS_SWTC_WDPC_CLPM_WFRM: | |
- CLPM | ||
- WFRM | ||
|
||
CHWS_SWTC_WDPC_CLPM_WFRM_MWFRM: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How is makeup water incorporated in the CHWS? I would expect this to be on the CDWS |
||
guid: "35a284ef-332d-4e2f-b3f2-4eb94ce3d274" | ||
description: "Chilled water system with supply temperature control, differential pressure control, and thermal load, flowrate and makeup water flowrate monitoring." | ||
is_canonical: true | ||
implements: | ||
- CHWS | ||
- SWTC | ||
- WDPC | ||
- CLPM | ||
- WFRM | ||
- MWFRM | ||
|
||
CHWS_SWTC_WDPC_CLPM_WFRC: | ||
guid: "be04a7b1-1f2d-48a5-9f76-95e7f32ca1e3" | ||
description: "Chilled water system with supply temperature, differential pressure, and flowrate control, and thermal load monitoring." | ||
|
@@ -525,6 +537,54 @@ CHWS_SS_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRSWFRC_SESWTC_SEWFRM_CLPM: | |
- SEWFRM | ||
- CLPM | ||
|
||
CHWS_PWDT_SESWTC_SEWDPC_SERWFRM_WSEBYPVM: | ||
guid: "2b33f2bf-5b2f-4d73-b8ee-1f35cc08ceb8" | ||
description: "Chilled water system with primary water temperature differential monitoring, secondary supply water temperature and dirrefertial pressure control and water flowrate monitoring, and waterside economizer bypass valve." | ||
is_canonical: true | ||
implements: | ||
- CHWS | ||
- PWDT | ||
- SESWTC | ||
- SEWDPC | ||
- SERWFRM | ||
- WSEBYPVM | ||
|
||
CHWS_SWTC_WDPC_BYPVFRC_WSEBYPVM_MCBYPVM_CLPM: | ||
guid: "dc89a367-2774-4564-864f-c66da0ab8a86" | ||
description: "Chilled water system with differential pressure control, mechanical cooling bypass, waterside economizer bypass and cooling thermal power monitoring." | ||
is_canonical: true | ||
implements: | ||
- CHWS | ||
- SWTC | ||
- WDPC | ||
- BYPVFRC | ||
- WSEBYPVM | ||
- MCBYPVM | ||
- CLPM | ||
|
||
CHWS_SWTC_WDPC_BYPVFRC_WSEBYPVM_MCBYPVM: | ||
guid: "36602528-dfbb-4922-aeae-ba756be83d55" | ||
description: "Chilled water system with differential pressure control, mechanical cooling bypass and waterside economizer bypass." | ||
is_canonical: true | ||
implements: | ||
- CHWS | ||
- SWTC | ||
- WDPC | ||
- BYPVFRC | ||
- WSEBYPVM | ||
- MCBYPVM | ||
|
||
CHWS_SESWTC_SEWDPC_WSEBYPVM: | ||
guid: "503d5173-65a9-422a-9788-c7c00f2196a2" | ||
description: "Chilled water system with secondary supply water temperature and differential pressure control and waterside economizer bypass." | ||
is_canonical: true | ||
implements: | ||
- CHWS | ||
- SESWTC | ||
- SEWDPC | ||
- SEWFRM | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is |
||
- WSEBYPVM | ||
|
||
################################### | ||
### Existing Non-standard Types ### | ||
################################### | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove comment