From 516828d17465a4cbf05985e8b3540e5525377a03 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:14:40 -0700
Subject: [PATCH 01/20] METER namespace revisions

---
 ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
index e7b748263..9c3ffee03 100644
--- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
@@ -75,9 +75,10 @@ PVCM:
   - phase2_neutral_line_voltage_sensor
   - phase3_neutral_line_voltage_sensor
   
+# TODO: rename to make this more intuitive
 PWMRDM:
   guid: "4bfb27f6-0a27-48d9-8830-81c84d95c8ab"
-  description: "Energy monitoring from Electrical Grid and Generator with run hours monitoring."
+  description: "Energy monitoring from electrical grid and generator with run hours monitoring."
   is_abstract: true
   uses:
   - generator_energy_accumulator
@@ -87,7 +88,7 @@ PWMRDM:
 
 TPWM:
   guid: "141dc3bf-85dd-4fce-9342-9a5462b3c274"
-  description: "Thermal power and thermal energy monitoring."
+  description: "Thermal power and thermal energy monitoring (typically used for heat meters)."
   is_abstract: true
   uses:
     - thermal_energy_accumulator
@@ -95,7 +96,7 @@ TPWM:
 
 VCM:
   guid: "dc4d2839-c00d-4935-bc67-013f7721535f"
-  description: "Current and voltage monitoring"
+  description: "Current and voltage monitoring."
   is_abstract: true
   uses:
   - current_sensor

From ef65f298548bcfcd20701bd560d4f181a3cadf6f Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:21:57 -0700
Subject: [PATCH 02/20] Update ABSTRACT.yaml

---
 .../METERS/entity_types/ABSTRACT.yaml         | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
index 9c3ffee03..e546b76fb 100644
--- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
@@ -101,3 +101,29 @@ VCM:
   uses:
   - current_sensor
   - voltage_sensor
+
+WVAM:
+  guid: "a9b16412-be29-4dd8-815f-544bf72a8fae"
+  description: "Water volume accumulator monitoring."
+  is_abstract: true
+  opt_uses:
+  - water_flowrate_sensor
+  - water_linearvelocity_sensor
+  uses:
+  - water_volume_accumulator
+
+GVAM:
+  guid: "c7761aab-7560-4c62-9095-e9931b0f4c81"
+  description: "Gas volume accumulator monitoring."
+  is_abstract: true
+  opt_uses:
+  - gas_flowrate_sensor
+  uses:
+  - gas_volume_accumulator
+
+GTM:
+  guid: "011225da-4eb3-4875-a1df-0f3cc3a2a7a0"
+  description: "Gas temperature monitoring."
+  is_abstract: true
+  uses:
+  - gas_temperature_sensor

From 91acc8b155445a2a38fbf64bb063b0594935a05c Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:24:25 -0700
Subject: [PATCH 03/20] Update GM.yaml

---
 .../resources/METERS/entity_types/GM.yaml     | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/GM.yaml b/ontology/yaml/resources/METERS/entity_types/GM.yaml
index 4d9aff617..a783af724 100644
--- a/ontology/yaml/resources/METERS/entity_types/GM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/GM.yaml
@@ -12,26 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GM_STANDARD:
+GM_GVAM_GTM:
   guid: "96de90c9-fb62-4557-b29c-aa723e255a8f"
-  description: "The typical building gas meter."
+  description: "Gas meter that measures volume and temperature."
+  is_canonical: true
   implements:
   - GM
-  is_canonical: true
-  uses:
-  - gas_flowrate_sensor
-  - gas_volume_accumulator
-  - gas_temperature_sensor
+  - GVAM
+  - GTM
 
-GM_PULSE:
+GM_GVAM:
   guid: "0b74bcd2-f3c6-42b2-9a91-88f34c5d472d"
-  description: "Gas meter that operates by counting pulses, interpreted into flow and accumulated volume."
+  description: "Gas meter that measures volume accumulated (e.g., pulse meter)."
+  is_canonical: true
   implements:
   - GM
-  is_canonical: true
-  uses:
-  - gas_flowrate_sensor
-  - gas_volume_accumulator
+  - GVAM
 
 GM_TPWM:
   guid: "223b81fb-9fcf-475b-a2f5-ad5d1364454c"
@@ -41,4 +37,4 @@ GM_TPWM:
   - GM
   - TPWM
   opt_uses:
-  - gas_temperature_sensor
+  - gas_temperature_sensor # TODO: examine optional usage of this (remove and implement GTM, if possible)

From 7b532cc04901f77db5a5d18dcdc23a03ffb42ae4 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:27:06 -0700
Subject: [PATCH 04/20] Update WM.yaml

---
 .../resources/METERS/entity_types/WM.yaml     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/WM.yaml b/ontology/yaml/resources/METERS/entity_types/WM.yaml
index fdc4df113..bc223fef2 100644
--- a/ontology/yaml/resources/METERS/entity_types/WM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/WM.yaml
@@ -12,27 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-WM_STANDARD:
+WM_WVAM:
   guid: "7cbdf4a9-82f0-4dd5-991f-14984cbce4cb"
-  description: "Standard building water meter."
+  description: "Standard building water meter with volume monitoring."
+  is_canonical: true
   implements:
   - WM
-  is_canonical: true
-  uses:
-  - water_volume_accumulator
+  - WVAM
   opt_uses:
-  - failed_alarm
-  - flowrate_sensor
+  - failed_alarm # TODO: remove this and add directly to GENERALTYPE
+  - flowrate_sensor # TODO: remove this and rely on optional usage of `water_flowrate_sensor` in the WVAM type
 
 WM_WF:
   guid: "df942136-4b98-4da7-9e68-acc210d6cf03"
   description: "Water supply flow rate meter with counter."
+  is_canonical: true
   implements:
   - WM
-  is_canonical: true
   uses:
-  - supply_water_flowrate_sensor
+  - supply_water_flowrate_sensor # TODO: examine why `supply` is needed
   opt_uses:
-  - supply_water_volume_accumulator
-  - water_linearvelocity_sensor
-  - water_volume_accumulator
+  - supply_water_volume_accumulator # TODO: examine why `supply` is needed
+  - water_linearvelocity_sensor # TODO: remove and rely on optional usage in WVAM type
+  - water_volume_accumulator # TODO: remove and rely on optional usage in WVAM type

From a21e1f92031fbb8f171a19019a7e846c4b911dcc Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:27:52 -0700
Subject: [PATCH 05/20] Update WM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/WM.yaml b/ontology/yaml/resources/METERS/entity_types/WM.yaml
index bc223fef2..92a8e9f67 100644
--- a/ontology/yaml/resources/METERS/entity_types/WM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/WM.yaml
@@ -23,6 +23,7 @@ WM_WVAM:
   - failed_alarm # TODO: remove this and add directly to GENERALTYPE
   - flowrate_sensor # TODO: remove this and rely on optional usage of `water_flowrate_sensor` in the WVAM type
 
+# TODO: potentially deprecate this type (not currently implemented by any entities)
 WM_WF:
   guid: "df942136-4b98-4da7-9e68-acc210d6cf03"
   description: "Water supply flow rate meter with counter."

From ced872b8e52a88fc75e4c70b845892647033386e Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:29:59 -0700
Subject: [PATCH 06/20] Update EM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml
index e12b632c1..7b9b385ea 100644
--- a/ontology/yaml/resources/METERS/entity_types/EM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml
@@ -54,8 +54,8 @@ EM_PWM_PVCM:
   - PWM
   - PVCM
   opt_uses:
-  - reactive_energy_accumulator
-  - apparent_energy_accumulator
+  - reactive_energy_accumulator # TODO: promote to PWM abstract
+  - apparent_energy_accumulator # TODO: promote to PWM abstract
 
 EM_PWM_AVCM:
   guid: "441a3b57-05e7-426d-bed9-061f28f21b3a"

From 079069c5177eb622deb9fe00d5a486c77c96e9f3 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:33:38 -0700
Subject: [PATCH 07/20] Update HM.yaml

