Merge pull request #1465 from evgeniya-engel/master

Hydronic system additions

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

@@ -770,6 +770,7 @@ SS:
   - lost_power_alarm
   - communication_status
   - efficiency_percentage_sensor
+  - load_percentage_sensor
 
 DSPC:
   guid: "3f288511-32ca-47ae-a4e0-391620026420"
@@ -8242,6 +8243,32 @@ WSEBYPVPM:
   implements:
   - MONITORING
 
+MCBYPVPM:
+  guid: "ba06a118-c604-44e8-9ad7-aa5d7cad5e43"
+  description: "Mechanical cooling bypass valve monitoring."
+  is_abstract: true
+  opt_uses:
+  - economizer_mode
+  - sync_economizer_mechanical_cooling_mode
+  - mechanical_cooling_bypass_valve_percentage_sensor
+  uses:
+  - mechanical_cooling_bypass_valve_percentage_command
+  implements:
+  - MONITORING
+
+BYPVFRC:
+  guid: "5c93b3ee-21bb-423c-8c84-9a22ffa1f931"
+  description: "Bypass valve flowrate control."
+  is_abstract: true
+  opt_uses:
+  - bypass_valve_percentage_sensor
+  uses:
+  - bypass_valve_percentage_command
+  - flowrate_sensor
+  - flowrate_setpoint
+  implements:
+  - CONTROL
+
 FSWISOVM:
   guid: "58f0a5fb-fc3e-4384-91b1-ba7db225ec6c"
   description: "Filtration supply isolation valve monitoring."

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

@@ -110,6 +110,16 @@ CDWS_SWTC_WDPM_SWPSS:
   - WDPM
   - SWPSS
 
+CDWS_SWTC_WDPM_CLPM:
+  guid: "04503d61-feb3-43b1-9eea-57c2570610e3"
+  description: "Condenser water system with differential pressure monitoring and cooling thermal monitoring."
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - WDPM
+  - CLPM
+
 CDWS_CLPM_SWTC_WDPM_WFRC:
   guid: "571a238d-3540-4f4d-ba11-5b61e43e9b3b"
   description: "Condensing water system with supply temperature and flowrate control as well as thermal power and differential pressure monitoring."

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

@@ -263,6 +263,23 @@ CH_SS_SCHWTC_CHPM_REFSM_DXSWC_CHWRWISOVM_IGM:
   - CHWRWISOVM
   - IGM
 
+
+CH_SS_SCHWTC_CWDT_WDPM_REFSM_REFPM_CHDXSC_CHWRWISOVM_IGM:
+  guid: "74bda35f-625f-4472-947e-b9d10a4d2d3f"
+  description: "Water-cooled chiller with refrigerant pressure and temperature monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SCHWTC
+  - CWDT
+  - WDPM
+  - REFSM
+  - REFPM
+  - CHDXSC
+  - CHWRWISOVM
+  - IGM
+
 CH_SS_SCHWTC_CHWRWISOVPM_CWRISOVPM_CHPM_CWDT_REFSM_CHWDPM:
   guid: "bca8842a-ad65-4ddc-925f-e97129f5c2d9"
   description: "Water-cooled chiller."
@@ -402,6 +419,23 @@ CH_SS_CHWRWISOVPM_SCHWTC_CHWDPM_CDWISOVPM_CWDT_REFPM_REFSM_IGM_DXSWC:
   - IGM
   - DXSWC
 
+CH_SS_CHWRWISOVPM_SCHWTC_CHWDPM_CDWISOVPM_CWDT_REFPM_REFSM_IGM_CHDXSC:
+  guid: "01d59f6f-3ed5-444d-8245-fe2d5ebb1f8c"
+  description: "Complex water-cooled chiller with refrigerant pressure and temperature monitoring."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - CHWRWISOVPM
+  - SCHWTC
+  - CHWDPM
+  - CDWISOVPM
+  - CWDT
+  - REFPM
+  - REFSM
+  - IGM
+  - CHDXSC
+
 CH_SS_SCHWTC_CHWSWISOVM_CHWDPM_CWDT_REFSM_REFPM_IGM_DXSWC:
   guid: "e3e3ff1b-4d52-4234-aac0-1692fac0ee77"
   description: "Complex water-cooled chiller."

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

