Merge pull request #1477 from shambergoldstein/air-system-additions

Air System Additions

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -807,7 +807,9 @@ SS:
   - communication_status
   - efficiency_percentage_sensor
   - load_percentage_sensor
+  - optimal_stop_command
   - request_run_command
+  - schedule_run_command
 
 DSPC:
   guid: "3f288511-32ca-47ae-a4e0-391620026420"
@@ -1055,7 +1057,6 @@ LHC:
   implements:
   - CONTROL
 
-
 SFSS:
   guid: "1e8dd2f7-192a-430b-af2c-db6065664deb"
   description: "Basic combination of supply fan run command and status (start/stop)."
@@ -1071,10 +1072,29 @@ SFSS:
   - supply_fan_run_time_accumulator
   - failed_supply_fan_alarm
   - supply_fan_lost_power_alarm
+  - schedule_run_command
+  - optimal_stop_command
   uses:
   - supply_fan_run_command
   - supply_fan_run_status
 
+SFFM:
+  guid: "81a4d943-661e-4d61-aae7-ba009a481f78"
+  description: "Supply air flowrate monitoring for individual supply fans within an array."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  opt_uses:
+  - supply_air_flowrate_sensor_1
+  - supply_air_flowrate_sensor_2
+  - supply_air_flowrate_sensor_3
+  - supply_air_flowrate_sensor_4
+  - supply_air_flowrate_sensor_5
+  - supply_air_flowrate_sensor_6
+  - supply_air_flowrate_sensor_7
+  - supply_air_flowrate_sensor_8
+  uses:
+  - total_supply_air_flowrate_sensor
 
 RHM:
   guid: "9b13e30c-52b7-45d1-9798-f7c754e959e9"
@@ -1887,6 +1907,7 @@ REFC:
   opt_uses:
   - failed_zone_air_refrigerant_concentration_alarm
   - high_zone_air_refrigerant_concentration_alarm
+  - refrigerant_leak_detection_status
   uses:
   - zone_air_refrigerant_concentration_sensor
   - zone_air_refrigerant_concentration_setpoint
@@ -2277,6 +2298,7 @@ CHWSC:
   - low_supply_air_temperature_alarm
   - water_leak_alarm
   - frost_alarm
+  - cooldown_run_command
   uses:
   - chilled_water_valve_percentage_command
   - supply_air_temperature_sensor
@@ -3285,6 +3307,8 @@ HWSC:
   - failed_supply_air_temperature_alarm
   - high_supply_air_temperature_alarm
   - low_supply_air_temperature_alarm
+  - warmup_request_count
+  - warmup_run_command
   uses:
   - heating_water_valve_percentage_command
   - supply_air_temperature_sensor
@@ -4021,6 +4045,8 @@ VOADM:
   - low_mixed_air_temperature_alarm
   - failed_outside_air_damper_alarm
   - failed_outside_air_temperature_alarm
+  - outside_air_flowrate_sensor
+  - ventilation_request_count
   uses:
   - outside_air_damper_percentage_command
   - outside_air_temperature_sensor
@@ -8561,6 +8587,7 @@ HP6SWC:
   - heating_thermal_power_capacity
   - high_supply_water_temperature_alarm
   - low_supply_water_temperature_alarm
+  - return_water_temperature_sensor
   uses:
   - compressor_run_command_1
   - compressor_run_command_2

ontology/yaml/resources/HVAC/entity_types/AHU.yaml

@@ -2280,6 +2280,25 @@ AHU_CHWSC_ECON_EFSS_EFVSC_FDPM_RFC_SFSS_SFVSC_SSPC:
   - SFVSC
   - SSPC
 
