Skip to content

Fix issue 743, adding chilled water system points back #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gtfierro wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Fix issue 743, adding chilled water system points back #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a9dee61
returning return/supply entering/leaving temp
gtfierro Jan 1, 2026
4df1207
add example
gtfierro Jan 1, 2026
e373d63
fixing example
gtfierro Jan 1, 2026
e846b8c
fix test for supply/discharge
gtfierro Jan 1, 2026
50c1d9d
Merge branch 'master' into fix-issue-743
gtfierro Mar 19, 2026
b71e828
Merge remote-tracking branch 'origin/master' into fix-issue-743
gtfierro Mar 19, 2026
d0c3c93
Merge branch 'fix-issue-743' of github.com:BrickSchema/Brick into fix…
gtfierro Mar 19, 2026
f6a5787
Merge remote-tracking branch 'origin/master' into fix-issue-743
gtfierro Apr 14, 2026
eb06085
Fix deprecated water setpoint hierarchy
gtfierro Apr 14, 2026
b609d8b
make test more general
gtfierro Apr 14, 2026
b3f2911
Add district heating hot water modeling
gtfierro Apr 14, 2026
3d03bc9
Merge remote-tracking branch 'origin/master' into fix-issue-743
gtfierro May 1, 2026
9b5296e
fixing definitions, removing deprecations
gtfierro May 1, 2026
74ac51f
Clarify chiller example point labels
gtfierro May 1, 2026
8d739a3
cleaning up matching classes test
gtfierro May 5, 2026
b634474
Merge remote-tracking branch 'origin/master' into fix-issue-743
gtfierro May 5, 2026
97a124c
Merge remote-tracking branch 'origin/fix-issue-743' into fix-issue-743
gtfierro May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions bricksrc/definitions.csv
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 9 additions & 43 deletions bricksrc/deprecations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,6 @@
BRICK.Chilled_Water_Flow_Sensor,
],
},
BRICK.Supply_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Water,
SKOS.broader: BRICK.Water,
A: BRICK.Substance,
},
BRICK.Supply_Chilled_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Chilled_Water,
SKOS.broader: BRICK.Chilled_Water,
A: BRICK.Substance,
},
BRICK.Discharge_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
Expand All @@ -203,34 +189,13 @@
SKOS.broader: BRICK.Chilled_Water,
A: BRICK.Substance,
},
BRICK.Supply_Hot_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Hot_Water,
SKOS.broader: BRICK.Hot_Water,
A: BRICK.Substance,
},
BRICK.Discharge_Hot_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Hot_Water,
SKOS.broader: BRICK.Hot_Water,
A: BRICK.Substance,
},
BRICK.Return_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Entering_Water,
SKOS.broader: BRICK.Water,
A: BRICK.Substance,
},
BRICK.Return_Hot_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Entering_Hot_Water,
SKOS.broader: BRICK.Hot_Water,
A: BRICK.Substance,
},
BRICK.Supply_Condenser_Water: {
"version": "1.3.0",
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
Expand Down Expand Up @@ -474,7 +439,8 @@
"replace_with": BRICK.Leaving_Hot_Water_Flow_Setpoint,
"version": "1.3.0",
RDFS.subClassOf: [
BRICK.Supply_Water_Temperature_Sensor,
BRICK.Supply_Water_Flow_Setpoint,
BRICK.Hot_Water_Flow_Setpoint,
],
},
BRICK.Hot_Water_Supply_Temperature_Sensor: {
Expand Down Expand Up @@ -602,34 +568,35 @@
"replace_with": BRICK.Leaving_Condenser_Water_Temperature_Setpoint,
"version": "1.3.0",
RDFS.subClassOf: [
BRICK.Supply_Water_Temperature_Sensor,
BRICK.Leaving_Condenser_Water_Temperature_Setpoint,
],
},
BRICK.Discharge_Condenser_Water_Temperature_Setpoint: {
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Condenser_Water_Temperature_Setpoint,
"version": "1.3.0",
RDFS.subClassOf: [
BRICK.Discharge_Water_Temperature_Sensor,
BRICK.Leaving_Condenser_Water_Temperature_Setpoint,
],
},
BRICK.Supply_Hot_Water_Temperature_Setpoint: {
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Hot_Water_Temperature_Setpoint,
"version": "1.3.0",
RDFS.subClassOf: [
BRICK.Supply_Water_Temperature_Sensor,
BRICK.Leaving_Hot_Water_Temperature_Setpoint,
BRICK.Hot_Water_Temperature_Setpoint,
],
},
BRICK.Discharge_Hot_Water_Temperature_Setpoint: {
"mitigation_message": "Swapped supply/return for entering/leaving with water-related points",
"replace_with": BRICK.Leaving_Hot_Water_Temperature_Setpoint,
"version": "1.3.0",
RDFS.subClassOf: [
BRICK.Discharge_Water_Temperature_Sensor,
BRICK.Leaving_Hot_Water_Temperature_Setpoint,
BRICK.Hot_Water_Temperature_Setpoint,
],
},

