update query statement and datapoint info files

pnnl · Sep 28, 2023 · 04ebc2b · 04ebc2b
1 parent 68f893a
commit 04ebc2b
Show file tree

Hide file tree

Showing 2 changed files with 231 additions and 11 deletions.
diff --git a/resources/brick/query_statement.yml b/resources/brick/query_statement.yml
@@ -36,7 +36,7 @@
                                 ?hvac_zone brick:hasPoint ?cooling_setpoint .
                               }"
 
- NightCycleOperation: "SELECT ?zone_air_temperature_sensor ?heating_setpoint ?cooling_setpoint ?hvac_zone ?ahu_fan_on_off_status ?ahu_fan_electrical_meeter
+ NightCycleOperation: "SELECT ?zone_air_temperature_sensor ?heating_setpoint ?cooling_setpoint ?hvac_zone ?ahu_fan_on_off_status ?ahu_fan_electrical_meeter ?ahu ?ahu_fan 
                       WHERE {
                               ?hvac_zone a brick:HVAC_Zone .
                               ?zone_air_temperature_sensor a brick:Zone_Air_Temperature_Sensor .
@@ -121,7 +121,6 @@
                                 ?outside_air_enthalpy_sensor a brick:Outside_Air_Enthalpy_Sensor .
                               }"
 
- # Question) should we include the relationship btw cooling coil and oa_flow?
  IntegratedEconomizerControl: "SELECT ?outside_air_flow_sensor ?cooling_coil_thermal_power_meter
                               WHERE {
                                       ?outside_air_flow_sensor a brick:Outside_Air_Flow_Sensor .
@@ -182,14 +181,7 @@
                                 }" 
 
 # GuestRoomControlTemp will be checked again once the pseudo-code is updated.
- GuestRoomControlTemp: "SELECT ?heating_setpoint ?cooling_setpoint ?hvac_zone ?zone_occ_sensor
-                        WHERE {
-                                ?hvac_zone a brick:HVAC_Zone .
-                                ?heating_setpoint a brick:Zone_Air_Heating_Temperature_Setpoint .
-                                ?cooling_setpoint a brick:Zone_Air_Cooling_Temperature_Setpoint .
-                                ?zone_occ_sensor a brick:Occupancy_Sensor .
-                                ?hvac_zone brick:hasPoint ?heating_setpoint, ?cooling_setpoint, ?zone_occ_sensor .
-                              }"
+ GuestRoomControlTemp: ""
 
 # GuestRoomControlVent will be updated once the pseudo-code is updated.
  GuestRoomControlVent: ""
diff --git a/resources/brick/verification_datapoint_info.yml b/resources/brick/verification_datapoint_info.yml
@@ -20,7 +20,6 @@ ZoneTempControl:
       subject: hvac_zone
       variable: Zone Thermostat Heating Setpoint Temperature
 
-
 ZoneHeatSetpointMinimum:
   default:
     heating_setpoint:
@@ -69,6 +68,78 @@ ZoneCoolingResetDepth:
       subject: hvac_zone
       variable: Zone Thermostat Cooling Setpoint Temperature
 
+NightCycleOperation:
+  default:
+    zone_air_temperature_sensor:
+      point: T_zone
+      subject: hvac_zone
+      variable: zone_air_temperature_sensor 
+    HVAC_operation_sch:
+      point: HVAC_operation_sch
+      subject: Null
+      variable: ahu_fan_on_off_status
+    heating_setpoint:
+      point: T_heat_set
+      subject: hvac_zone
+      variable: heating_setpoint
+    cooling_setpoint:
+      point: T_cool_set
+      subject: hvac_zone
+      variable: cooling_setpoint  
+    ahu_fan_electrical_meeter:
+      point: Fan_elec_rate
+      subject: Null
+      variable: ahu_fan_electrical_meeter
+  EnergyPlus:
+    zone_air_temperature_sensor:
+      point: T_zone
+      subject: hvac_zone
+      variable: Zone Air Temperature
+    HVAC_operation_sch:
+      point: HVAC_operation_sch
+      subject: ahu
+      variable: Schedule Value
+    heating_setpoint:
+      point: T_heat_set
+      subject: hvac_zone
+      variable: Zone Thermostat Heating Setpoint Temperature
+    cooling_setpoint:
+      point: T_cool_set
+      subject: hvac_zone
+      variable: Zone Thermostat Cooling Setpoint Temperature
+    ahu_fan_electrical_meeter:
+      point: Fan_elec_rate
+      subject: ahu_fan
+      variable: Fan Electric Power
+
+AutomaticOADamperControl:
+  default:
+    zone_occupancy_sensor:
+      point: o
+      subjet: null
+      variable: zone_occupancy_sensor
+    vav_air_flow_sensor:
+      point: m_oa
+      subjet: null
+      variable: vav_air_flow_sensor
+    eco_onoff:
+      point: eco_onoff
+      subjet: null
+      variable: economizer_on_off_status
+  EnergyPlus:
+    zone_occupancy_sensor:
+      point: o
+      subjet: zone_occupancy_sensor
+      variable: Schedule Value
+    vav_air_flow_sensor:
+      point: m_oa
+      subjet: Null
+      variable: Zone Air Terminal Outdoor Air Volume Flow Rate
+    eco_onoff:
+      point: eco_onoff
+      subjet: Null
+      variable: Air System Outdoor Air Economizer Status
+
 AutomaticShutdown:
   default:
     ahu_fan_on_off_status:
