From 9e338f8d530571455c30e2417b1a8a7284a538d1 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:37:29 -0700 Subject: [PATCH 1/5] Update meter_loads.md --- ontology/docs/meter_loads.md | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/ontology/docs/meter_loads.md b/ontology/docs/meter_loads.md index 0e5a0533d9..629c9a1185 100644 --- a/ontology/docs/meter_loads.md +++ b/ontology/docs/meter_loads.md @@ -1,33 +1,20 @@ # Meter Load Designation -Digital Buildings provides abstract models that can be used to represent various -types of loads within a building and can be connected to meter entities to indicate the types -of loads measured by each metering device. This document describes how these loadtypes -should be created and connected within a building configuration file. +Digital Buildings provides abstract models that can be used to represent various types of loads within a building and can be connected to meter entities to indicate the types of loads measured by each metering device. This document describes how these loadtypes should be created and connected within a building configuration file. + +* For an explanation of building configuration files see [building_config](building_config.md) -* For an explanation of building configuration files see - [building_config](building_config.md) - ### Create the Building Entity and Meter Device Entity -Use the syntax described in [building_config](building_config.md) to create a -facility entity for the building and a reporting entity for the meter device. -A `CONTAINS` connection should be used to indicate that the meter exists within -the building. +Use the syntax described in [building_config](building_config.md) to create a facility entity for the building and a reporting entity for the meter device. A `CONTAINS` connection should be used to indicate that the meter exists within the building. ### Create an Abstract Loadtype Entity -Create a loadtype entity to represent each of the types of loads the meters in -the building measure. The entity will consist of a single abstract loadtype -found in the file called `LOADTYPES.yaml` in the `METER` namespace. The abstract -loadtype does not implement any fields. A `CONTAINS` connection should be used -to indicate that the load exists within the building. +Create a loadtype entity to represent each of the types of loads the meters in the building measure. The entity will consist of a single abstract loadtype found in the file called `LOADTYPES.yaml` in the `METER` namespace. The abstract loadtype does not implement any fields. A `CONTAINS` connection should be used to indicate that the load exists within the building. ### Connect the Loadtype Entity to the Meter Entity via a `MEASURES` Connection -Add a `MEASURES` connection to the loadtype entity to indicate which meter(s) -provide data for it. A building may have multiple meters that -measure the same loadtype. +Add a `MEASURES` connection to the loadtype entity to indicate which meter(s) provide data for it. A building may have multiple meters that measure the same loadtype. ## Example Building Layout and Config @@ -36,7 +23,7 @@ Example full building-loadtype-meter layout: ![image](https://github.com/shambergoldstein/digitalbuildings/assets/124837286/427e4c03-c132-468c-94e7-20486117643a) Example building-loadtype-meter connection in building configuration file: -``` yaml +``` yaml # The building ccb-342: code: BLDG-123 @@ -62,6 +49,6 @@ dde-453: present_value: points.kW.present_value units: key: pointset.points.kW.units - values: + values: kilowatts: "kW" ``` From d92015af766ea0cd47814ff515ef5813121bd5db Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:38:05 -0700 Subject: [PATCH 2/5] Update ABSTRACT.yaml --- ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml index 4bd7bbca7c..1f42f88d5d 100644 --- a/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/ELECTRICAL/entity_types/ABSTRACT.yaml @@ -175,7 +175,7 @@ SRC2: - source2_phase1_phase2_voltage_sensor - source2_phase2_phase3_voltage_sensor - source2_phase3_phase1_voltage_sensor - - source2_frequency_sensor + - source2_frequency_sensor opt_uses: - source2_phase1_phase2_over_voltage_status - source2_phase2_phase3_over_voltage_status From ebceee7a37bfa8a0c6e1b68b2a347faf5c5e556a Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:39:19 -0700 Subject: [PATCH 3/5] Update SDC.yaml --- ontology/yaml/resources/HVAC/entity_types/SDC.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/SDC.yaml b/ontology/yaml/resources/HVAC/entity_types/SDC.yaml index c5f9c5bf2e..618252f717 100644 --- a/ontology/yaml/resources/HVAC/entity_types/SDC.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/SDC.yaml @@ -103,7 +103,7 @@ SDC_EXT_TLT_NORTH_WIND2X: uses: - north_wind_linearvelocity_sensor_1 - north_wind_linearvelocity_sensor_2 - + SDC_EXT_TLT_SOUTH_WIND2X: guid: "426eace1-f4c8-49d0-acef-0fad52d9cc44" description: "Directional shade (South) with two wind sensors." From 0cc5c8bad6811c2ef7f9561b578a2afb8d978b10 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:39:46 -0700 Subject: [PATCH 4/5] Update TANK.yaml --- ontology/yaml/resources/HVAC/entity_types/TANK.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml index 01719b45fb..c42074011c 100644 --- a/ontology/yaml/resources/HVAC/entity_types/TANK.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/TANK.yaml @@ -49,7 +49,7 @@ TK_LHLM2X_SWTM2X: implements: - /TK # Inherits from global namespace - LHLM2X - - SWTM2X + - SWTM2X TK_SWTC_PHWTC: guid: "afec4cde-0aa9-4f75-9cf8-1fa1512fd49a" From 50d9548b7911c248eda23d62cbcd1e02b4505920 Mon Sep 17 00:00:00 2001 From: Claire Stirdivant <64609897+cstirdivant@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:40:15 -0700 Subject: [PATCH 5/5] Update LGRP.yaml --- ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml index 62c4986ecb..16d3927c3e 100644 --- a/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml +++ b/ontology/yaml/resources/LIGHTING/entity_types/LGRP.yaml @@ -314,7 +314,7 @@ LGRP_OS_AWIC: is_canonical: true implements: - LGRP - - OS + - OS - AWIC uses: - group_mode