Merge pull request #1504 from evgeniya-engel/master

new fields, abstract and canonical types

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

@@ -1617,7 +1617,11 @@ MMCWDPC:
   guid: "71874ee4-5596-4e90-ad14-8716a6b6de3a"
   description: "Minimum water differential pressure control for mechanical cooling in a hydronic system."
   is_abstract: true
+  opt_uses:
+  - bypass_valve_percentage_sensor
+  - failed_bypass_valve_alarm
   uses:
+  - bypass_valve_percentage_command
   - low_limit_mechanical_cooling_differential_pressure_sensor
   - low_limit_mechanical_cooling_differential_pressure_setpoint
   implements:
@@ -1645,6 +1649,8 @@ WDPC2X:
   opt_uses:
   - pressurization_request_count
   - run_command
+  - high_differential_pressure_alarm
+  - low_differential_pressure_alarm
   uses:
   - differential_pressure_sensor_1
   - differential_pressure_sensor_2
@@ -2457,6 +2463,7 @@ CHWRC:
   opt_uses:
   - chilled_water_flowrate_sensor
   - chilled_water_valve_percentage_sensor
+  - cooling_request_count
   - cooling_thermal_power_capacity
   - discharge_air_temperature_sensor
   - leaving_cooling_coil_temperature_sensor
@@ -4434,7 +4441,6 @@ HXRWISOVPM:
   implements:
   - MONITORING
 
-
 HXSWISOVM:
   guid: "3a617a80-2ab5-4eb5-9cf5-c327359a03c6"
   description: "Heat exchanger supply isolation water valve control."
@@ -4445,7 +4451,6 @@ HXSWISOVM:
   implements:
   - MONITORING
 
-
 HXRWISOVM:
   guid: "48cee686-e728-4996-be87-0a280ecf9733"
   description: "Heat exchanger return isolation water valve control."
@@ -4456,6 +4461,18 @@ HXRWISOVM:
   implements:
   - MONITORING
 
+HXCRWISOVPM:
+  guid: "7fd2b89b-013d-4bad-833c-2b307a63cda5"
+  description: "Heat exchanger condensing return water isolation valve percentage control."
+  is_abstract: true
+  opt_uses:
+  - failed_heat_exchange_condensing_return_water_isolation_valve_alarm
+  uses:
+  - heat_exchange_condensing_return_water_isolation_valve_percentage_command
+  - heat_exchange_condensing_return_water_isolation_valve_percentage_sensor
+  implements:
+  - MONITORING
+
 PWECVC:
   guid: "c7d64d95-0215-4c9a-b422-a4fb7004f3e3"
   description: "Process water electricconductivity drain valve control."
@@ -4476,6 +4493,30 @@ PWISOVM:
   implements:
   - MONITORING
 
+PSWISOVPM:
+  guid: "e30d558a-61c5-4b9f-8511-9fc460117f7a"
+  description: "Process supply water iso valve control."
+  is_abstract: true
+  opt_uses:
+  - failed_process_supply_water_isolation_valve_alarm
+  uses:
+  - process_supply_water_isolation_valve_percentage_command
+  - process_supply_water_isolation_valve_percentage_sensor
+  implements:
+  - MONITORING
+
+PRWISOVPM:
+  guid: "c87142d1-ffef-45ea-ab22-6e81b8393de4"
+  description: "Process return water iso valve control."
+  is_abstract: true
+  opt_uses:
+  - failed_process_return_water_isolation_valve_alarm
+  uses:
+  - process_return_water_isolation_valve_percentage_command
+  - process_return_water_isolation_valve_percentage_sensor
+  implements:
+  - MONITORING
+
 PWVPM:
   guid: "2335c3b8-b27f-4ef0-b15b-7df5e8d25e4a"
   description: "Process water valve percentage control."
@@ -7526,6 +7567,7 @@ DAIDC:
   - MONITORING
   opt_uses:
   - failed_discharge_air_isolation_damper_alarm
+  - discharge_air_isolation_damper_percentage_sensor
 
 
 RAIDC4X:

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

@@ -245,7 +245,7 @@ CDWS_SWTC_WSEBYPVPM:
 
 CDWS_SWTC_WDPC_CLPM_WFRM_MWFRM:
   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."
+  description: "Condensing water system with supply temperature control, differential pressure control, and thermal load, flowrate and makeup water flowrate monitoring."
   is_canonical: true
   implements:
   - CDWS
@@ -255,6 +255,17 @@ CDWS_SWTC_WDPC_CLPM_WFRM_MWFRM:
   - WFRM
   - MWFRM
 
+CDWS_SWTC_WFRM_MWFRM_BWFRM:
+  guid: "30b52a03-a020-4d65-8c57-bb9cb43e8b15"
+  description: "Condensing water system with flowrate control, blowdown and makeup water flowrate control."
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - WFRM
+  - MWFRM
+  - BWFRM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

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