+AHU_CHWSC_ECONM_EFSS_EFVSC_FDPM_RFC_SFSS_SFVSC_SSPC_RFSS_RFVSC_DSARC:
+  guid: "691e5aa7-4ba6-4aa1-a023-ff875c8fd35a"
+  description: "Multi-zone AHU with variable speed supply, exhaust, and return fans."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECONM
+  - EFSS
+  - EFVSC
+  - FDPM
+  - RFC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - RFSS
+  - RFVSC
+  - DSARC
+
 AHU_BSPC_DX4SC_ECONM_EFSS_EFVSC_OAFMC_SFSS_SFVSC_SSPC:
   guid: "4a9f69bb-5f8b-41aa-aa92-3e4f85dd5bf8"
   description: "Multi-zone AHU."
@@ -2638,6 +2657,20 @@ AHU_CHWSC_ECONM_FDPM_HWSC_SFSS_STC:
   - SFSS
   - STC
 
+AHU_CHWSC_ECONM_FDPM_HWSC_SFSS_STC_DSARC:
+  guid: "b636cac2-6985-4a8e-b962-448c686c64b7"
+  description: "Multi-zone AHU."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECONM
+  - FDPM
+  - HWSC
+  - SFSS
+  - STC
+  - DSARC
+
 AHU_CHWSC_ECONM_FDPM_HWSC_SFSS_SFVSC_SSPC_SARC:
   guid: "2f8c18be-23c4-4fdc-a7af-4a90e9a93e9d"
   description: "Multi-zone AHU."
@@ -2653,6 +2686,20 @@ AHU_CHWSC_ECONM_FDPM_HWSC_SFSS_SFVSC_SSPC_SARC:
   - SSPC
   - SARC
 
+AHU_CHWSC_ECONM_FDPM_HWSC_SFSS_SFVSC_SSPC_DSARC:
+  guid: "f72e1b2b-c110-4e6a-90b8-6a046296c8ed"
+  description: "Multi-zone AHU."
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECONM
+  - FDPM
+  - HWSC
+  - SFSS
+  - SFVSC
+  - SSPC
+  - DSARC
 
 AHU_EDBPC_DX4SC_ECONM_EFSS_EFVSC_SFSS_SFVSC_SARC_SSPC:
   guid: "9d123538-8cb1-4ad7-b712-4cce9693caaf"
@@ -4379,6 +4426,26 @@ AHU_CHWSC_ECON_FDPM_HWSC_SFSS_SFVSC_SSPC_SDHC_RTM:
   opt_uses:
   - smoke_alarm
 
+AHU_CHWSC_ECON_VOADM_FDPM_HWSC_SFSS_SFVSC_SFFM_SSPC_SDHC_RTM:
+  guid: "68f0f604-9e65-44b2-b8e9-ea93bf118665"
+  description: "Multi-zone AHU with multi-supply fan flowrate monitoring, dehumidifier and return temperature monitoring"
+  is_canonical: true
+  implements:
+  - AHU
+  - CHWSC
+  - ECON
+  - VOADM
+  - FDPM
+  - HWSC
+  - SFSS
+  - SFVSC
+  - SFFM
+  - SSPC
+  - SDHC
+  - RTM
+  opt_uses:
+  - smoke_alarm
+
 AHU_SFSS4X_SFVSC4X_RFSS3X_RFVSC3X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC_EFM:
   guid: "187ad041-6b1e-4ee5-aabb-69dc8c287bdd"
   description: "Cooling and heating AHU with 4 supply and 3 return fans, supply air reset control, building and supply static pressure control, return damper flow control and exhaust flow monitoring."
@@ -5602,4 +5669,4 @@ AHU_BSPC_DX4SC_ECON_EFSS_EFVSC_SFSS_SFVSC_SSPC_RHHC_NONCANONICAL_1:
   uses:
   - heating_water_valve_percentage_command
   - min_zone_air_relative_humidity_sensor
-  - min_zone_air_relative_humidity_setpoint
+  - min_zone_air_relative_humidity_setpoint

ontology/yaml/resources/HVAC/entity_types/CDWS.yaml

@@ -186,14 +186,13 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
-CDWS_SS_SRC_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
+CDWS_SS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   guid: "27d51584-886f-4142-8e8a-17af27aa9fec"
   description: "Condensing water system (temp control) with bypass control, flow monitoring and basin water system"
   is_canonical: true
   implements:
   - CDWS
   - SS
