From cc023c0d3f928071948c20e79fdd2d79399d0ddf Mon Sep 17 00:00:00 2001 From: evgeniya-engel Date: Wed, 27 Nov 2024 23:47:01 +0000 Subject: [PATCH 1/3] hydronic: new abstract and canonical types --- .../yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 12 ++++++++++++ ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 12 ++++++++++++ ontology/yaml/resources/fields/telemetry_fields.yaml | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index cb989d9b3..3a05b1b3f 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -2138,6 +2138,7 @@ PWDT: - primary_supply_water_temperature_sensor opt_uses: - primary_water_heating_thermal_power_sensor + - primary_water_cooling_thermal_power_sensor - high_primary_return_water_temperature_alarm - high_primary_supply_water_temperature_alarm - low_primary_return_water_temperature_alarm @@ -6253,11 +6254,22 @@ SESWTC: - high_secondary_supply_water_temperature_alarm - low_secondary_supply_water_temperature_alarm - secondary_water_heating_thermal_power_sensor + - secondary_water_cooling_thermal_power_sensor uses: - secondary_supply_water_temperature_sensor - secondary_supply_water_temperature_setpoint +PWDPC: + description: "Primary water loop differential pressure control." + is_abstract: true + implements: + - OPERATIONAL + uses: + - primary_water_differential_pressure_sensor + - primary_water_differential_pressure_setpoint + + SEWDPC: guid: "6b3687c0-a8c1-4df4-8f2b-05eaccfbdf45" description: "Secondary water loop differential pressure control." diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index 313ac2f18..721a39d93 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -431,6 +431,18 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT: - PRWFRM - PWDT +CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDPC_PWDT: + description: "Chilled water system with secondary loop supply water temperature control, primary and secondary differential pressure control, primary and secondary flowrate monitoring." + is_canonical: true + implements: + - CHWS + - SEWDPC + - SESWTC + - SERWFRM + - PRWFRM + - PWDPC + - PWDT + ################################### ### Existing Non-standard Types ### diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml index 4c4d3365a..5bbe81771 100644 --- a/ontology/yaml/resources/fields/telemetry_fields.yaml +++ b/ontology/yaml/resources/fields/telemetry_fields.yaml @@ -805,6 +805,12 @@ literals: - secondary_return_water_temperature_sensor: flexible_min: 255.9259259 flexible_max: 380.3703704 +- primary_water_differential_pressure_sensor: + flexible_min: -34473.78945 + flexible_max: 344737.8945 +- primary_water_differential_pressure_setpoint: + flexible_min: -34473.78945 + flexible_max: 344737.8945 - secondary_water_differential_pressure_sensor: flexible_min: -34473.78945 flexible_max: 344737.8945 @@ -1137,6 +1143,12 @@ literals: - cooling_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 +- secondary_water_cooling_thermal_power_sensor: + flexible_min: 0.0 + flexible_max: 3517000.0 - cooling_percentage_sensor: fixed_min: 0.0 fixed_max: 100.0 From 9ca6d750828abcc77da01afd35e3c89fd46e4705 Mon Sep 17 00:00:00 2001 From: evgeniya-engel Date: Thu, 28 Nov 2024 00:09:56 +0000 Subject: [PATCH 2/3] hydronic: new CH type --- .../resources/HVAC/entity_types/ABSTRACT.yaml | 2 +- ontology/yaml/resources/HVAC/entity_types/CH.yaml | 15 +++++++++++++++ .../yaml/resources/HVAC/entity_types/CHWS.yaml | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 3a05b1b3f..55f95efa7 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6260,7 +6260,7 @@ SESWTC: - secondary_supply_water_temperature_setpoint -PWDPC: +PRWDPC: description: "Primary water loop differential pressure control." is_abstract: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index 32cba1ebd..b18df4099 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -752,6 +752,21 @@ CH_SS_CHWDPC_CHWDT_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X: - REFSM2X - CPC2X +CH_SS_CHWDPC_SCHWTC_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X: + description: "Temperature differential across heating water for heat recovery chiller, differential pressure control with chilled and heating water, isolation valve monitoring for chilled water, and refrigerant pressure and temperature monitoring." + is_canonical: true + implements: + - CH + - SS + - CHWDPC + - SCHWTC + - CHWRISOVPM + - HWDT + - HWDPM + - REFPM2X + - REFSM2X + - CPC2X + ################################### ### Existing Non-standard Types ### ################################### diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index 721a39d93..e595d397a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -431,7 +431,7 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT: - PRWFRM - PWDT -CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDPC_PWDT: +CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PRWDPC_PWDT: description: "Chilled water system with secondary loop supply water temperature control, primary and secondary differential pressure control, primary and secondary flowrate monitoring." is_canonical: true implements: @@ -440,7 +440,7 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDPC_PWDT: - SESWTC - SERWFRM - PRWFRM - - PWDPC + - PRWDPC - PWDT From 6554a2a4063ebf033b5395ddb442ffbac4a178da Mon Sep 17 00:00:00 2001 From: db-robot Date: Thu, 28 Nov 2024 00:10:31 +0000 Subject: [PATCH 3/3] Add GUIDs to new entity types --- ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml | 1 + ontology/yaml/resources/HVAC/entity_types/CH.yaml | 1 + ontology/yaml/resources/HVAC/entity_types/CHWS.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 55f95efa7..2febafbcd 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -6261,6 +6261,7 @@ SESWTC: PRWDPC: + guid: "3279876b-0bcd-4fc1-8e9a-273cff67c69e" description: "Primary water loop differential pressure control." is_abstract: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index b18df4099..98eff4814 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -753,6 +753,7 @@ CH_SS_CHWDPC_CHWDT_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X: - CPC2X CH_SS_CHWDPC_SCHWTC_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X: + guid: "881cb7fd-97ea-4271-b0ac-547dd38a0bc4" description: "Temperature differential across heating water for heat recovery chiller, differential pressure control with chilled and heating water, isolation valve monitoring for chilled water, and refrigerant pressure and temperature monitoring." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml index e595d397a..08ca2047a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml @@ -432,6 +432,7 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT: - PWDT CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PRWDPC_PWDT: + guid: "fe148047-bc3a-48be-96e8-c1d589e2d4e6" description: "Chilled water system with secondary loop supply water temperature control, primary and secondary differential pressure control, primary and secondary flowrate monitoring." is_canonical: true implements: