Merge pull request #1473 from evgeniya-engel/master

hydronic: new abstract and canonical types
google · Dec 3, 2024 · d928d7c · d928d7c
2 parents 10a21ed + 4a7b139
commit d928d7c
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 0 deletions.
diff --git 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,23 @@ 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
 
 
+PRWDPC:
+  guid: "3279876b-0bcd-4fc1-8e9a-273cff67c69e"
+  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/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -769,6 +769,22 @@ CH_SS_CHWDPC_CHWDT_CHWRISOVPM_HWDT_HWDPM_REFPM2X_REFSM2X_CPC2X:
   - REFSM2X
   - 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:
+  - CH
+  - SS
+  - CHWDPC
+  - SCHWTC
+  - CHWRISOVPM
+  - HWDT
+  - HWDPM
+  - REFPM2X
+  - REFSM2X
+  - CPC2X
+
 CH_SS_CHWFRSM_CDWFRSM_CC2XM_REFSTC2X_REFPM2X:
   guid: "da643f7f-dbc6-41a7-9030-60115b8c406f"
   description: "Simple water-cooled chiller with 2 circuit refrigerant monitoring and compressor current monitoring."

diff --git a/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml b/ontology/yaml/resources/HVAC/entity_types/CHWS.yaml
@@ -437,6 +437,19 @@ CHWS_SEWDPC_SESWTC_SERWFRM_PRWFRM_PWDT:
   - PRWFRM
   - 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:
+  - CHWS
+  - SEWDPC
+  - SESWTC
+  - SERWFRM
+  - PRWFRM
+  - PRWDPC
+  - PWDT
+
 CHWS_THCWDPC_RWCHVVM_SWCHVVM_PWDT_SESWTC_PWRFM:
   guid: "e3f6366d-4383-48f4-9ce4-a3b7107603ac"
   description: "Chilled water system with thermally conditioned water valve, primary supply temeprature and flowrate monitoring, and differential pressure monitoring."

diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -808,6 +808,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
@@ -1140,6 +1146,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