@@ -1031,6 +1031,57 @@ CH_SS_SWTC_DX2SWC_WDPM_RWISOVM_REFSM_REFPM:
   - REFSM
   - REFPM
 
+CH_SS_SCHWTC_CHWDPC_CHWSWISOVPM_CWDT_CWDPM_CWRISOVPM_HXCRWISOVPM_CLPM:
+  guid: "c51bcdbe-1899-4e9e-9722-0b786b4dcdaf"
+  description: "Water cooled chiller with isolation on chilled and condensing water side, condensing water heat exchange isolation and cooling thermal power monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SCHWTC
+  - CHWDPC
+  - CHWSWISOVPM
+  - CWDT
+  - CWDPM
+  - CWRISOVPM
+  - HXCRWISOVPM
+  - CLPM
+
+CH_SS_SCHWTC_CHWDPC_CWDT_CWDPM_CHWSWISOVPM_CHWRWISOVPM_PSWISOVPM_PRWISOVPM_CWRISOVPM_HXCRWISOVPM_CLPM:
+  guid: "75203ebf-976f-4fef-84a1-7dec7f47c8a5"
+  description: "Water cooled chiller supplying water for chilled and process water systems, with isolation on chilled, process and condensing water side, condensing water heat exchange isolation and cooling thermal power monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SCHWTC
+  - CHWDPC
+  - CWDT
+  - CWDPM
+  - CHWSWISOVPM
+  - CHWRWISOVPM
+  - PSWISOVPM
+  - PRWISOVPM
+  - CWRISOVPM
+  - HXCRWISOVPM
+  - CLPM
+
+
+CH_SS_PSWTC_PWDPC_CWDT_CWDPM_PSWISOVPM_CWRISOVPM_CLPM:
+  guid: "8defc678-ce17-427c-8800-5a0bbe953bd4"
+  description: "Water cooled process chiller with isolation on condensing and process sides, and cooling thermal power monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - PSWTC
+  - PWDPC
+  - CWDT
+  - CWDPM
+  - PSWISOVPM
+  - CWRISOVPM
+  - CLPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

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

@@ -111,6 +111,29 @@ CHWS_SWTC_WDPC_MMCWDPC_BYPVPM_WFRM:
   - BYPVPM
   - WFRM
 
+CHWS_SWTC_WDPC_MMCWDPC_WFRM:
+  guid: "3141b35a-b4ae-4937-8f23-26ca97054a0d"
+  description: "Chilled water system with supply temperature control, differential pressure and min mechanical cooling differential pressure control and flow monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC
+  - MMCWDPC
+  - WFRM
+
+CHWS_SWTC_WDPC2X_MMCWDPC_WSEBYPVPM_WFRM:
+  guid: "2f840d9d-461f-4a74-a660-c9a88b13bb5a"
+  description: "Chilled water system with supply temperature control, differential pressure and min mechanical cooling differential pressure control, waterside economizing, and flow monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC2X
+  - MMCWDPC
+  - WSEBYPVPM
+  - WFRM
+
 CHWS_SWTC_WDPC2X_BYPVPM_WFRM:
   guid: "e83ac652-c8c1-4e66-bfa6-5ad734aa9902"
   description: "Chilled water system with dual differential pressure control, a bypass valve, and flowrate monitoring."
@@ -629,6 +652,17 @@ CHWS_SESWTC_SEWDPC_SEWFRM_WSEBYPVM:
   - SEWFRM
   - WSEBYPVM
 
+CHWS_SWTC_WDPC2X_WSEBYPVPM_WFRM:
+  guid: "85ca9a77-bf43-4247-a7e2-b1f25f5fb563"
+  description: "Chilled water system with dual differential pressure control, waterside economizer bypass, flowrate monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC2X
+  - WSEBYPVPM
+  - WFRM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/FCU.yaml

@@ -1771,6 +1771,93 @@ FCU_DFVSC_RTM_CO2C_HWZTC_CHWZTC_ZHM:
   - CHWZTC
   - ZHM
 
