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

Steam and hvac additions #1342

Merged
merged 39 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
49df2c9
hvac and steam updates so far
shambergoldstein May 3, 2024
ba39aa7
more additions
shambergoldstein May 16, 2024
3eed9c4
Merge branch 'steam_and_hvac_additions' of https://github.com/shamber…
shambergoldstein May 16, 2024
8b4dfea
Update ABSTRACT.yaml descriptions and guids
shambergoldstein May 16, 2024
21e83d2
Update telemetry_fields.yaml
shambergoldstein May 16, 2024
304cf93
Update AHU.yaml add guids
shambergoldstein May 16, 2024
7980b73
Update CU.yaml add guids
shambergoldstein May 16, 2024
1f90bf3
Update FCU.yaml add guids
shambergoldstein May 16, 2024
2c68b94
Update MAU.yaml add guids
shambergoldstein May 16, 2024
90357d9
Update PCU.yaml add guid
shambergoldstein May 16, 2024
910cd2a
Update PMP.yaml
shambergoldstein May 16, 2024
bff903c
Update telemetry_fields.yaml
shambergoldstein May 16, 2024
90d1a80
more hvac additions
shambergoldstein May 24, 2024
b1d7148
Merge branch 'google:master' into steam_and_hvac_additions
shambergoldstein May 24, 2024
fd2c234
Update CU.yaml; add guid
shambergoldstein May 24, 2024
eed0578
Update FCU.yaml; add guid
shambergoldstein May 24, 2024
63c5435
Update MAU.yaml; add guids
shambergoldstein May 24, 2024
5b02960
Merge branch 'google:master' into steam_and_hvac_additions
shambergoldstein Jun 3, 2024
226519c
Update CU.yaml
shambergoldstein Jun 4, 2024
64f63d0
Update ABSTRACT.yaml
shambergoldstein Jun 4, 2024
9a1eb30
Update telemetry_fields.yaml
shambergoldstein Jun 4, 2024
322d54a
Update MAU.yaml
shambergoldstein Jun 4, 2024
4845ef2
Update CU.yaml
shambergoldstein Jun 4, 2024
b9147ff
Merge branch 'master' into steam_and_hvac_additions
shambergoldstein Jun 4, 2024
b8e2491
Update telemetry_fields.yaml
shambergoldstein Jun 4, 2024
dd7d558
Update AHU.yaml
shambergoldstein Jun 4, 2024
a29bc40
Update MAU.yaml
shambergoldstein Jun 4, 2024
9f1490f
Update FCU.yaml
shambergoldstein Jun 5, 2024
d0debc5
Update AHU.yaml
shambergoldstein Jun 5, 2024
0df36d3
Merge branch 'google:master' into steam_and_hvac_additions
shambergoldstein Jun 13, 2024
4d233ae
Update AHU.yaml
shambergoldstein Jun 13, 2024
b035c74
Update AHU.yaml
shambergoldstein Jun 13, 2024
5354847
Merge branch 'google:master' into steam_and_hvac_additions
shambergoldstein Jun 18, 2024
1f5fd6f
Update ABSTRACT.yaml
shambergoldstein Jun 18, 2024
2271956
Update MAU.yaml
shambergoldstein Jun 18, 2024
93ce131
Update ABSTRACT.yaml
shambergoldstein Jun 18, 2024
e31fcd3
Update MAU.yaml
shambergoldstein Jun 18, 2024
498eb30
Update AHU.yaml
shambergoldstein Jun 18, 2024
e05a8cf
Merge branch 'master' into steam_and_hvac_additions
shambergoldstein Jun 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 129 additions & 5 deletions ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/AHU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4524,6 +4524,51 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
- RD
- UV

