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

[HVAC] Remove Unused Non-Canonicals #1333

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c330fa0
Update MAU.yaml
shambergoldstein May 2, 2024
455654e
Update BLR.yaml
shambergoldstein May 2, 2024
6cd7da3
Update CHWS.yaml
shambergoldstein May 2, 2024
a875e81
Update CH.yaml
shambergoldstein May 2, 2024
9658e4b
Update CRREF.yaml
shambergoldstein May 2, 2024
e905e29
Update CT.yaml
shambergoldstein May 2, 2024
94ca24f
Update DFR.yaml
shambergoldstein May 2, 2024
683859c
Update DMP.yaml
shambergoldstein May 2, 2024
4161027
Update FCU.yaml
shambergoldstein May 2, 2024
52d565d
Update HUM.yaml
shambergoldstein May 2, 2024
153ad48
Update HWS.yaml
shambergoldstein May 2, 2024
9f86f75
Update PMP.yaml
shambergoldstein May 2, 2024
5592f02
Update VAV.yaml
shambergoldstein May 2, 2024
b3e79de
Update VAV.yaml
shambergoldstein May 2, 2024
6e7854d
Update RP.yaml
shambergoldstein May 2, 2024
0348660
Update RSR.yaml
shambergoldstein May 2, 2024
ad4f15a
Update HWS.yaml
shambergoldstein May 2, 2024
8c3ad95
Update FCU.yaml
shambergoldstein May 2, 2024
a104fa4
Update DWST.yaml
shambergoldstein May 2, 2024
82dc40c
Update DH.yaml
shambergoldstein May 2, 2024
ad15ce9
Update CT.yaml
shambergoldstein May 2, 2024
cc5507b
Update CH.yaml
shambergoldstein May 2, 2024
3722455
Update AHU.yaml
shambergoldstein May 2, 2024
1e737c8
Merge branch 'google:master' into remove_unused_noncanonicals
shambergoldstein May 2, 2024
321566a
Merge branch 'master' into remove_unused_noncanonicals
cstirdivant Sep 4, 2024
9560dbf
Update CRREF.yaml
shambergoldstein Sep 5, 2024
a60ffd7
Update FCU.yaml
shambergoldstein Sep 5, 2024
9f9b517
Merge branch 'master' into remove_unused_noncanonicals
shambergoldstein Sep 5, 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
338 changes: 0 additions & 338 deletions ontology/yaml/resources/HVAC/entity_types/AHU.yaml

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions ontology/yaml/resources/HVAC/entity_types/BLR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,6 @@ BLR_HT2SWC_RWTM:
### Existing Non-standard Types ###
###################################

BLR_SS_SWTC_NONCANONICAL_1:
guid: "bf45f546-498d-422e-bf6f-15242360e3af"
description: "Non-standard type."
implements:
- BLR_SS_SWTC
- INCOMPLETE
uses:
- bypass_valve_percentage_command

BLR_SS_SWTC_NONCANONICAL_2:
guid: "19af4bb1-af89-4aef-a63a-a2729bb4ee6a"
description: "Non-standard type."
Expand All @@ -313,15 +304,6 @@ BLR_SS_SWTC_NONCANONICAL_2:
uses:
- heating_stage_run_count

BLR_SS_SWTC_SWISOVM_NONCANONICAL_1:
guid: "7dcb33d4-70ee-4f0a-9ba3-2cb4f66f83b2"
description: "Non-standard type."
implements:
- BLR_SS_SWTC_SWISOVM
- INCOMPLETE
uses:
- heating_stage_run_count

BLR_SS_SWTC_SWISOVM_NONCANONICAL_2:
guid: "46c2e8d8-a26b-4e30-b809-8d8780485ad8"
description: "Non-standard type."
Expand Down
82 changes: 0 additions & 82 deletions ontology/yaml/resources/HVAC/entity_types/CH.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -679,85 +679,3 @@ CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTPM
###################################
### Existing Non-standard Types ###
###################################

CH_SS_SWTC_DX4SWC_SWISOVPM_NONCANONICAL_1:
guid: "d4bef12c-c41b-4ba8-9d06-035e9e9ba431"
description: "Non-standard type."
implements:
- CH_SS_SWTC_DX4SWC_SWISOVPM
- INCOMPLETE

CH_SS_SWTC_NONCANONICAL_1:
guid: "ae202987-6078-455c-8ee0-dfe43e223329"
description: "Non-standard type."
implements:
- CH_SS_SWTC
- INCOMPLETE
uses:
- cooling_percentage_sensor