+FCU_DSP_DFSS_DFVSMC_HTRC_RMM:
+  guid: "73330804-8365-4169-b5ae-0965b0c0b0dc"
+  description: "Fan coil unit with zone temperature and return air temperature control and electric heater."
+  is_canonical: true
+  implements:
+  - FCU
+  - DSP
+  - DFSS
+  - DFVSMC
+  - HTRC
+  - RMM
+
+FCU_DSP_DFSS_DFVSMC_HTZC_MTC_RMM:
+  guid: "7c88378f-6a35-41d1-84d7-dfc064160120"
+  description: "Fan coil unit with zone temperature and mixed air temperature control and electric heater."
+  is_canonical: true
+  implements:
+  - FCU
+  - DSP
+  - DFSS
+  - DFVSMC
+  - HTZC
+  - MTC
+  - RMM
+
+FCU_DSP_DFSS_DFVSMC_HTRC_RMM_DAIDC:
+  guid: "f7376d4d-d476-4e39-8fc8-732ba9f91d38"
+  description: "Fan coil unit with zone temperature and return air temperature control and electric heater and isolation damper."
+  is_canonical: true
+  implements:
+  - FCU
+  - DSP
+  - DFSS
+  - DFVSMC
+  - HTRC
+  - RMM
+  - DAIDC
+
+FCU_DSP_DFSS_DFVSMC_HTRC_RMM_DAIDPC:
+  guid: "b8e47243-0626-461f-ae68-e690baa3d606"
+  description: "Fan coil unit with zone temperature and return air temperature control and electric heater and isolation damper."
+  is_canonical: true
+  implements:
+  - FCU
+  - DSP
+  - DFSS
+  - DFVSMC
+  - HTRC
+  - RMM
+  - DAIDPC
+
+FCU_DFSS_DFVSC_CHWRC_RHC:
+  guid: "a3c64f5f-487f-4c52-b785-2e4ef329443f"
+  description: "Fan coil unit withreturn air humidity control and chilled water return air temperature control."
+  is_canonical: true
+  implements:
+  - FCU
+  - DFSS
+  - DFVSC
+  - CHWRC
+  - RHC
+
+FCU_CSP_DFSS_DFVSC_CHWRC_RHC:
+  guid: "453f5dd3-14f4-4d37-aac9-2009345d9761"
+  description: "Fan coil unit with zone temperature control, return air humidity control and chilled water return air temperature control."
+  is_canonical: true
+  implements:
+  - FCU
+  - CSP
+  - DFSS
+  - DFVSC
+  - CHWRC
+  - RHC
+
+FCU_CSP_DFSS_DFVSC_CHWRC_RHC_DAIDC:
+  guid: "cf43b4e3-b516-491f-9d4b-eaaa37e7e209"
+  description: "Fan coil unit with zone temperature control, return air humidity control, chilled water return air temperature control and isolation."
+  is_canonical: true
+  implements:
+  - FCU
+  - CSP
+  - DFSS
+  - DFVSC
+  - CHWRC
+  - RHC
+  - DAIDC
+
 FCU_CSP_DX2ZC_ZHC:
   guid: "4f6dbf06-0b03-4537-9d53-78855aabea49"
   description: "Single zone FCU."

ontology/yaml/resources/HVAC/entity_types/GENERALTYPES.yaml

@@ -406,6 +406,7 @@ DOAS:
   - failed_communication_alarm
   - smoke_alarm
   - filter_alarm
+  - run_mode
   implements:
   - EQUIPMENT
 

ontology/yaml/resources/HVAC/entity_types/HX.yaml

@@ -333,4 +333,25 @@ HX_PSWTC_CHWDT_CHWRWISOVM:
     - HX
     - PSWTC
     - CHWDT
-    - CHWRWISOVPM
+    - CHWRWISOVPM
+
+HX_SCHWTC_CHWFRM_CWDT:
+  guid: "7249d972-281a-498a-92b6-2d12ff02e6a2"
+  description: "Condensing/chilled water heat exchanger with chilled water flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HX
+  - SCHWTC
+  - CHWFRM
+  - CWDT
+
+HX_PSWTC_PWFRM_CWDT_CWSISOVPM:
+  guid: "94c725f7-e46c-4b41-9c7d-0b44d90f2ef8"
+  description: "Condensing/process water heat exchanger with process water flowrate monitoring and isolation on condensing return side."
+  is_canonical: true
+  implements:
+  - HX
+  - PSWTC
+  - PWFRM
+  - CWDT
+  - CWSISOVPM

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

@@ -903,6 +903,16 @@ MAU_DFSS2X_DFVSC2X_DXDC_HWDC:
   - DXDC
   - HWDC
 
+MAU_SFSS_DXSC_SSPC:
+  guid: "e05424bf-c8c0-40c9-9875-8903dce9bffc"
+  description: "MAU with supply air static pressure control and supply air temperature control"
+  is_canonical: true
+  implements:
+  - MAU
+  - SFSS
+  - DXSC
+  - SSPC
+
 ############################
 ###   Remap These Types  ###
 ############################
@@ -1099,4 +1109,4 @@ MAU_SFSS_SFVSC_HTSC_BPC_SHM_NONCANONICAL_2:
   - MAU_SFSS_SFVSC_HTSC_BPC_SHM
   - DEPRECATED
   uses:
-  - humidification_run_command
+  - humidification_run_command