-  - SRC
   - SWTC
   - BYPVPM
   - WFRM

ontology/yaml/resources/HVAC/entity_types/CH.yaml

@@ -679,14 +679,13 @@ CH_SS_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPM_CWDT_REFPM_REFSM:
   - REFPM
   - REFSM
 
-CH_SS_SRC_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPC_CWDPC_CWDT_REFPM_REFSM:
+CH_SS_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPC_CWDPC_CWDT_REFPM_REFSM:
   guid: "8c69f993-c5eb-46f1-a1f1-964cc8b4cbdf"
-  description: "Water cooled chiller with schedule run control, condensing and chilled supply water isolation valves, condensing water temperature differential monitoring, chilled and condensing water differential pressure control and single circuit refrigerant pressure and temperature monitoring."
+  description: "Water cooled chiller with run control, condensing and chilled supply water isolation valves, condensing water temperature differential monitoring, chilled and condensing water differential pressure control and single circuit refrigerant pressure and temperature monitoring."
   is_canonical: true
   implements:
   - CH
   - SS
-  - SRC
   - VSC
   - CHDXSC
   - SCHWTC
@@ -714,14 +713,13 @@ CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM:
   - CHWDT
   - RCKTM
 
-CH_SS_SRC_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPC_CWDPC_CHWHRDPC_CWHRDPC_CWDT_CHWDT_RCKTM:
+CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPC_CWDPC_CHWHRDPC_CWHRDPC_CWDT_CHWDT_RCKTM:
   guid: "8a648fa7-d065-4ff4-b524-626b4a23c238"
-  description: "Water cooled chiller with schedule run control, three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, chilled supply water islation valve, chilled and condensing water differential pressure control, heat recovery, and condensing water temperature differential monitoring."
+  description: "Water cooled chiller with run control, three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, chilled supply water islation valve, chilled and condensing water differential pressure control, heat recovery, and condensing water temperature differential monitoring."
   is_canonical: true
   implements:
   - CH
   - SS
-  - SRC
   - DX3SCHWC
   - CWSISOVM
   - CWRISOVM

ontology/yaml/resources/HVAC/entity_types/CHWS.yaml

@@ -496,26 +496,25 @@ CHWS_SWTC_WDPM_CLPM_WFRM:
   - CLPM
   - WFRM
 
-CHWS_SRC_SWTC_WDPC_CLPM_WFRM:
+CHWS_SS_SWTC_WDPC_CLPM_WFRM:
   guid: "8448f024-bfc7-46e9-9d91-19949aef2477"
-  description: "Chilled water system with schedule run command, cooling thermal power monitoring, supply water temperature control, differential pressure control and flowrate monitoring."
+  description: "Chilled water system with run command, cooling thermal power monitoring, supply water temperature control, differential pressure control and flowrate monitoring."
   is_canonical: true
   implements:  
   - CHWS
-  - SRC
+  - SS
   - SWTC
   - WDPC
   - CLPM
   - WFRM
 
-CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRSWFRC_SESWTC_SEWFRM_CLPM:
+CHWS_SS_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRSWFRC_SESWTC_SEWFRM_CLPM:
   guid: "49477bff-e5f7-42bc-b498-8965f4ed3e41"
-  description: "Chilled water system with schedule run command, cooling thermal power monitoring, primary and secondary water control, and water side economizing."
+  description: "Chilled water system with run command, cooling thermal power monitoring, primary and secondary water control, and water side economizing."
   is_canonical: true
   implements:  
   - CHWS
   - SS
-  - SRC
   - WDPC
   - SWISOVPM
   - BYPVPM

ontology/yaml/resources/HVAC/entity_types/FAN.yaml

@@ -283,6 +283,17 @@ FAN_SS_VSC_EPC:
   - VSC
   - EPC
 