@@ -87,6 +158,7 @@ VAVStaticPressureSensorLocation:
       point: p_fan_set
       subject: Null
       variable: static_pressure_setpoint
+  # E+ was intentionally omitted b/c E+ can't handle this verification item
 
 SupplyAirTempReset: 
   default:
@@ -100,6 +172,76 @@ SupplyAirTempReset:
       subject: Null
       variable: System Node Setpoint Temperature
 
+EconomizerHighLimitA:
+  default:
+    outside_air_temperature_sensor:
+      point: oa_db
+      subject: Null
+      variable: outside_air_temperature_sensor
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: outside_air_flow_sensor
+  EnergyPlus:
+    outside_air_temperature_sensor:
+      point: oa_db
+      subject: Environment
+      variable: Site Outdoor Air Drybulb Temperature
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: System Node Standard Density Volume Flow Rate
+
+#EconomizerHighLimitB and EconomizerHighLimitD to be added
+
+EconomizerHighLimitC:
+  default:
+    outside_air_temperature_sensor:
+      point: oa_db
+      subject: Null
+      variable: outside_air_temperature_sensor
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: outside_air_flow_sensor
+    outside_air_enthalpy_sensor:
+      point: oa_enth
+      subject: Null
+      variable: outside_air_enthalpy_sensor
+  EnergyPlus:
+    outside_air_temperature_sensor:
+      point: oa_db
+      subject: Environment
+      variable: Site Outdoor Air Drybulb Temperature
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: System Node Standard Density Volume Flow Rate
+    outside_air_enthalpy_sensor:
+      point: oa_enth
+      subject: Environment
+      variable: Site Outdoor Air Enthalpy
+
+IntegratedEconomizerControl:
+  default:
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: outside_air_flow_sensor
+    cooling_coil_thermal_power_meter:
+      point: cooling_coil_thermal_power_meter
+      subject: null
+      variable: cooling_coil_thermal_power_meter
+  EnergyPlus:
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: System Node Standard Density Volume Flow Rate
+    cooling_coil_thermal_power_meter:
+      point: cooling_coil_thermal_power_meter
+      subject: cooling_coil_thermal_power_meter
+      variable: Air System Cooling Coil Total Cooling Energy
+
 HWReset:
   default:
     outside_air_temperature_sensor:
@@ -127,3 +269,89 @@ HWReset:
       point: T_hw
       subject: Null
       variable: System Node Setpoint Temperature
+
+CHWReset:
+  default:
+    outside_air_temperature_sensor:
+      point: T_oa_db
+      subject: Null
+      variable: outside_air_temperature_sensor
+    chiller_chilled_water_flow_sensor:
+      point: m_hw
+      subject: Null
+      variable: chiller_chilled_water_flow_sensor
+    chiller_chilled_water_return_temperature_sensor:
+      point: T_hw
+      subject: Null
+      variable: boiler_hot_water_return_temperature_sensor
+  EnergyPlus:
+    outside_air_temperature_sensor:
+      point: T_oa_db
+      subject: Null
+      variable: Site Outdoor Air Drybulb Temperature
+    chiller_chilled_water_flow_sensor:
+      point: m_hw
+      subject: Null
+      variable: System Node Mass Flow Rate
+    chiller_chilled_water_return_temperature_sensor:
+      point: T_hw
+      subject: Null
+      variable: System Node Setpoint Temperature
+
+WLHPLoopHeatRejectionControl:
+  default:
+    chilled_water_pump:
+      point: m_pump
+      subject: Null
+      variable: chilled_water_pump
+    cooling_tower_return_condenser_water_temperature_sensor:
+      point: T_min_cooling_loop
+      subject: Null
+      variable: cooling_tower_return_condenser_water_temperature_sensor
+    boiler_hot_water_return_temperature_sensor:
+      point: T_max_heating_loop
+      subject: Null
+      variable: boiler_hot_water_return_temperature_sensor
+  EnergyPlus:
+    chilled_water_pump:
+      point: m_pump
+      subject: Null
+      variable: Pump Mass Flow Rate
+    cooling_tower_return_condenser_water_temperature_sensor:
+      point: T_min_cooling_loop
+      subject: Null
+      variable: System Node Temperature
+    boiler_hot_water_return_temperature_sensor:
+      point: T_max_heating_loop
+      subject: Null
+      variable: System Node Temperature
+
+DemandControlVentilation:
+  default:
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: outside_air_flow_sensor
+    ahu_fan_on_off_status:
+      point: hvac_set
+      subject: Null
+      variable: ahu_fan_on_off_status
+    economizer_on_off_status:
+      point: s_eco
+      subjet: null
+      variable: economizer_on_off_status
+  EnergyPlus:
+    outside_air_flow_sensor:
+      point: oa_flow
+      subject: Null
+      variable: System Node Standard Density Volume Flow Rate
+    ahu_fan_on_off_status:
+      point: hvac_set
+      subject: ahu_fan_on_off_status
+      variable: Schedule Value
+    economizer_on_off_status:
+      point: s_eco
+      subjet: Null
+      variable: Air System Outdoor Air Economizer Status
+
+  # GuestRoomControlTemp and GuestRoomControlVent will be added after logic is updated