BRICK.Electric_Current: {
"version": "1.4.4",
"mitigation_message": "Brick-defined quantity 'Electric_Current' is deprecated. Use the equivalent QUDT quantity 'qudt:QuantityKind/ElectricCurrent' directly.",
Expand Down Expand Up @@ -670,7 +637,7 @@
"mitigation_message": "Brick-defined quantity 'Atmospheric_Pressure' is deprecated. Use the equivalent QUDT quantity 'qudt:QuantityKind/AtmosphericPressure' directly.",
"replace_with": QUDTQK.AtmosphericPressure,
},
BRICK.Gauge_Pressure: {
BRICK.Gauge_Pressure: {
"version": "1.4.4",
"mitigation_message": "Brick-defined quantity 'Gauge_Pressure' is deprecated. Use the QUDT quantity 'qudt:QuantityKind/Pressure' and indicate contextually that it is gauge pressure if necessary.",
"replace_with": QUDTQK.Pressure,
Expand Down Expand Up @@ -755,7 +722,6 @@
"mitigation_message": "Brick-defined quantity 'Radioactivity_Concentration_Sensor' is deprecated. Use Air_Quality_Sensor instead, or the provided sensor class for the specific kind or source of radioactivity (e.g. Radon gas)",
"replace_with": BRICK.Air_Quality_Sensor,
},

BRICK.Phasor: {
"version": "1.4.4",
"mitigation_message": "Brick-defined quantity 'Phasor' is deprecated.",
Expand Down
2 changes: 1 addition & 1 deletion bricksrc/meters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"tags": [TAG.Meter, TAG.Equipment, TAG.Water, TAG.Hot],
"subclasses": {
"Building_Hot_Water_Meter": {
BRICK.hasSubstance: BRICK.Hot_Water,
BRICK.hasSubstance: BRICK.Building_Hot_Water,
"tags": [
TAG.Building,
TAG.Hot,
Expand Down
192 changes: 185 additions & 7 deletions bricksrc/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,6 +1941,18 @@
TAG.Sensor,
],
},
"Heating_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Heating,
TAG.Hot,
TAG.Water,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Heating_Hot_Water,
},
"Entering_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
Expand All @@ -1967,6 +1979,54 @@
BRICK.Domestic_Hot_Water_Temperature_Sensor
],
},
"Entering_Heating_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Heating,
TAG.Hot,
TAG.Water,
TAG.Entering,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Entering_Heating_Hot_Water,
"parents": [
BRICK.Heating_Hot_Water_Temperature_Sensor
],
},
"Entering_Building_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Building,
TAG.Hot,
TAG.Water,
TAG.Entering,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Entering_Building_Hot_Water,
"parents": [
BRICK.Entering_Heating_Hot_Water_Temperature_Sensor
],
},
"Entering_District_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.District,
TAG.Hot,
TAG.Water,
TAG.Entering,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Entering_District_Hot_Water,
"parents": [
BRICK.Entering_Heating_Hot_Water_Temperature_Sensor
],
},
"Entering_High_Temperature_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
Expand Down Expand Up @@ -2019,6 +2079,54 @@
BRICK.Domestic_Hot_Water_Temperature_Sensor
],
},
"Leaving_Heating_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Heating,
TAG.Hot,
TAG.Water,
TAG.Leaving,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Leaving_Heating_Hot_Water,
"parents": [
BRICK.Heating_Hot_Water_Temperature_Sensor
],
},
"Leaving_Building_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Building,
TAG.Hot,
TAG.Water,
TAG.Leaving,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Leaving_Building_Hot_Water,
"parents": [
BRICK.Leaving_Heating_Hot_Water_Temperature_Sensor
],
},
"Leaving_District_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.District,
TAG.Hot,
TAG.Water,
TAG.Leaving,
TAG.Temperature,
TAG.Sensor,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Leaving_District_Hot_Water,
"parents": [
BRICK.Leaving_Heating_Hot_Water_Temperature_Sensor
],
},
"Leaving_High_Temperature_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
Expand All @@ -2045,6 +2153,30 @@
},
},
},
"Return_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Hot,
TAG.Return,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Return_Hot_Water,
},
"Supply_Hot_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Hot,
TAG.Supply,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Supply_Hot_Water,
},
"Chilled_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
Expand All @@ -2071,6 +2203,23 @@
BRICK.Water_Differential_Temperature_Sensor
],
},
"Differential_Entering_Leaving_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Chilled,
TAG.Leaving,
TAG.Entering,
TAG.Differential,
],
BRICK.hasSubstance: [
BRICK.Leaving_Chilled_Water,
BRICK.Entering_Chilled_Water,
],
BRICK.hasQuantity: QUDTQK.Temperature,
},
"Entering_Chilled_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
Expand All @@ -2095,22 +2244,29 @@
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Leaving_Chilled_Water,
},
"Differential_Entering_Leaving_Water_Temperature_Sensor": {
"Return_Chilled_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Chilled,
TAG.Leaving,
TAG.Entering,
TAG.Differential,
TAG.Return,
],
BRICK.hasSubstance: [
BRICK.Leaving_Chilled_Water,
BRICK.Entering_Chilled_Water,
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Return_Chilled_Water,
},
"Supply_Chilled_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Chilled,
TAG.Supply,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Supply_Chilled_Water,
},
},
},
Expand Down Expand Up @@ -2160,6 +2316,28 @@
},
},
},
"Return_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Return,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Return_Water,
},
"Supply_Water_Temperature_Sensor": {
"tags": [
TAG.Point,
TAG.Sensor,
TAG.Temperature,
TAG.Water,
TAG.Supply,
],
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Supply_Water,
},
"Collection_Basin_Water_Temperature_Sensor": {
BRICK.hasQuantity: QUDTQK.Temperature,
BRICK.hasSubstance: BRICK.Collection_Basin_Water,
Expand Down
Loading
Loading