AHU_SFSS_SFVSC_EFSS_EFVSC_CHW2XSC_SSVC_CO2CMAX_ECON_SSPC:
guid: "7bde22a0-19c3-4755-b9d4-a41fd4b54a8e"
description: "Multi-zone AHU with supply and exhaust fans, co2 control, two chilled water and one steam valve control to supply air, and economizing."
is_canonical: true
implements:
- AHU
- SFSS
- SFVSC
- EFSS
- EFVSC
- CHW2XSC
- SSVC
- CO2CMAX
- ECON
- SSPC

AHU_SFSS_SFVSC_CHW2XSC_SSVC_ECON_SSPC:
guid: "4520481a-167e-4767-9e3e-cd5a21624776"
description: "Multi-zone AHU with supply fan control, two chilled water and one steam valve control to supply air, and economizing."
is_canonical: true
implements:
- AHU
- SFSS
- SFVSC
- CHW2XSC
- SSVC
- ECON
- SSPC

AHU_SFSS_SFVSC_CHWSC_HTSC_ECON_SARC_SSPC_FDPM_ZTM:
guid: "b270b104-aed8-40c3-80b5-bd991e3ed102"
description: "Multi-zone AHU with supply fan control, chilled water and electric heater control to supply air, economizing, filter differential pressure and zone temperature monitoring."
is_canonical: true
implements:
- AHU
- SFSS
- SFVSC
- CHWSC
- HTSC
- ECON
- SARC
- SSPC
- FDPM
- ZTM
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved

AHU_BSPC_DX5SC_ECONM_EDM_EFSS_EFVSC_SFSS4X_SFVSC4X_SSPC_SARC:
guid: "befd596e-5a4b-4c64-b045-7f546ada3e96"
description: "Multi-zone AHU with 5 compressors, exhaust damper monitoring, economizer controlling to MAT setpoint, and variable speed exhaust and four supply fans."
Expand Down
85 changes: 85 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/CU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_SARC_MTM_FDPM_CAM:
- FDPM
- CAM

CU_SFSS_SFVSC_CHWSDC_HTSDC_SSPC_RTM:
guid: "cc27b007-3427-4d17-b07b-31f4cdcbf700"
description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (dual setpoint supply temp control)."
is_canonical: true
implements:
- CU
- SFSS
- SFVSC
- CHWSDC
- HTSDC
- SSPC
- RTM

CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
guid: "15e39197-05fa-4b52-9473-5e0bccb883e5"
description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
Expand All @@ -91,6 +104,78 @@ CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM_RTM:
- RTM
- CHWDT

CU_SFSS_SFVSC_CHWSC_HTSC_SSPC_MTM_RTM:
guid: "6b48ff18-d05c-427e-8315-a792c01be753"
description: "Chilled water compartment unit with start/stop, status, cooling and heating (supply temp control)."
is_canonical: true
implements:
- CU
- SFSS
- SFVSC
- CHWSC
- HTSC
- SSPC
- MTM
- RTM

CU_SFSS_SFVSC_CHWSC_CHWDT_HTSC_SSPC_SARC_MTM:
guid: "bb90002e-fe38-41b8-b9ba-5094928f676b"
description: "Chilled water compartment unit on supply side with start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
is_canonical: true
implements:
- CU
- SFSS
- SFVSC
- CHWSC
- CHWDT
- HTSC
- SSPC
- SARC
- MTM

CU_SFSS2X_SFVSC2X_CHWSC_CHWDT_HTSC_SSPC_MTM:
guid: "bccd555b-864f-4b66-a084-fa29ce28e770"
description: "Chilled water compartment unit with two fan start/stop, status, cooling and heating (supply temp control), and differential temperature monitoring."
is_canonical: true
implements:
- CU
- SFSS2X
- SFVSC2X
- CHWSC
- CHWDT
- HTSC
- SSPC
- MTM

CU_DSP_DFSS_DFVSC_CHW2XDC_HTDC_FDPM_MTM_CAM_CO2M:
guid: "8af7abce-3d69-4380-bb90-d8690050b238"
description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
is_canonical: true
implements:
- CU
- DSP
- DFSS
- DFVSC
- CHW2XDC
- HTDC
- FDPM
- MTM
- CAM
- CO2M