---
 ontology/yaml/resources/METERS/entity_types/HM.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 4373aa466..946d132e9 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -18,12 +18,10 @@ HM_STANDARD:
   is_canonical: true
   implements:
   - HM
+  - TWPM
+  - HVAC/WDT
   uses:
   - flowrate_sensor
-  - supply_water_temperature_sensor
-  - return_water_temperature_sensor
-  - thermal_power_sensor
-  - thermal_energy_accumulator
   opt_uses:
   - water_volume_accumulator
 

From b21871a4cd9a27f062d3ab8b634930b8eb5f1460 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:35:15 -0700
Subject: [PATCH 08/20] Update HM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 946d132e9..17287184b 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -18,7 +18,7 @@ HM_STANDARD:
   is_canonical: true
   implements:
   - HM
-  - TWPM
+  - TPWM
   - HVAC/WDT
   uses:
   - flowrate_sensor

From ea4e1cda83e677c650ac1ad9b55c31d887056c4c Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:47:48 -0700
Subject: [PATCH 09/20] Update HM.yaml

---
 .../resources/METERS/entity_types/HM.yaml     | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 17287184b..44ac1a1a2 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -19,46 +19,43 @@ HM_STANDARD:
   implements:
   - HM
   - TPWM
-  - HVAC/WDT
+  - HVAC/WDT # inherits from HVAC namespace
   uses:
-  - flowrate_sensor
+  - flowrate_sensor # TODO: change to water_flowrate_sensor (for continuity)
   opt_uses:
-  - water_volume_accumulator
+  - water_volume_accumulator # TODO: determing if this can be promoted to `uses` (if so, implement WVAM)
 
 HM_CHW:
   guid: "4439f98a-c52b-4fff-8765-84e689862423"
   description: "Cooling load heat meter."
   implements:
   - HM
+  - HVAC/CHWDT # inherits from HVAC namespace
+  - HVAC/CHWFRM # inherits from HVAC namespace
   is_canonical: true
   uses:
-  - chilled_water_flowrate_sensor
-  - chilled_supply_water_temperature_sensor
-  - chilled_return_water_temperature_sensor
-  - cooling_thermal_power_sensor
-  - cooling_thermal_energy_accumulator
+  - cooling_thermal_power_sensor # TODO: justify if `cooling` needs to be specified here
+  - cooling_thermal_energy_accumulator # TODO: justify if `cooling` needs to be specified here
   opt_uses:
   - differential_temperature_sensor
-  - failed_alarm
+  - failed_alarm # TODO: define this on the general type
 
 HM_CHW_WAC:
   guid: "441029f3-1324-42c5-aca2-74138500917a"
   description: "Cooling load heat meter with total chilled water volume accumulator."
+  is_canonical: true
   implements:
   - HM_CHW
-  is_canonical: true
-  uses:
-  - water_volume_accumulator
+  - WVAM
 
 HM_HW:
   guid: "12427c9d-7d96-4551-b5de-e7d78a7d3674"
   description: "Heating load heat meter."
+  is_canonical: true  
   implements:
   - HM
-  is_canonical: true
+  - HVAC/HWDT # inherits from HVAC namespace
   uses:
-  - heating_water_flowrate_sensor
-  - heating_supply_water_temperature_sensor
-  - heating_return_water_temperature_sensor
-  - heating_thermal_power_sensor
-  - heating_thermal_energy_accumulator
+  - heating_water_flowrate_sensor # TODO: justify if `heating` needs to be specified here
+  - heating_thermal_power_sensor # TODO: justify if `heating` needs to be specified here (or if we can just use thermal_power_sensor)
+  - heating_thermal_energy_accumulator # TODO: justify if `heating` needs to be specified here

From 00b22acb531c5078f0bf7c4c49be29a8eacfab56 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:48:55 -0700
Subject: [PATCH 10/20] Update WM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/WM.yaml b/ontology/yaml/resources/METERS/entity_types/WM.yaml
index 92a8e9f67..eeacdcf03 100644
--- a/ontology/yaml/resources/METERS/entity_types/WM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/WM.yaml
@@ -18,7 +18,7 @@ WM_WVAM:
   is_canonical: true
   implements:
   - WM
