Water System Additions

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

@@ -807,6 +807,7 @@ SS:
   - communication_status
   - efficiency_percentage_sensor
   - load_percentage_sensor
+  - request_run_command
 
 DSPC:
   guid: "3f288511-32ca-47ae-a4e0-391620026420"
@@ -1350,6 +1351,7 @@ RWTC:
   - OPERATIONAL
   opt_uses:
   - run_command
+  - heating_request_count
   - supply_water_temperature_sensor
   - high_supply_water_temperature_alarm
   - low_supply_water_temperature_alarm
@@ -4220,6 +4222,14 @@ CDWPVM:
   implements:
   - OPERATIONAL
 
+WFRSM:
+  guid: "08d4248b-2ef7-42e8-b56a-98aad618b6bc"
+  description: "Water flowrate status monitoring."
+  is_abstract: true
+  uses:
+  - water_flowrate_status
+  implements:
+  - OPERATIONAL
 
 CDWFRSM:
   guid: "2a153a56-29ae-403e-9b4d-9b16b3a4794c"
@@ -4230,7 +4240,6 @@ CDWFRSM:
   implements:
   - OPERATIONAL
 
-
 BYPVPM:
   guid: "57766034-a856-4dfe-b070-fd65673d8dd0"
   description: "Bypass water valve percentage monitoring."
@@ -5366,6 +5375,17 @@ CHWDPC:
   - chilled_water_differential_pressure_sensor
   - chilled_water_differential_pressure_setpoint
 
+CHWHRDPC:
+  guid: "54ad7c4b-917d-4194-b888-954bf6553838"
+  description: "Heat recovery differential pressure control for chilled water."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - chilled_water_differential_pressure_sensor
+  - heat_recovery_chilled_water_differential_pressure_setpoint
+  - heat_recovery_run_command
+
 CHWDTC:
   guid: "0ebb5fa0-c205-4238-8f73-296667e7169c"
   description: "Differential temperature control for chilled water."
@@ -6047,7 +6067,6 @@ RWTM:
   uses:
   - return_water_temperature_sensor
 
-
 WSERWTM:
   guid: "132824f4-213b-4e8f-85f9-fdad8a194146"
   description: "Water side economizer return water temperature monitoring."
@@ -6060,7 +6079,6 @@ WSERWTM:
   - high_economizer_return_water_temperature_alarm
   - low_economizer_return_water_temperature_alarm
 
-
 CWDPM:
   guid: "d71e1e0d-35d6-4b53-a570-2e12959c951b"
   description: "Differential pressure monitoring for condenser water."
@@ -6070,6 +6088,27 @@ CWDPM:
   uses:
   - condensing_water_differential_pressure_sensor
 
+CWDPC:
+  guid: "426c8ede-626d-4c84-bbba-ba1707ba202a"
+  description: "Differential pressure control for condenser water."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - condensing_water_differential_pressure_sensor
+  - condensing_water_differential_pressure_setpoint
+
+CWHRDPC:
+  guid: "ddd40420-3034-4289-9f34-103934540f58"
+  description: "Heat recovery differential pressure control for condenser water."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - condensing_water_differential_pressure_sensor
+  - heat_recovery_condensing_water_differential_pressure_setpoint
+  - heat_recovery_run_command
+
 CWDTC:
   guid: "a9c672e6-0a06-4b6b-a67f-557288ba38cc"
   description: "Differential temperature control for condenser water."
@@ -6864,6 +6903,7 @@ HWTTC:
   is_abstract: true
   opt_uses:
   - high_water_temperature_alarm
+  - return_water_temperature_sensor
   uses:
   - hot_water_tank_temperature_sensor
   - hot_water_tank_temperature_setpoint
@@ -7069,6 +7109,8 @@ HLPM:
   guid: "ae617b98-6deb-4c17-8d63-4504feea2988"
   description: "Heating thermal power sensor."
   is_abstract: true
+  opt_uses:
+  - heating_thermal_power_capacity
   uses:
   - heating_thermal_power_sensor
   implements:
@@ -8299,6 +8341,8 @@ WSEBYPVPM:
   - sync_economizer_mechanical_cooling_mode
   - economizer_bypass_valve_percentage_sensor
   - failed_economizer_bypass_valve_alarm
+  - economizer_thermal_power_sensor
+  - economizer_disable_command
   uses:
   - economizer_bypass_valve_percentage_command
   implements:
@@ -8356,6 +8400,15 @@ PRWFRM:
   implements:
   - MONITORING
 
+PRSWFRC:
+  guid: "71821a9c-2600-4123-b474-dbe2816e8f6c"
+  description: "Primary supply water flowrate control"
+  uses:
+  - primary_supply_water_flowrate_sensor
+  - primary_supply_water_flowrate_setpoint
+  implements:
+  - MONITORING
+
 SEWFRM:
   guid: "de0de0fc-e634-4bbc-8ecc-4d413614c84d"
   description: "Secondary supply water flowrate monitoring"

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

@@ -186,6 +186,20 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
+CDWS_SS_SRC_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
+  - MWFRM
+  - BWFRM
+
 CDWS_SWTC_CMWDT_BYPVPM_BWECVC_BWFRM_MWFRM:
   guid: "6454dd88-5857-4920-b438-fe8cb7f5a3bd"
   description: "Condensing water system with bypass valve, blowdown water valve electricconductivity control, makeup water flowrate monitoring and common water temperature differential monitoring."

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

