From 50c89d99e8007bef730b825589aa36da24df350b Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:21:50 -0800
Subject: [PATCH 01/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index d4c9289ad..7295ffa26 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -226,6 +226,9 @@ literals:
   - ON
   - OFF
   - AUTO
+- economizer_override_mode:
+  - ON
+  - OFF
 - sync_economizer_mechanical_cooling_mode:
   - ON
   - OFF
@@ -432,6 +435,9 @@ literals:
   - ON
   - OFF
   - STANDBY
+- run_request_status:
+  - ON
+  - OFF
 - speed_frequency_sensor:
     flexible_min: -0.5
     flexible_max: 65.0
@@ -1146,6 +1152,9 @@ literals:
 - cooling_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 3517000.0
+- economizer_thermal_power_sensor:
+    flexible_min: 0.0
+    flexible_max: 3517000.0
 - primary_water_cooling_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 3517000.0
@@ -2341,6 +2350,9 @@ literals:
 - heating_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 586142.14
+- heating_thermal_power_capacity:
+    flexible_min: 0.0
+    flexible_max: 586142.14
 - primary_water_heating_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 586142.14

From 0e27151dac91eac4ef88144c48da9902dff65003 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:28:01 -0800
Subject: [PATCH 02/45] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index bc958cde8..a6330a19a 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -1350,6 +1350,7 @@ RWTC:
   - OPERATIONAL
   opt_uses:
   - run_command
+  - heating_request_count
   - supply_water_temperature_sensor
   - high_supply_water_temperature_alarm
   - low_supply_water_temperature_alarm
@@ -6035,6 +6036,17 @@ RWTM:
   uses:
   - return_water_temperature_sensor
 
+WSEM:
+  guid: "77f156c3-3748-4a3e-942f-1ff17b173cb3"
+  description: "Water side economizer monitoring."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - economizer_mode
+  opt_uses:
+  - economizer_thermal_power_sensor
+  - economizer_override_mode
 
 WSERWTM:
   guid: "132824f4-213b-4e8f-85f9-fdad8a194146"
@@ -7057,6 +7069,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:

From e832344784a15dbd432d85d9948cc8f949883392 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:28:32 -0800
Subject: [PATCH 03/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/entity_types/ABSTRACT.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ontology/yaml/resources/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
index 9e43563ad..bd52ad722 100644
--- a/ontology/yaml/resources/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
@@ -5,3 +5,5 @@ SS:
   uses:
   - run_command
   - run_status
+  opt_uses:
+  - run_request_status

From e0e8e5112a59ff1a8fa3a98136bb7838fa41bb28 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:47:26 -0800
Subject: [PATCH 04/45] Update CHWS.yaml

---
 .../resources/HVAC/entity_types/CHWS.yaml     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index 49e46f279..ea1c771d5 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -473,6 +473,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_WSEM_WSEBYPVPM_PWDT_PRWFRM_SEWTM_SEWFRM_CLPM:
+  guid: "49477bff-e5f7-42bc-b498-8965f4ed3e41"
+  description: "Chilled water system with schedule run command, cooling thermal power monitoring, primary and secondary water monitoring, and water side economizing."
+  is_canonical: true
+  implements:  
+  - CHWS
+  - SRC
+  - WDPC
+  - SWISOVPM
+  - BYPVPM
+  - WSEM
+  - WSEBYPVPM
+  - PWDT
+  - PRWFRM
+  - SEWTM
+  - SEWFRM
+  - CLPM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

From 288fc1e49dcf685b623147414c68ea55f95985d7 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:54:41 -0800
Subject: [PATCH 05/45] Update HWS.yaml

---
 .../yaml/resources/HVAC/entity_types/HWS.yaml | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml b/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
index a214d04bf..ff5e4229a 100644
--- a/ontology/yaml/resources/HVAC/entity_types/HWS.yaml
+++ b/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 ###
 ###################################

From 1caac81f56cebb235aa7a691fd4fdb77769b9f6c Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:00:17 -0800
Subject: [PATCH 06/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 7295ffa26..e9d0ece7e 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2350,9 +2350,6 @@ literals:
 - heating_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 586142.14
-- heating_thermal_power_capacity:
-    flexible_min: 0.0
-    flexible_max: 586142.14
 - primary_water_heating_thermal_power_sensor:
     flexible_min: 0.0
     flexible_max: 586142.14

From bce3684f09bf831d7779d97b71805bb43f5af8dc Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:05:05 -0800
Subject: [PATCH 07/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index e9d0ece7e..6cc8bb64c 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+r# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the License);
 # you may not use this file except in compliance with the License.
@@ -435,7 +435,7 @@ literals:
   - ON
   - OFF
   - STANDBY
-- run_request_status:
+- request_run_status:
   - ON
   - OFF
 - speed_frequency_sensor:

From 8d6c9cb6d94d667ecf8246bb4f2efee985de945d Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:06:59 -0800
Subject: [PATCH 08/45] Update telemetry_fields.yaml


From c330369836429c52fab857c10c0cafa1c442610e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:07:19 -0800
Subject: [PATCH 09/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
index bd52ad722..679c351dd 100644
--- a/ontology/yaml/resources/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
@@ -6,4 +6,4 @@ SS:
   - run_command
   - run_status
   opt_uses:
-  - run_request_status
+  - request_run_status

From 43deb12ddaff4d4114682e20ec1e7b48473947db Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:09:50 -0800
Subject: [PATCH 10/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 6cc8bb64c..a74b0bc6e 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1,4 +1,4 @@
-r# Copyright 2020 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the License);
 # you may not use this file except in compliance with the License.

From 4efe9e1e39d4976ace59486eef89a044a0fc407b Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 08:32:43 -0800
Subject: [PATCH 11/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/entity_types/ABSTRACT.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ontology/yaml/resources/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
index 679c351dd..9e43563ad 100644
--- a/ontology/yaml/resources/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/entity_types/ABSTRACT.yaml
@@ -5,5 +5,3 @@ SS:
   uses:
   - run_command
   - run_status
-  opt_uses:
-  - request_run_status

From a29a3ff0976b497b8c1845413a00a4ee25cd3a0c Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 08:33:18 -0800
Subject: [PATCH 12/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index a6330a19a..1ca987a02 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -807,6 +807,7 @@ SS:
   - communication_status
   - efficiency_percentage_sensor
   - load_percentage_sensor
+  - request_run_status
 
 DSPC:
   guid: "3f288511-32ca-47ae-a4e0-391620026420"

From eb29d67ec284f37c5f62bbed36a6ca8e7f4e592b Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:13:56 -0800
Subject: [PATCH 13/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index a74b0bc6e..b01252e13 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -93,6 +93,9 @@ literals:
 - chilled_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945
+- heat_recovery_chilled_water_differential_pressure_setpoint:
+    flexible_min: -34473.78945
+    flexible_max: 344737.8945
 - chilled_water_differential_temperature_sensor:
     flexible_min: 254.8148148
     flexible_max: 380.3703704
@@ -2407,6 +2410,9 @@ literals:
 - condensing_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945
+- heat_recovery_condensing_water_differential_pressure_setpoint:
+    flexible_min: -34473.78945
+    flexible_max: 344737.8945
 - condensing_water_differential_temperature_sensor:
     flexible_min: 254.8148148
     flexible_max: 380.3703704

From a45401c43bf5db5ef97abefa142ab1d5c7613dce Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:17:03 -0800
Subject: [PATCH 14/45] Update ABSTRACT.yaml

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 1ca987a02..8d081f135 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -5356,6 +5356,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."
@@ -6061,7 +6072,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."
@@ -6071,6 +6081,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."

From 4495a074e1c5cfdca5f5f99567d99e466aa7e8c0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:30:27 -0800
Subject: [PATCH 15/45] Update CH.yaml

---
 .../yaml/resources/HVAC/entity_types/CH.yaml  | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index 1e768b5f3..498691bfa 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -653,9 +653,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."
+  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
@@ -669,6 +688,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."
@@ -895,4 +934,4 @@ CH_SS_CHWSWISOVM_CWSISOVM_CWRISOVM_CHWRWISOVM_CHWDT:
   - condensing_supply_water_temperature_sensor
   opt_uses:
   - lost_power_alarm
-  - run_mode
\ No newline at end of file
+  - run_mode

From 3de46552147f5212ab88460b68039e7ffb145a95 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:37:06 -0800
Subject: [PATCH 16/45] Update CH.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CH.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index 498691bfa..9b0600008 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -673,7 +673,7 @@ CH_SS_SRC_VSC_CHDXSC_SCHWTC_CWSISOVPM_CHWSWISOVM_CHWDPC_CWDPC_CWDT_REFPM_REFSM:
   - REFSM
 
 CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM:
-  guid: "8a648fa7-d065-4ff4-b524-626b4a23c238"
+  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:

From 2be11bc0c9171738c728ddb65b1fb26d425ee537 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:08:59 -0800
Subject: [PATCH 17/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index b01252e13..13f4cffa8 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -93,6 +93,12 @@ literals:
 - chilled_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945
+- building_condensing_loop_water_differential_pressure_sensor:
+    flexible_min: -34473.78945
+    flexible_max: 344737.8945
+- building_condensing_loop_water_differential_pressure_setpoint:
+    flexible_min: -34473.78945
+    flexible_max: 344737.8945
 - heat_recovery_chilled_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945

From 03b3b60325381814ed9053f601a04f3a0c2b9c0e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:11:27 -0800
Subject: [PATCH 18/45] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 8d081f135..5b26be55d 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6091,6 +6091,16 @@ CWDPC:
   - condensing_water_differential_pressure_sensor
   - condensing_water_differential_pressure_setpoint
 
+BCWDPC:
+  guid: "598e4a89-9535-43fb-aa4b-0006dfccae5e"
+  description: "Differential pressure control for condenser water supplying chillers at one of multiple buildings."
+  is_abstract: true
+  implements:
+  - MONITORING
+  uses:
+  - building_condensing_loop_water_differential_pressure_sensor
+  - building_condensing_loop_water_differential_pressure_setpoint
+
 CWHRDPC:
   guid: "ddd40420-3034-4289-9f34-103934540f58"
   description: "Heat recovery differential pressure control for condenser water."

From b61cbf32e67f1845c4b2316a82155289484533d0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:13:53 -0800
Subject: [PATCH 19/45] Update CDWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CDWS.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index 7f0ea2aa9..6c8188e99 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -186,6 +186,19 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
+CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
+  guid: "27d51584-886f-4142-8e8a-17af27aa9fec"
+  description: "Multi-building condensing water system (temp control) with bypass control, flow monitoring and basin water system"
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - BYPVPM
+  - WFRM
+  - MWFRM
+  - BWFRM
+  - BCWDPC
+
 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."

From 40146b4cf18cd00db17f9082fd5b9af55202aad7 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:45:06 -0800
Subject: [PATCH 20/45] Update CDWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CDWS.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index 6c8188e99..fa6cabb0c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -186,12 +186,14 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
-CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
+CDWS_SS_SRC_SWTC_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
   guid: "27d51584-886f-4142-8e8a-17af27aa9fec"
   description: "Multi-building condensing water system (temp control) with bypass control, flow monitoring and basin water system"
   is_canonical: true
   implements:
   - CDWS
+  - SS
+  - SRC
   - SWTC
   - BYPVPM
   - WFRM

From ca99a58a90f877d5b557a4c328276752f6dd933d Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:31:24 -0800
Subject: [PATCH 21/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 5b26be55d..1052408ad 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -4210,6 +4210,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"
@@ -4220,7 +4228,6 @@ CDWFRSM:
   implements:
   - OPERATIONAL
 
-
 BYPVPM:
   guid: "57766034-a856-4dfe-b070-fd65673d8dd0"
   description: "Bypass water valve percentage monitoring."

From c937ebdd4e0c324927ed47f7c55c269ec5fc68b4 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:00:25 -0800
Subject: [PATCH 22/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 1052408ad..7df1483b9 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6913,6 +6913,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

From 024e2e616c0b58cb8710eb7487667a0415d238a7 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:04:45 -0800
Subject: [PATCH 23/45] Update DHWT.yaml

---
 .../resources/HVAC/entity_types/DHWT.yaml     | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
index cbbb89374..194574041 100644
--- a/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/DHWT.yaml
@@ -18,7 +18,7 @@
 
 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
@@ -26,6 +26,44 @@ DHWT_HWTTC_CPC_HWRWC:
   - 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."

From f59774f1616503cd31c286d17edc820731b8008f Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:00:58 -0800
Subject: [PATCH 24/45] Update subfields.yaml

---
 ontology/yaml/resources/subfields/subfields.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/subfields/subfields.yaml b/ontology/yaml/resources/subfields/subfields.yaml
index 42939c286..33ac38590 100644
--- a/ontology/yaml/resources/subfields/subfields.yaml
+++ b/ontology/yaml/resources/subfields/subfields.yaml
@@ -353,6 +353,7 @@ measurement_descriptor:
   deadband: "Represents a range in which the controller does not do anything."
   dewpoint: "The thermodynamic point at which water condenses from standing air."
   differential: "Measured difference between two reference points (e.g. differential_water_pressure)"
+  disable: "State of being unable to be active or operating."
   down: "The direction of a spatial movement, opposite of up."
   dynamic: "Describing a system which is unstable or constantly changing (e.g. supply_air_dynamic_pressure_sensor)."
   efficiency: "The ratio of required input to actual output. "

From 5166dc0b672bc6ce977af166aac60fc458fec45a Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:01:10 -0800
Subject: [PATCH 25/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 13f4cffa8..238613ab8 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -235,7 +235,7 @@ literals:
   - ON
   - OFF
   - AUTO
-- economizer_override_mode:
+- economizer_disable_mode:
   - ON
   - OFF
 - sync_economizer_mechanical_cooling_mode:

From a42191a8f78660b20df1645879259d7234e9f1bd Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:28:46 -0800
Subject: [PATCH 26/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 7df1483b9..cba72936b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6065,7 +6065,7 @@ WSEM:
   - economizer_mode
   opt_uses:
   - economizer_thermal_power_sensor
-  - economizer_override_mode
+  - economizer_disable_mode
 
 WSERWTM:
   guid: "132824f4-213b-4e8f-85f9-fdad8a194146"

From 2e0d30e178b5104ae61bd28e6c48bed98169cfd0 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 08:59:54 -0800
Subject: [PATCH 27/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 238613ab8..ee1c345f0 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1152,6 +1152,9 @@ literals:
 - primary_supply_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451
+- primary_supply_water_flowrate_setpoint:
+    flexible_min: -0.000315451
+    flexible_max: 0.315451
 - primary_return_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451

From 1749cd35c49a7b5697deadafd1617b56df6679da Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:01:20 -0800
Subject: [PATCH 28/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index cba72936b..1530584dc 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8408,6 +8408,15 @@ PRWFRM:
   implements:
   - MONITORING
 
+PRWFRC:
+  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"

From db6206eb20ed54afbc353ba85dd284854931f17e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:05:04 -0800
Subject: [PATCH 29/45] Update CHWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index ea1c771d5..b8dcf1623 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -496,12 +496,13 @@ CHWS_SRC_SWTC_WDPC_CLPM_WFRM:
   - CLPM
   - WFRM
 
-CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRM_SEWTM_SEWFRM_CLPM:
+CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_SEWTC_SEWFRM_CLPM:
   guid: "49477bff-e5f7-42bc-b498-8965f4ed3e41"
-  description: "Chilled water system with schedule run command, cooling thermal power monitoring, primary and secondary water monitoring, and water side economizing."
+  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
@@ -509,8 +510,8 @@ CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRM_SEWTM_SEWFRM_CLPM:
   - WSEM
   - WSEBYPVPM
   - PWDT
-  - PRWFRM
-  - SEWTM
+  - PRWFRC
+  - SEWTC
   - SEWFRM
   - CLPM
 

From 841ba54ddf8b56de9b260076e979106acf3db93c Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:16:07 -0800
Subject: [PATCH 30/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 1530584dc..cad3d7d53 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6066,6 +6066,7 @@ WSEM:
   opt_uses:
   - economizer_thermal_power_sensor
   - economizer_disable_mode
+  - sync_economizer_mechanical_cooling_mode
 
 WSERWTM:
   guid: "132824f4-213b-4e8f-85f9-fdad8a194146"

From b2532f79f58632309ee6356533b1b8d0f736f59e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:17:38 -0800
Subject: [PATCH 31/45] Update CDWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CDWS.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index fa6cabb0c..c427fae43 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -186,7 +186,7 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
-CDWS_SS_SRC_SWTC_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
+CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
   guid: "27d51584-886f-4142-8e8a-17af27aa9fec"
   description: "Multi-building condensing water system (temp control) with bypass control, flow monitoring and basin water system"
   is_canonical: true
@@ -195,6 +195,7 @@ CDWS_SS_SRC_SWTC_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
   - SS
   - SRC
   - SWTC
+  - WSEM
   - BYPVPM
   - WFRM
   - MWFRM

From 824bca3750ed86ffbceb5c21eb41ff31ce1fe5da Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:30:55 -0800
Subject: [PATCH 32/45] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index cad3d7d53..08122c894 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8050,6 +8050,17 @@ SEWTM:
   implements:
   - MONITORING
 
+SESWTC:
+  guid: "041a299f-657c-4b77-8138-ac4679452498"
+  description: "Secondary water temperature control"
+  opt_uses:
+  - secondary_return_water_temperature_sensor
+  uses:
+  - secondary_supply_water_temperature_sensor
+  - secondary_supply_water_temperature_setpoint
+  implements:
+  - MONITORING
+
 EXTOR:
   guid: "6f650a5a-06d3-4316-af26-7d4b8241aecf"
   description: "shade control with extension monitoring based on outside illuminance"

From f3152ed59c96cb604c47422e42918801292066cc Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:31:24 -0800
Subject: [PATCH 33/45] Update CHWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index b8dcf1623..48f13312b 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -496,7 +496,7 @@ CHWS_SRC_SWTC_WDPC_CLPM_WFRM:
   - CLPM
   - WFRM
 
-CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_SEWTC_SEWFRM_CLPM:
+CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_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
@@ -511,7 +511,7 @@ CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_SEWTC_SEWFRM_CLPM:
   - WSEBYPVPM
   - PWDT
   - PRWFRC
-  - SEWTC
+  - SESWTC
   - SEWFRM
   - CLPM
 

From 1065d8b98a850de83c634c56d4b9bd0a1995f115 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:33:39 -0800
Subject: [PATCH 34/45] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 08122c894..cad3d7d53 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8050,17 +8050,6 @@ SEWTM:
   implements:
   - MONITORING
 
-SESWTC:
-  guid: "041a299f-657c-4b77-8138-ac4679452498"
-  description: "Secondary water temperature control"
-  opt_uses:
-  - secondary_return_water_temperature_sensor
-  uses:
-  - secondary_supply_water_temperature_sensor
-  - secondary_supply_water_temperature_setpoint
-  implements:
-  - MONITORING
-
 EXTOR:
   guid: "6f650a5a-06d3-4316-af26-7d4b8241aecf"
   description: "shade control with extension monitoring based on outside illuminance"

From 7b5d71f37def89db8f2313eb21126d95e096945e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:11:31 -0800
Subject: [PATCH 35/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index ee1c345f0..e92201b61 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -93,12 +93,6 @@ literals:
 - chilled_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945
-- building_condensing_loop_water_differential_pressure_sensor:
-    flexible_min: -34473.78945
-    flexible_max: 344737.8945
-- building_condensing_loop_water_differential_pressure_setpoint:
-    flexible_min: -34473.78945
-    flexible_max: 344737.8945
 - heat_recovery_chilled_water_differential_pressure_setpoint:
     flexible_min: -34473.78945
     flexible_max: 344737.8945
@@ -444,7 +438,7 @@ literals:
   - ON
   - OFF
   - STANDBY
-- request_run_status:
+- request_run_command:
   - ON
   - OFF
 - speed_frequency_sensor:

From fe92545aed32ec5adf9a2aa0f9b819ff3e2d0b65 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:11:56 -0800
Subject: [PATCH 36/45] Update ABSTRACT.yaml

---
 .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index cad3d7d53..8571fc519 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6099,16 +6099,6 @@ CWDPC:
   - condensing_water_differential_pressure_sensor
   - condensing_water_differential_pressure_setpoint
 
-BCWDPC:
-  guid: "598e4a89-9535-43fb-aa4b-0006dfccae5e"
-  description: "Differential pressure control for condenser water supplying chillers at one of multiple buildings."
-  is_abstract: true
-  implements:
-  - MONITORING
-  uses:
-  - building_condensing_loop_water_differential_pressure_sensor
-  - building_condensing_loop_water_differential_pressure_setpoint
-
 CWHRDPC:
   guid: "ddd40420-3034-4289-9f34-103934540f58"
   description: "Heat recovery differential pressure control for condenser water."

From a928ae6a24df5a06d78bcf04e72606032c95847e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:12:29 -0800
Subject: [PATCH 37/45] Update CDWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CDWS.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index c427fae43..b7c6e2559 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -186,9 +186,9 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
-CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
+CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_MWFRM_BWFRM:
   guid: "27d51584-886f-4142-8e8a-17af27aa9fec"
-  description: "Multi-building condensing water system (temp control) with bypass control, flow monitoring and basin water system"
+  description: "Condensing water system (temp control) with bypass control, flow monitoring and basin water system"
   is_canonical: true
   implements:
   - CDWS
@@ -200,7 +200,6 @@ CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_MWFRM_BWFRM_BCWDPC:
   - WFRM
   - MWFRM
   - BWFRM
-  - BCWDPC
 
 CDWS_SWTC_CMWDT_BYPVPM_BWECVC_BWFRM_MWFRM:
   guid: "6454dd88-5857-4920-b438-fe8cb7f5a3bd"

From 40d4c870792f5d1e1d206dbfca0ff398379c0931 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:14:30 -0800
Subject: [PATCH 38/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 8571fc519..aea8d0c9c 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -807,7 +807,7 @@ SS:
   - communication_status
   - efficiency_percentage_sensor
   - load_percentage_sensor
-  - request_run_status
+  - request_run_command
 
 DSPC:
   guid: "3f288511-32ca-47ae-a4e0-391620026420"

From ec273734695dbab1235803df4465dbde1207e676 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:29:08 -0800
Subject: [PATCH 39/45] Update telemetry_fields.yaml

---
 ontology/yaml/resources/fields/telemetry_fields.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index e92201b61..89d74e0ac 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -229,7 +229,7 @@ literals:
   - ON
   - OFF
   - AUTO
-- economizer_disable_mode:
+- economizer_disable_command:
   - ON
   - OFF
 - sync_economizer_mechanical_cooling_mode:

From 57c5a88d865b46efaec4d05f258bd87c7472014e Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 07:29:34 -0800
Subject: [PATCH 40/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index aea8d0c9c..c19a75b89 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6065,7 +6065,7 @@ WSEM:
   - economizer_mode
   opt_uses:
   - economizer_thermal_power_sensor
-  - economizer_disable_mode
+  - economizer_disable_command
   - sync_economizer_mechanical_cooling_mode
 
 WSERWTM:

From 7e32d1e7cf60cb0c4633cae6523c0ee536ce07ce Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:28:56 -0800
Subject: [PATCH 41/45] Update ABSTRACT.yaml

---
 .../resources/HVAC/entity_types/ABSTRACT.yaml     | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index c19a75b89..4a18c1834 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6055,19 +6055,6 @@ RWTM:
   uses:
   - return_water_temperature_sensor
 
-WSEM:
-  guid: "77f156c3-3748-4a3e-942f-1ff17b173cb3"
-  description: "Water side economizer monitoring."
-  is_abstract: true
-  implements:
-  - MONITORING
-  uses:
-  - economizer_mode
-  opt_uses:
-  - economizer_thermal_power_sensor
-  - economizer_disable_command
-  - sync_economizer_mechanical_cooling_mode
-
 WSERWTM:
   guid: "132824f4-213b-4e8f-85f9-fdad8a194146"
   description: "Water side economizer return water temperature monitoring."
@@ -8342,6 +8329,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:

From 014db7bab4929124ee3faf77aa51ebb53f0c2b34 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:29:24 -0800
Subject: [PATCH 42/45] Update CHWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index 48f13312b..2f56517ee 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -496,7 +496,7 @@ CHWS_SRC_SWTC_WDPC_CLPM_WFRM:
   - CLPM
   - WFRM
 
-CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_SESWTC_SEWFRM_CLPM:
+CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRWFRC_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
@@ -507,7 +507,6 @@ CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEM_WSEBYPVPM_PWDT_PRWFRC_SESWTC_SEWFRM_CLPM:
   - WDPC
   - SWISOVPM
   - BYPVPM
-  - WSEM
   - WSEBYPVPM
   - PWDT
   - PRWFRC

From 024ee6672fbb6521092770b32112fe150ba638a7 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:38:18 -0800
Subject: [PATCH 43/45] Update CDWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CDWS.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
index b7c6e2559..dd474c722 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CDWS.yaml
@@ -186,7 +186,7 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
-CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_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
@@ -195,7 +195,6 @@ CDWS_SS_SRC_SWTC_WSEM_BYPVPM_WFRM_MWFRM_BWFRM:
   - SS
   - SRC
   - SWTC
-  - WSEM
   - BYPVPM
   - WFRM
   - MWFRM

From 896ffdcb0486a28e5014d060ca8cd49ccdc9f7de Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:55:39 -0800
Subject: [PATCH 44/45] Update ABSTRACT.yaml

---
 ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 4a18c1834..d541fab17 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8388,7 +8388,7 @@ PRWFRM:
   implements:
   - MONITORING
 
-PRWFRC:
+PRSWFRC:
   guid: "71821a9c-2600-4123-b474-dbe2816e8f6c"
   description: "Primary supply water flowrate control"
   uses:

From e1c14c071b7a42a00f616ae1bfc74489095c0878 Mon Sep 17 00:00:00 2001
From: shambergoldstein <124837286+shambergoldstein@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:56:57 -0800
Subject: [PATCH 45/45] Update CHWS.yaml

---
 ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
index 2f56517ee..661e6fc14 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -496,7 +496,7 @@ CHWS_SRC_SWTC_WDPC_CLPM_WFRM:
   - CLPM
   - WFRM
 
-CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRWFRC_SESWTC_SEWFRM_CLPM:
+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
@@ -509,7 +509,7 @@ CHWS_SS_SRC_WDPC_SWISOVPM_BYPVPM_WSEBYPVPM_PWDT_PRWFRC_SESWTC_SEWFRM_CLPM:
   - BYPVPM
   - WSEBYPVPM
   - PWDT
-  - PRWFRC
+  - PRSWFRC
   - SESWTC
   - SEWFRM
   - CLPM