-  - WVAM
+  - WVAM # TODO: we are creating tech debt to model it like this (in theory we should not need to specify `water` and could simply use `volume_accumulator`)
   opt_uses:
   - failed_alarm # TODO: remove this and add directly to GENERALTYPE
   - flowrate_sensor # TODO: remove this and rely on optional usage of `water_flowrate_sensor` in the WVAM type

From f75c2b90ae6013bb61e25e0e4317d645512e17d1 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:50:28 -0700
Subject: [PATCH 11/20] Update ABSTRACT.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
index e546b76fb..f7e15beaa 100644
--- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
@@ -102,6 +102,15 @@ VCM:
   - current_sensor
   - voltage_sensor
 
+VAM:
+  guid: "8f73213c-b12d-45e3-954d-6c876ddb12fc"
+  description: "Volume accumulator monitoring."
+  is_abstract: true
+  opt_uses:
+  - flowrate_sensor
+  uses:
+  - volume_accumulator
+
 WVAM:
   guid: "a9b16412-be29-4dd8-815f-544bf72a8fae"
   description: "Water volume accumulator monitoring."

From 3262df2c4d3c849e311d4ae79e2d67060579c101 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:50:57 -0700
Subject: [PATCH 12/20] Update FM.yaml

---
 ontology/yaml/resources/METERS/entity_types/FM.yaml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/FM.yaml b/ontology/yaml/resources/METERS/entity_types/FM.yaml
index bff32932f..4e9f71065 100644
--- a/ontology/yaml/resources/METERS/entity_types/FM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/FM.yaml
@@ -15,12 +15,7 @@
 FM_STANDARD:
   guid: "05f00511-9d04-4c98-ac9f-6aba9f0c9fe7"
   description: "Standard flow meter typically for liquid."
+  is_canonical: true
   implements:
   - FM
-  is_canonical: true
-  uses:
-  - volume_accumulator
-  - flowrate_sensor
-  opt_uses:
-  - failed_alarm
-
+  - VAM

From a82572e89a42923d6db290a4039ed0bae2d3997a Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:51:54 -0700
Subject: [PATCH 13/20] Update GENERALTYPES.yaml

---
 .../METERS/entity_types/GENERALTYPES.yaml     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/METERS/entity_types/GENERALTYPES.yaml
index 272939181..0f75adbce 100644
--- a/ontology/yaml/resources/METERS/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/GENERALTYPES.yaml
@@ -19,34 +19,44 @@ MTR:
   is_abstract: true
   implements:
   - EQUIPMENT
+  opt_uses:
+  - failed_alarm
 
 EM:
   guid: "cba37f53-9e19-4498-80d1-6053d993f4ac"
   description: "Tag for all the electrical meter types."
+  is_abstract: true
   implements:
   - MTR
-  is_abstract: true
+  opt_uses:
+  - failed_alarm
 
 GM:
   guid: "919ece3f-2f6f-4c9d-adcf-2a77eed49185"
   description: "Tag for all gas meters."
+  is_abstract: true
   implements:
   - MTR
-  is_abstract: true
+  opt_uses:
+  - failed_alarm
 
 FM:
   guid: "e89d919e-ecfb-4852-aeab-c087b0fabf6d"
   description: "Tag for all closed-loop system flow meters. Distinct from water meters which are open-loop systems."
   is_abstract: true
   implements:
-  - MTR  
+  - MTR
+  opt_uses:
+  - failed_alarm  
 
 WM:
   guid: "c1df623f-c71b-45a1-89eb-2bc7c82f291a"
   description: "Tag for all water meters (open-loop), such as the main building water consumption meter."
+  is_abstract: true
   implements:
   - MTR
-  is_abstract: true
+  opt_uses:
+  - failed_alarm
 
 HM:
   guid: "9496631b-c154-4d86-857d-c2ffff88ffe4"