@@ -679,9 +679,28 @@ 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:
+  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."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SRC
+  - VSC
+  - CHDXSC
+  - SCHWTC
+  - CWSISOVPM
+  - CHWSWISOVM
+  - CHWDPC
+  - CWDPC
+  - CWDT
+  - REFPM
+  - REFSM
+
 CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM:
-  guid: "8a648fa7-d065-4ff4-b524-626b4a23c238"
-  description: "Water cooled chiller with three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, chilled supply water islation valve, chilled and condensing water differential pressure monitoring and condensing water temperature differential monitoring."
+  guid: "6a4312c9-6d4c-4aa9-be3c-aad990f41ca4"
+  description: "Water cooled chiller with three compressors, refrigeration circuit monitoring, condensing supply and return water isolation valve, chilled supply water islation valve, chilled water differential pressure monitoring and condensing water temperature differential monitoring."
   is_canonical: true
   implements:
   - CH
@@ -695,6 +714,26 @@ 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:
+  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."
+  is_canonical: true
+  implements:
+  - CH
+  - SS
+  - SRC
+  - DX3SCHWC
+  - CWSISOVM
+  - CWRISOVM
+  - CHWSWISOVM
+  - CHWDPC
+  - CWDPC
+  - CHWHRDPC
+  - CWHRDPC
+  - CWDT
+  - CHWDT
+  - RCKTM
+
 CH_SS_DX4SWC_RWTM_REFSM2X_REFPM2X_CPC:
   guid: "6de8a9fd-87c5-4190-b4e2-402ede91900d"
   description: "Four stage air cooled chiller with return water temperature monitoring, circulation pump monitoring and two circuit refrigerant monitoring."
@@ -921,4 +960,4 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
   - condensing_supply_water_temperature_sensor
   opt_uses:
   - lost_power_alarm
-  - run_mode
+  - run_mode

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

@@ -485,6 +485,47 @@ CHWS_THCWDPC_RWCHVVM_SWCHVVM_PWDT_SESWTC_PWRFM:
   - SESWTC
   - PWRFM
 
+CHWS_SWTC_WDPM_CLPM_WFRM:
+  guid: "7422cbbc-92ec-420b-9dcb-f7f40502fba5"
+  description: "Chilled water system with cooling thermal power monitoring, supply water temperature control, differential pressure and flowrate monitoring."
+  is_canonical: true
+  implements:  
+  - CHWS
+  - SWTC
+  - WDPC
+  - CLPM
+  - WFRM
+
+CHWS_SRC_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."
+  is_canonical: true
+  implements:  
+  - CHWS
+  - SRC
+  - SWTC
+  - WDPC
+  - CLPM
+  - WFRM
+
+CHWS_SS_SRC_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."
+  is_canonical: true
+  implements:  
+  - CHWS
+  - SS
+  - SRC
+  - WDPC
+  - SWISOVPM
+  - BYPVPM
+  - WSEBYPVPM
+  - PWDT
+  - PRSWFRC
+  - SESWTC
+  - SEWFRM
+  - CLPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/DHWT.yaml

@@ -18,14 +18,52 @@
 
 DHWT_HWTTC_CPC_HWRWC:
   guid: "cdf9abad-348f-4969-a00b-426bbf67eb21"
-  description: "Standard calorifier with return pump."
+  description: "Standard calorifier with return pump and valve control."
   is_canonical: true
   implements:
   - DHWT
   - HWTTC
   - CPC
   - HWRWC
 
+DHWT_SS_HWTTC_CPC:
+  guid: "0aab25ad-58e1-48df-ae95-a12804b7c765"
+  description: "Standard calorifier with run control and return pump."
+  is_canonical: true
+  implements:
+  - DHWT
+  - SS
+  - HWTTC
+  - CPC
+
+DHWT_HWTTC_CPC:
+  guid: "7d6ed448-6d11-457b-8158-0d939dd8e679"
+  description: "Standard calorifier with return pump."
+  is_canonical: true
+  implements:
+  - DHWT
+  - HWTTC
+  - CPC
+
+DHWT_HWTTC_CPC2X:
+  guid: "7af57375-2409-4e33-a1a0-a486df5c4fb1"
+  description: "Standard calorifier with two return pumps."
+  is_canonical: true
+  implements:
+  - DHWT
+  - HWTTC
+  - CPC2X
+
+DHWT_HWTTC_CPC2X_WFRSM:
+  guid: "6f368134-fd59-4e63-aa5d-e815596ae257"
+  description: "Standard calorifier with two return pumps and flowrate monitoring."
+  is_canonical: true
+  implements:
+  - DHWT
+  - HWTTC
+  - CPC2X
+  - WFRSM
+
 DHWT_HTSWC_HWTTC_CPC_HWSWC:
   guid: "a7075251-5beb-41da-9a05-61496f6fcb4e"
   description: "Standard calorifier with return pump and immersion heater."

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

@@ -405,6 +405,30 @@ HWS_PWDT_SESWTC_SEWDPC_SERWFRM_SEWTM:
   - SERWFRM
   - SEWTM
 
+HWS_SRC_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
+  - SWTC
+  - WDPC
+  - WFRM
+  - HWTTC
+  - HLPM
+
+HWS_SWTC_WDPM_WFRM_HLPM:
+  guid: "20f843b3-d602-411a-921a-4bb4b8f05b67"
+  description: "Heating water system with heating thermal power monitoring, supply water temperature control, differential pressure control, and flowrate monitoring."
+  is_canonical: true
+  implements:
+  - HWS
+  - SWTC
+  - WDPM
+  - WFRM
+  - HLPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################