CU_DSP_DFSS_DFVSC_CHWDC_HTDC_RTM_CO2M:
description: "Single zone chilled water compartment unit with start/stop, status, cooling and heating (discharge temp control)."
is_canonical: true
implements:
- CU
- DSP
- DFSS
- DFVSC
- CHWDC
- HTDC
- RTM
- CO2M

###################################
### Existing Non-standard Types ###
###################################
Expand Down
38 changes: 38 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/FCU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,18 @@ FCU_DFSS_ZTC_ZHDHC_DXZTC:
- ZHDHC
- DXZTC

FCU_DFSS_CHWZTC_CHWDT_HTZTC_ZHDHC:
guid: "98df75a0-f985-4b76-a78d-3a2e9d3b791c"
description: "Chilled water fan coil with zone humidity and temp control."
is_canonical: true
implements:
- FCU
- DFSS
- CHWZTC
- CHWDT
- HTZTC
- ZHDHC

FCU_DFSS_CSP_ZHC_DXZC:
guid: "a705848f-4a8e-4ed5-9197-f8f10e039f53"
description: "DX fan coil with zone temp and humidity control."
Expand Down Expand Up @@ -1176,6 +1188,32 @@ FCU_DFSS_CHWZTC_CHWDT_CAM_ZHC:
- CAM
- ZHC

FCU_DFSS_CHWZTC_CHWDT_ZHC_DTM_RTM:
guid: "e1d8907d-d1f6-4492-bf6f-bc5e38601b36"
description: "Chilled water FCU with zone temperature control and chilled water valve control"
is_canonical: true
implements:
- FCU
- DFSS
- CHWZTC
- CHWDT
- ZHC
- DTM
- RTM

FCU_DFSS2X_CHWZC_CHWDT_ZHM_DTM_RTM:
guid: "ea6137f5-0218-479e-83fb-3ab2efca7d29"
description: "Chilled water FCU with zone temperature control and chilled water valve control"
is_canonical: true
implements:
- FCU
- DFSS2X
- CHWZC
- CHWDT
- ZHM
- DTM
- RTM

FCU_DFSS_ZTC:
guid: "62c81f76-c539-461d-837d-d01b89a4e9da"
description: "Chilled water FCU with binary mode (open/closed) and zone temperature control"
Expand Down
4 changes: 4 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ FCU:
- lost_power_alarm
- smoke_alarm
- failed_alarm
- emergency_alarm
- fire_alarm
implements:
- EQUIPMENT

Expand All @@ -67,6 +69,7 @@ AHU:
- outside_air_flowrate_requirement # Included at AHU because, regardless of avaiable data for OAD, it will have ventilation requirements.
- failed_communication_alarm
- smoke_alarm
- emergency_alarm

HX:
guid: "9aa0dd1a-851c-4d4e-90da-6804c4f8b9f9"
Expand Down Expand Up @@ -102,6 +105,7 @@ MAU:
opt_uses:
- failed_communication_alarm
- failed_alarm
- emergency_alarm
implements:
- EQUIPMENT

Expand Down
61 changes: 60 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/MAU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ MAU_DFSS_DSP_FDPM_HT2ZC_OAFC:

MAU_DFSS_DFVSC_HTDC_ZTM:
guid: "80381ee4-6ab6-4a26-bf96-6cb809f3a600"
description: "Single zone heating make-up air unit."
description: "Single zone heating make-up air unit with zone temperature monitoring."
is_canonical: true
implements:
- MAU
Expand All @@ -511,6 +511,25 @@ MAU_DFSS_DFVSC_HTDC_ZTM:
- HTDC
- ZTM

MAU_DFSS_DFVSC_HTDC:
guid: "6d2519ce-ede3-4bbd-ba18-0084bfd7cbf7"
description: "Single zone heating make-up air unit."
is_canonical: true
implements:
- MAU
- DFSS
- DFVSC
- HTDC

