Merge branch 'working'

Merge new systems

ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml

@@ -1077,6 +1077,21 @@ WDT:
   - low_supply_water_temperature_alarm
 
 
+CMWDT:
+  description: "Common water temperature differential monitoring."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  uses:
+  - common_supply_water_temperature_sensor
+  - common_return_water_temperature_sensor
+  opt_uses:
+  - high_common_supply_water_temperature_alarm
+  - low_common_supply_water_temperature_alarm
+  - high_common_return_water_temperature_alarm
+  - low_common_return_water_temperature_alarm
+
+
 CHWDT:
   guid: "0960d44f-87ff-43f5-b576-c19f8a7f2b83"
   description: "Temperature differential across chilled water."
@@ -3910,6 +3925,15 @@ WFRM:
   - low_flowrate_alarm
 
 
+CMSWFRM:
+  description: "Common supply water flowrate monitoring."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  uses:
+  - common_supply_water_flowrate_sensor
+
+
 WFRC:
   guid: "55e5d148-7001-40e2-b082-d17cafb3309a"
   description: "Water flowrate control."
@@ -5461,6 +5485,18 @@ RWTM:
   - return_water_temperature_sensor
 
 
+WSERWTM:
+  description: "Water side economizer return water temperature."
+  is_abstract: true
+  implements:
+  - OPERATIONAL
+  uses:
+  - economizer_return_water_temperature_sensor
+  opt_uses:
+  - high_economizer_return_water_temperature_alarm
+  - low_economizer_return_water_temperature_alarm
+
+
 CWDPM:
   guid: "d71e1e0d-35d6-4b53-a570-2e12959c951b"
   description: "Differential pressure monitoring for condenser water."
@@ -7626,6 +7662,7 @@ MWFRM:
   is_abstract: true
   opt_uses:
   - failed_makeup_water_flowrate_alarm
+  - makeup_water_volume_accumulator
   uses:
   - makeup_water_flowrate_sensor
   implements:
@@ -7642,6 +7679,18 @@ BWFRM:
   implements:
   - MONITORING
 
+BWECVC:
+  description: "Blowdown water electricconductivity drain valve control."
+  is_abstract: true
+  opt_uses:
+  - high_blowdown_water_electricconductivity_alarm
+  uses:
+  - drain_water_valve_command
+  - blowdown_water_electricconductivity_sensor
+  - blowdown_water_electricconductivity_setpoint
+  implements:
+  - OPERATIONAL
+
 DX3SCHWC:
   guid: "917e4514-ed4d-468c-8a81-44d29a143935"
   description: "Three compressor run control on chilled supply water side."

ontology/yaml/resources/HVAC/entity_types/CDWS.yaml

@@ -165,6 +165,18 @@ CDWS_SWTC_BYPVPM_WFRM_MWFRM_BWFRM:
   - MWFRM
   - BWFRM
 
+CDWS_SWTC_CMWDT_BYPVPM_BWECVC_BWFRM_MWFRM:
+  description: "Condensing water system with bypass valve, blowdown water valve electricconductivity control, makeup water flowrate monitoring and common water temperature differential monitoring."
+  is_canonical: true
+  implements:
+  - CDWS
+  - SWTC
+  - CMWDT
+  - BYPVPM
+  - BWECVC
+  - BWFRM
+  - MWFRM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/HVAC/entity_types/CHWS.yaml

@@ -347,6 +347,20 @@ CHWS_SWTC_WDPC_PSWTC_PWDPC_PWFRM_PWECVC_SWDVPM_PWDVPM:
   - PWDVPM
 
 
+CHWS_SWTC_WDPC_WFRM_CMSWFRM_BYPVPM_WSEBYPVPM_WSERWTM:
+  description: "Chilled water system with supply water temperature and differential pressure control, flowrate monitoring, common chiller supply water flowrate monitoring, bypass valve and water side economizer bypass valve."
+  is_canonical: true
+  implements:
+  - CHWS
+  - SWTC
+  - WDPC
+  - WFRM
+  - CMSWFRM
+  - BYPVPM
+  - WSEBYPVPM
+  - WSERWTM
+
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################