@@ -54,3 +64,5 @@ HM:
   is_abstract: true
   implements:
   - MTR
+  opt_uses:
+  - failed_alarm

From 0d89c3632898ea61cad52a70a63c72ac93dadb31 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:52:32 -0700
Subject: [PATCH 14/20] Update WM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/WM.yaml b/ontology/yaml/resources/METERS/entity_types/WM.yaml
index eeacdcf03..58cf9c07a 100644
--- a/ontology/yaml/resources/METERS/entity_types/WM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/WM.yaml
@@ -18,9 +18,8 @@ WM_WVAM:
   is_canonical: true
   implements:
   - WM
-  - WVAM # TODO: we are creating tech debt to model it like this (in theory we should not need to specify `water` and could simply use `volume_accumulator`)
+  - WVAM # TODO: we are creating tech debt to model it like this (in theory we should not need to specify `water` and could simply use the VAM type)
   opt_uses:
-  - failed_alarm # TODO: remove this and add directly to GENERALTYPE
   - flowrate_sensor # TODO: remove this and rely on optional usage of `water_flowrate_sensor` in the WVAM type
 
 # TODO: potentially deprecate this type (not currently implemented by any entities)

From 42f3269c4a8a90b983fcc972ca9be8ccc6951e35 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:54:21 -0700
Subject: [PATCH 15/20] Update HM.yaml

---
 .../yaml/resources/METERS/entity_types/HM.yaml   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index 44ac1a1a2..c535fc01b 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+# TODO: rename this type
 HM_STANDARD:
   guid: "7f96b71e-3f47-4872-b770-71a4b8021677"
   description: "General water-side thermal load heat meter."
@@ -21,21 +23,21 @@ HM_STANDARD:
   - TPWM
   - HVAC/WDT # inherits from HVAC namespace
   uses:
-  - flowrate_sensor # TODO: change to water_flowrate_sensor (for continuity)
+  - flowrate_sensor # TODO: change to water_flowrate_sensor (for continuity) and implement WVAM
   opt_uses:
-  - water_volume_accumulator # TODO: determing if this can be promoted to `uses` (if so, implement WVAM)
+  - water_volume_accumulator # TODO: determine if this can be promoted to `uses` (if so, implement WVAM)
 
 HM_CHW:
   guid: "4439f98a-c52b-4fff-8765-84e689862423"
   description: "Cooling load heat meter."
+  is_canonical: true 
   implements:
   - HM
   - HVAC/CHWDT # inherits from HVAC namespace
   - HVAC/CHWFRM # inherits from HVAC namespace
-  is_canonical: true
   uses:
-  - cooling_thermal_power_sensor # TODO: justify if `cooling` needs to be specified here
-  - cooling_thermal_energy_accumulator # TODO: justify if `cooling` needs to be specified here
+  - cooling_thermal_power_sensor # TODO: justify if `cooling` needs to be specified here, if not implement TPWM
+  - cooling_thermal_energy_accumulator # TODO: justify if `cooling` needs to be specified here, if not implement TPWM
   opt_uses:
   - differential_temperature_sensor
   - failed_alarm # TODO: define this on the general type
@@ -57,5 +59,5 @@ HM_HW:
   - HVAC/HWDT # inherits from HVAC namespace
   uses:
   - heating_water_flowrate_sensor # TODO: justify if `heating` needs to be specified here
-  - heating_thermal_power_sensor # TODO: justify if `heating` needs to be specified here (or if we can just use thermal_power_sensor)
-  - heating_thermal_energy_accumulator # TODO: justify if `heating` needs to be specified here
+  - heating_thermal_power_sensor # TODO: justify if `heating` needs to be specified here, if not implement TPWM
+  - heating_thermal_energy_accumulator # TODO: justify if `heating` needs to be specified here, if not implement TPWM

From c22946f6e7b3923dfdd8ab12862d6cc8dd481c30 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:55:49 -0700
Subject: [PATCH 16/20] Update FM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/FM.yaml b/ontology/yaml/resources/METERS/entity_types/FM.yaml
index 4e9f71065..f7241d64f 100644
--- a/ontology/yaml/resources/METERS/entity_types/FM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/FM.yaml
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FM_STANDARD:
+FM_VAM:
   guid: "05f00511-9d04-4c98-ac9f-6aba9f0c9fe7"