MAU_DFSS_HTDC:
guid: "f23aed1d-0043-49c3-b793-9b08f8273bbd"
description: "Single zone heating make-up air unit with start/stop control."
is_canonical: true
implements:
- MAU
- DFSS
- HTDC

MAU_DFSS_DFVSC_HTDC_CO2CMAX:
guid: "9eff969b-9cff-46c0-be0a-1ee317d6987b"
description: "Mechanical room heating make-up air unit with multi-zone co2 control."
Expand Down Expand Up @@ -792,6 +811,46 @@ MAU_SFSS2X_SFVSC2X_PHWSC_LCC_HWSC_SSPC_UV_SHM:
- UV
- SHM

MAU_DFSS_DFVSC_CHWDC_CHCPC_CHWISOVM_PHSC_DSVC_OADM_OA_ZTM_ZHM_CO2M_CAM:
guid: "d50d41d6-f7bf-4ec2-937f-b7e72ce56b4c"
description: "Single-zone MAU with preheating steam control, chilled water control, and heating steam control"
is_canonical: true
implements:
- MAU
- DFSS
- DFVSC
- CHWDC
- CHCPC
- CHWISOVM
- PHSC
- DSVC
- OADM
- OA
- ZTM
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
- ZHM
- CO2M
- CAM

MAU_DSP_DFSS_DFVSC_CHW2XDC_CHCPC_CHWISOVM_HTDC_FDPM_OADM_OA_DSPM_ZHC_CAM:
guid: "32dd1642-fcd5-4e1f-a422-42a5dacb6e0e"
description: "Single zone MAU with dual zone temperture setpoint control, heating valve and dual chilled water valve control on the discharge side, and variable speed discharge fan control."
is_canonical: true
implements:
- MAU
- DSP
- DFSS
- DFVSC
- CHW2XDC
- CHCPC
- CHWISOVM
- HTDC
- FDPM
- OADM
- OA
- DSPM
- ZHC
- CAM

MAU_DFSS2X_DFVSC2X_DXDC_HWDC:
guid: "7132bf0f-160a-4b3d-aaed-ad313787fe61"
description: "Variable speed with two discharge fans, hydronic heating and dx cooling make-up air unit."
Expand Down
11 changes: 10 additions & 1 deletion ontology/yaml/resources/HVAC/entity_types/PCU.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,13 @@ PCU_EFSS_EFVSC_ESM2X_DTPM:
- EFSS
- EFVSC
- ESM2X
- DTPM
- DTPM

PCU_EFSS_DTPM:
guid: "766bc88a-f43c-453b-9dea-d0db652cd3d4"
description: "Pollution control unit with single speed exhaust fan and one detergent pump."
is_canonical: true
implements:
- PCU
- EFSS
- DTPM
10 changes: 10 additions & 0 deletions ontology/yaml/resources/HVAC/entity_types/PMP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ PMP_SS_CHWISOVPM_VSFC:
- low_differential_pressure_alarm
- chilled_water_differential_pressure_setpoint

PMP_SS_CHWISOVPM_VSC:
guid: "6ee2c381-b2f1-455a-9d0c-59b48cab5b4c"
description: "PMP device with chilled water valve and pump speed percentage control"
is_canonical: true
implements:
- PMP
- SS
- CHWISOVPM
- VSC

PMP_SS_VSC_WDPC_WFRC:
guid: "626cf14c-537c-4dbf-85e1-1ed6d68d5aa3"
description: "Pump with variable speed control, differential pressure control and flow control."
Expand Down
2 changes: 2 additions & 0 deletions ontology/yaml/resources/METERS/entity_types/HM.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ HM_CHW:
opt_uses:
- differential_temperature_sensor
- failed_alarm
- failed_chilled_return_water_temperature_alarm
- failed_chilled_supply_water_temperature_alarm

HM_CHW_WAC:
guid: "441029f3-1324-42c5-aca2-74138500917a"
Expand Down
Loading
Loading