CH_SS_SCHWTC_CWDT_NONCANONICAL_1:
guid: "30db6609-b1e4-40ac-8d03-12d38d41a64d"
description: "Non-standard type."
implements:
- CH_SS_SCHWTC_CWDT
- INCOMPLETE
uses:
- cooling_percentage_sensor

CH_SS_CHWDT_CWDT_CWDPM_CHWDPM_REFM:
guid: "48f951c0-42ca-4714-a3ef-e384fa1485d2"
description: "Non-standard type."
is_canonical: false
implements:
- CH
- SS
- CHWDT
- CWDT
- CWDPM
- CHWDPM
- REFM

CH_SS_CHWDT2X_CWDT_CWDPM_CHWDPM_REFM:
guid: "d6b6a0e5-a5a1-4634-9792-0ba39cb3e1fd"
description: "Non-standard type."
is_canonical: false
implements:
- CH
- SS
- CHWDT2X
- CWDT
- CWDPM
- CHWDPM
- REFM

CH_SS_CHWDT:
guid: "471edb03-6731-4fe3-862e-c7ab9825e7e9"
description: "Non-standard chiller."
implements:
- CH
- INCOMPLETE
- SS
- CHWDT
opt_uses:
- lost_power_alarm
- run_mode

CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
guid: "bec266d2-2046-4142-a55a-fb7917d6d74f"
description: "Non standard chiller with chilled/condensing supply/return water isolation valve control. Chilled water flowrate status "
implements:
- CH
- SS
- CHWSWISOVM
- CWSISOVM
- CWRISOVM
- CHWRWISOVM
- CHWDT
uses:
- chilled_water_flowrate_status
- condensing_water_flowrate_status
- condensing_supply_water_temperature_sensor
opt_uses:
- lost_power_alarm
- run_mode
10 changes: 0 additions & 10 deletions ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,3 @@ CHWS_SWTC_WDPC_WFRM_PSWTC_PWVPM_MINFC_CLPM_NONCANONICAL_1:
- return_water_isolation_valve_status
- process_water_flowrate_setpoint
- process_cooling_thermal_power_sensor

CHWS_SWTC_WDPC_BYPVPM_WFRM_NONCANONICAL_1:
guid: "ba993791-6878-4e7b-91a1-d7c0aac04e6f"
description: "Non-standard type."
implements:
- CHWS_SWTC_WDPC_BYPVPM_WFRM
- INCOMPLETE
uses:
- production_differential_pressure_sensor
- supply_water_flowrate_sensor # Need to rename to flowrate_sensor
21 changes: 0 additions & 21 deletions ontology/yaml/resources/HVAC/entity_types/CRREF.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,3 @@ CRREF_SS_CREFM:
- CRREF
- SS
- CREFM

CRREF_SS_CREFM_NONCANONICAL_1:
shambergoldstein marked this conversation as resolved.
Show resolved Hide resolved
guid: "5d84e3d2-bbc1-45c0-84bd-090f8bf5bc06"
description: "Noncanonical coldroom refrigerator monitoring with start-stop and 3 compressor alarms."
is_canonical: false
implements:
- CRREF_SS_CREFM
uses:
- failed_compressor_alarm_1
- failed_compressor_alarm_2
- failed_compressor_alarm_3

CRREF_SS_CREFM_NONCANONICAL_2:
guid: "587b32a8-c822-4125-acac-be289c2a59ee"
description: "Noncanonical coldroom refrigerator monitoring with start-stop and 2 compressor alarms."
is_canonical: false
implements:
- CRREF_SS_CREFM
uses:
- failed_compressor_alarm_1
- failed_compressor_alarm_2
46 changes: 0 additions & 46 deletions ontology/yaml/resources/HVAC/entity_types/CT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,49 +208,3 @@ CT_SS_VSC_SWTM_RWISOVM_SWISOVM_FSWISOVM_FRWISOVM:
###################################
### Existing Non-standard Types ###
###################################

CT_SS_SWTC_NONCANONICAL_1:
guid: "1a4475ad-f918-40e7-bb50-a3a688c80e80"
description: "Non-standard type."
implements:
- CT_SS_SWTC
- INCOMPLETE
uses:
- fan_speed_mode