-  description: "Standard flow meter typically for liquid."
+  description: "Standard closed-loop flow meter, typically for liquid."
   is_canonical: true
   implements:
   - FM

From 9e0fc0f4e677944d1d9105bfca0d57ad2006baf2 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:57:05 -0700
Subject: [PATCH 17/20] Update EM.yaml

---
 ontology/yaml/resources/METERS/entity_types/EM.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml
index 7b9b385ea..fbec9e3c4 100644
--- a/ontology/yaml/resources/METERS/entity_types/EM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml
@@ -53,9 +53,6 @@ EM_PWM_PVCM:
   - EM
   - PWM
   - PVCM
-  opt_uses:
-  - reactive_energy_accumulator # TODO: promote to PWM abstract
-  - apparent_energy_accumulator # TODO: promote to PWM abstract
 
 EM_PWM_AVCM:
   guid: "441a3b57-05e7-426d-bed9-061f28f21b3a"

From abac4bc55303dc4f851952f98e09989ef0936e2a Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:57:37 -0700
Subject: [PATCH 18/20] Update ABSTRACT.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
index f7e15beaa..5bfc240e4 100644
--- a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
@@ -91,8 +91,8 @@ TPWM:
   description: "Thermal power and thermal energy monitoring (typically used for heat meters)."
   is_abstract: true
   uses:
-    - thermal_energy_accumulator
-    - thermal_power_sensor
+  - thermal_energy_accumulator
+  - thermal_power_sensor
 
 VCM:
   guid: "dc4d2839-c00d-4935-bc67-013f7721535f"

From 7fae711c6ac4a3bd931486b8d1067a52af45f562 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:59:53 -0700
Subject: [PATCH 19/20] Update EM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/EM.yaml b/ontology/yaml/resources/METERS/entity_types/EM.yaml
index fbec9e3c4..f89ff85b0 100644
--- a/ontology/yaml/resources/METERS/entity_types/EM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/EM.yaml
@@ -124,6 +124,7 @@ EM_ION:
   - EM_PWM_AVCM_PLPM_PVCM
   - DEPRECATED
 
+# TODO: fully delete this type (duplicate of EM_PWM_NONCANONICAL_2 and not implemented by any entities)
 EM_PWM_NONCANONICAL_1:
   guid: "5063ee14-dd44-4d34-a17c-9b0d4f5cff43"
   description: "Non-standard type."
@@ -151,6 +152,7 @@ EM_PWM_NONCANONICAL_2:
   - average_line_current_sensor
   - average_inter_line_voltage_sensor
 
+# TODO: fully delete this type (not implemented by any entities)
 EM_PWM_PLPM_PVCM_NONCANONICAL_2:
   guid: "867a7be3-2023-49c2-a1da-4805abfaf9a0"
   description: "SE PM5100 Meter"

From 176f85cf806f3650e6d81936231b4e47b59a0352 Mon Sep 17 00:00:00 2001
From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:07:16 -0700
Subject: [PATCH 20/20] Update HM.yaml

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

diff --git a/ontology/yaml/resources/METERS/entity_types/HM.yaml b/ontology/yaml/resources/METERS/entity_types/HM.yaml
index c535fc01b..b1c358a6b 100644
--- a/ontology/yaml/resources/METERS/entity_types/HM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/HM.yaml
@@ -40,9 +40,8 @@ HM_CHW:
   - cooling_thermal_energy_accumulator # TODO: justify if `cooling` needs to be specified here, if not implement TPWM
   opt_uses:
   - differential_temperature_sensor
-  - failed_alarm # TODO: define this on the general type
 
-HM_CHW_WAC:
+HM_CHW_WVAM:
   guid: "441029f3-1324-42c5-aca2-74138500917a"
   description: "Cooling load heat meter with total chilled water volume accumulator."
   is_canonical: true