ontology/yaml/resources/fields/telemetry_fields.yaml

@@ -18,6 +18,12 @@ literals:
 - blowdown_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451
+- blowdown_water_electricconductivity_sensor:
+    flexible_min: 0.0
+    flexible_max: 50.0
+- blowdown_water_electricconductivity_setpoint:
+    flexible_min: 0.0
+    flexible_max: 50.0
 - building_air_static_pressure_sensor:
     flexible_min: -249.080024
     flexible_max: 249.080024
@@ -33,6 +39,9 @@ literals:
 - chilled_supply_water_flowrate_sensor:
     flexible_min: -0.000315451
     flexible_max: 0.315451
+- common_supply_water_flowrate_sensor:
+    flexible_min: -0.000315451
+    flexible_max: 0.315451
 - chilled_supply_water_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 308.1481481
@@ -347,6 +356,12 @@ literals:
 - return_water_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 380.3703704
+- common_return_water_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 380.3703704
+- economizer_return_water_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 380.3703704
 - reversing_valve_command:
   - AUTO
   - CLOSED
@@ -423,6 +438,9 @@ literals:
 - supply_water_temperature_sensor:
     flexible_min: 255.9259259
     flexible_max: 380.3703704
+- common_supply_water_temperature_sensor:
+    flexible_min: 255.9259259
+    flexible_max: 380.3703704
 - supply_water_temperature_setpoint:
     flexible_min: 255.9259259
     flexible_max: 380.3703704
@@ -1269,6 +1287,9 @@ literals:
 - water_volume_accumulator:
     flexible_min: -0.000315451
     flexible_max: 0.315451
+- makeup_water_volume_accumulator:
+    flexible_min: -0.000315451
+    flexible_max: 0.315451
 - gas_temperature_sensor:
     flexible_min: 283.1481481
     flexible_max: 533.1481481
@@ -3159,6 +3180,9 @@ literals:
 - failed_blowdown_water_flowrate_alarm:
   - ACTIVE
   - INACTIVE
+- high_blowdown_water_electricconductivity_alarm:
+  - ACTIVE
+  - INACTIVE
 - failed_makeup_water_flowrate_alarm:
   - ACTIVE
   - INACTIVE
@@ -3186,6 +3210,9 @@ literals:
 - high_supply_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- high_common_supply_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_primary_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
@@ -3204,9 +3231,15 @@ literals:
 - high_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- high_common_return_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_condensing_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- high_economizer_return_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - high_process_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
@@ -3258,6 +3291,9 @@ literals:
 - low_supply_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- low_common_supply_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - low_primary_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
@@ -3276,9 +3312,15 @@ literals:
 - low_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- low_common_return_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - low_condensing_return_water_temperature_alarm:
   - ACTIVE
   - INACTIVE
+- low_economizer_return_water_temperature_alarm:
+  - ACTIVE
+  - INACTIVE
 - low_process_water_differential_pressure_alarm:
   - ACTIVE
   - INACTIVE

ontology/yaml/resources/subfields/subfields.yaml

@@ -69,7 +69,7 @@ descriptor:
   ac: "Electric charge which periodically reverses direction and changes its magnitude continuously with time."
   ammonia: "Ammonia gas."
   blowdown: "Process of expelling water filled with mineral deposits for the purposes of water treatment."
-  blue: "blue light fracture of ambient light."
+  blue: "Blue light fracture of ambient light."
   boost: "Component used to boost pressure."
   broken: "A state of disrepair; fractured or segmented."
   building: "Applies to the entire building or group of zones within building (e.g. Building_Air_Static_Pressure_Sensor)."
@@ -86,6 +86,7 @@ descriptor:
   cogeneration: "Associated with a cogeneration process."
   cold: "Associated with cold area or process."
   color: "Physical perceptual property of light deriving from the electromagnetic spectrum."
+  common: "Aggregate or collective measurement of substance coming from multiple sources."
   communication: "Actual transmit and recieve of data or connectivity between devices."
   condensate: "Indicates moisture on surfaces"
   condensing: "Process of gaseous refrigerant changing to liquid."