@@ -156,6 +156,18 @@ CHWS_SWTC_WDPC_CLPM_WFRM_BYPVPM:
   - WFRM
   - BYPVPM
 
+CHWS_SWTC_WDPC_BYPVFRC_MCBYPVPM_CLPM:
+  guid: "553497fb-0c57-441c-bf74-3c7b0d713f9f"
+  description: "Chilled water system with supply temperature and differential pressure control, bypass valve flowrate control, mechanical cooling bypass valve monitoring and cooling thermal monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC
+  - BYPVFRC
+  - MCBYPVPM
+  - CLPM
+
 CHWS_SWTC_WDPC_CLPM_WFRC_BYPVPM:
   guid: "20c14eb4-763c-437d-9209-c35151e2251b"
   description: "Chilled water system with supply temperature, differential pressure, and flowrate control, and thermal load and bypass valve monitoring."
@@ -168,6 +180,17 @@ CHWS_SWTC_WDPC_CLPM_WFRC_BYPVPM:
   - WFRC
   - BYPVPM
 
+CHWS_SWTC_WDPC_BYPVFRC_CLPM:
+  guid: "2b835b66-3db9-499e-97f4-1e22540df676"
+  description: "Chilled water system with supply temperature, differential pressure, bypass valve flowrate control, and cooling thermal monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC
+  - BYPVFRC
+  - CLPM
+
 CHWS_SWTC_WDPC_WFRM_PSWTC_PWVPM_MINFC_CLPM:
   guid: "7626e0e2-1e32-4101-b53b-5fa66af3cdc2"
   description: "Chilled water system with process water (typically used in lab applications)."
@@ -232,6 +255,17 @@ CHWS_SWTC_WDPC2X_BYPVPM_WFRM_CLPM:
   - WFRM
   - CLPM
 
+CHWS_SWTC_WDPC2X_BYPVFRC_CLPM:
+  guid: "3a3fea1e-7f64-4ed9-9b18-bd1c62d53af2"
+  description: "Chilled water system with dual differential pressure control, bypass valve flowrate control and cooling thermal monitoring."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC2X
+  - BYPVFRC
+  - CLPM
+
 CHWS_RWTC_CHWVM:
   guid: "40d0d1a2-b819-4d1b-b01a-e7b900af0d8d"
   description: "Chilled water system with return temperature control and chilled water valve monitoring."

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

@@ -88,6 +88,16 @@ HX_CWDT_CHWDT_CWRISOVPM_CHWBYPVPM:
   - CWRISOVPM
   - CHWBYPVPM
 
+HX_CWDT_CHWDT_CWRISOVPM:
+  guid: "7d22f3c3-30be-46f9-bd13-1f88b374923c"
+  description: 'Condenser/chilled water heat exchanger.'
+  is_canonical: true
+  implements:
+  - HX
+  - CWDT
+  - CHWDT
+  - CWRISOVPM
+
 HX_CHWDT_CWRISOVPM_CHWRWISOVPM:
   guid: "6cb20fa2-2dcf-4d38-8212-d2951fe39b95"
   description: "Chilled and condenser water heat exchangers."

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -601,6 +601,12 @@ literals:
 - economizer_bypass_valve_percentage_sensor:
     fixed_min: 0
     fixed_max: 100
+- mechanical_cooling_bypass_valve_percentage_command:
+    fixed_min: 0
+    fixed_max: 100
+- mechanical_cooling_bypass_valve_percentage_sensor:
+    fixed_min: 0
+    fixed_max: 100
 - chilled_water_isolation_valve_status:
   - OPEN
   - CLOSED