CT_SS_VSC_SWTC_NONCANONICAL_1:
guid: "0eee9ffb-cad6-408a-b1ef-85ac2cf3e1e9"
description: "Non-standard type."
implements:
- CT_SS_VSC_SWTC
- INCOMPLETE
uses:
- speed_frequency_command


CT_SS_VSC_SWTM:
guid: "cb5d9702-fdf0-44be-9857-21ef98ad5739"
description: "Cooling tower with variable speed control and supply water temperature monitoring"
is_canonical: false
implements:
- CT
- SS
- VSC
- SWTM

CT_SS_CWDT_OA_VSFC_CSWIVS_CRWIVS_CSWTC:
guid: "503f5a06-47f3-4215-8ec2-fe634ad8e874"
description: "CT with multi considering water isolation valve control, condensing return/supply water monitor and outside air monitor"
implements:
- CT
- SS
- CWDT
- OA
- VSFC
- CSWIVS
- CRWIVS
- CSWTC
opt_uses:
- control_mode
- run_mode
- lost_power_alarm
10 changes: 0 additions & 10 deletions ontology/yaml/resources/HVAC/entity_types/DFR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,6 @@ DFR_SFSS_SFVSC_BYPSSPC_HTSC:
### Existing Non-standard Types ###
###################################

DFR_SFSS_BYPSSPC_HT2SC_RTM_NONCANONICAL_1:
guid: "0539ecd5-d85c-4abd-9d1f-855b0180dbaf"
description: "Non-standard type."
implements:
- DFR_SFSS_BYPSSPC_HT2SC_RTM
- DEPRECATED
uses:
- heating_percentage_command_1
- heating_percentage_command_2

DFR_SFSS_BYPSSPC_HT2SC_RTM_NONCANONICAL_2:
guid: "34afae9b-41bc-4432-87ca-fe59c74413bc"
description: "Non-standard type."
Expand Down
21 changes: 0 additions & 21 deletions ontology/yaml/resources/HVAC/entity_types/DH.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,3 @@ DH_SS_HTSC:
- DH
- SS
- HTSC

############################
### Need to Remap These ###
############################

DFR_NONCANONICAL_1:
guid: "294ea391-5e4c-4867-aba7-a50658e74660"
description: "Non-standard type."
uses:
- discharge_air_relative_humidity_sensor
- discharge_air_temperature_sensor
- discharge_air_temperature_setpoint
- heater_run_command
- heating_percentage_command
- humidification_percentage_command
- zone_air_relative_humidity_sensor_1
- zone_air_relative_humidity_sensor_2
- zone_air_relative_humidity_sensor_3
implements:
- HUM
- REMAP_REQUIRED
11 changes: 0 additions & 11 deletions ontology/yaml/resources/HVAC/entity_types/DMP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,3 @@ DMP_NONCANONICAL_1:
- supply_air_damper_percentage_command_1
- supply_air_damper_percentage_command_2
- west_building_air_static_pressure_sensor

DMP_BPC_NONCANONICAL_1:
guid: "c7bba727-0cec-4348-9343-b7a9072d98dc"
description: "Non-standard type."
implements:
- DMP
- BPC
- REMAP_REQUIRED # Should probably be split into two separate dampers. Will then match canonical.
uses:
- east_exhaust_air_damper_percentage_command
- west_exhaust_air_damper_percentage_command
14 changes: 1 addition & 13 deletions ontology/yaml/resources/HVAC/entity_types/DWST.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,6 @@ DWST_SWTC_CPVSC2X_WSHP2X:
- potable_hot_leaving_water_temperature_sensor_2
- potable_hot_leaving_water_temperature_setpoint

DWST_SS_PWDT_HWTTC_SEWTM:
guid: "bbde1c7a-fd21-410f-969a-65ebcf65234d"
description: "DWST with primary, secondary temperature monitoring, tank temperature sensor"
is_canonical: false
implements:
- SS
- PWDT
- HWTTC
- SEWTM
uses:
- heater_run_command

DWST_HWDT_CPC_SWTC2X_HWFM_HSWPM:
guid: "cd74f84e-969a-422c-8c84-d40ca6281352"
description: "Non-standard domestic water system with two heating water heat exhangers that are manually opened/closed,
Expand Down Expand Up @@ -121,4 +109,4 @@ DWST_HWDT_CPC2X_SWTC2X_HWFM_HSWPM:
- supply_water_temperature_sensor_1
- supply_water_temperature_sensor_2
- supply_water_temperature_setpoint
- heating_water_flowrate_sensor
- heating_water_flowrate_sensor
Loading
Loading