+FAN_SS_VSC_EPC_EDPM:
+  guid: "450f5cba-4c92-4aaf-b068-628a0cd7400d"
+  description: "Fan with run control, exhaust static pressure control and exhaust damper monitoring."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - EPC
+  - EDPM
+
 FAN_SS_DSP_VSC:
   guid: "660d42d5-15b3-4cb4-9af1-506f31b0aa0e"
   description: "Fan with dual setpoint control and variable speed."
@@ -692,6 +703,16 @@ FAN_SS_VSC_REFC:
   - VSC
   - REFC
 
+FAN_SS_HLC_REFC:
+  guid: "b0ad4fce-417b-420c-afad-49dcd2268521"
+  description: "Fan with start/stop status, high/low speed control and refrigerant concentration control."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - HLC
+  - REFC
+
 FAN_SS_VSC_ZSPM_DWI:
   guid: "a1148f7d-4aa0-4560-b2cb-53b8eb949278"
   description: "Dishwasher-interlocked fan with start/stop status, open-loop speed control, and zone static pressure monitoring."
@@ -1002,4 +1023,4 @@ FAN_SS_NONCANONICAL_8:
   uses:
   - discharge_air_isolation_damper_closed_status
   - discharge_air_isolation_damper_command
-  - discharge_air_isolation_damper_open_status
+  - discharge_air_isolation_damper_open_status

ontology/yaml/resources/HVAC/entity_types/HWS.yaml

@@ -105,6 +105,16 @@ HWS_RWTC_MXVPM:
   - RWTC
   - MXVPM
 
+HWS_SS_RWTC_MXVPM:
+  guid: "a78c552b-667d-43eb-9418-afe7486a7ee2"
+  description: "Heating water system with run control and mixed return temp control."
+  is_canonical: true
+  implements:
+  - HWS
+  - SS
+  - RWTC
+  - MXVPM
+
 HWS_SWTC_BYPVPM:
   guid: "8d8652a9-6814-413e-9aa1-8772a831d6a3"
   description: "Heating water system with supply temp control and bypass."
@@ -405,13 +415,13 @@ HWS_PWDT_SESWTC_SEWDPC_SERWFRM_SEWTM:
   - SERWFRM
   - SEWTM
 
-HWS_SRC_SWTC_WDPC_WFRM_HWTTC_HLPM:
+HWS_SS_SWTC_WDPC_WFRM_HWTTC_HLPM:
   guid: "b203359c-877b-4c46-903e-57c4c5b4d634"
   description: "Heating water system with schedule run command, heating thermal power monitoring, supply water temperature control, differential pressure control, flowrate monitoring, and hot water tank temperature control."
   is_canonical: true
   implements:
   - HWS
-  - SRC
+  - SS
   - SWTC
   - WDPC
   - WFRM

ontology/yaml/resources/HVAC/entity_types/MAU.yaml

@@ -786,6 +786,26 @@ MAU_SFSS2X_SFVSC2X_CHWSC_HWSC_SSPC_VOADM_FDPM_ZSPM_OAFM:
   opt_uses:
   - smoke_alarm
 
+MAU_SS_SFSS2X_SFVSC2X_SFFM_CHWSC_HWSC_SSPC_VOADM_FDPM_ZSPM_OAFM:
+  guid: "9b0256de-6e1d-4fc0-abc2-c751c4e209c8"
+  description: "Multi-zone chilled water and heating water MAU with run control, supply air static pressure control, variable outside air damper and outside airflow monitoring, filter differential pressure monitoring, zone static pressure monitoring."
+  is_canonical: true
+  implements:
+  - MAU
+  - SS
+  - SFSS2X
+  - SFVSC2X
+  - SFFM
+  - CHWSC
+  - HWSC
+  - SSPC
+  - VOADM
+  - FDPM
+  - ZSPM
+  - OAFM
+  opt_uses:
+  - smoke_alarm
+
 MAU_DFSS_DFVSC_DSP_CHWDC_HWDC_OADM_ZSPM:
   guid: "9ba6dc9b-1b5b-4f05-8be2-2ff4b0bb7390"
   description: "Single zone heating and cooling make-up air unit with zone static pressure control and outside air temperature monitoring."