diff --git a/openstudiocore/src/pat_app/Measures/StandardReports/measure.xml b/openstudiocore/src/pat_app/Measures/StandardReports/measure.xml
index d80a671120e..6011414a394 100644
--- a/openstudiocore/src/pat_app/Measures/StandardReports/measure.xml
+++ b/openstudiocore/src/pat_app/Measures/StandardReports/measure.xml
@@ -2,8 +2,8 @@
3.0
open_studio_results
a6b9a024-0912-4be3-a55d-57dfe0b8586c
- e9fa6088-381f-4e10-9927-07c6305b08ac
- 20160315T205436Z
+ 54c5c464-8235-45bd-9859-9461e43abe05
+ 20160429T151606Z
557BF06F
OpenStudioResults
OpenStudio Results
@@ -489,13 +489,13 @@
ExampleModel.osm
osm
test
- D64D89EE
+ E7812BB5
os_lib_reporting.rb
rb
resource
- EC89B286
+ DCCD722E
diff --git a/openstudiocore/src/pat_app/Measures/StandardReports/resources/os_lib_reporting.rb b/openstudiocore/src/pat_app/Measures/StandardReports/resources/os_lib_reporting.rb
index 3c93d70d036..0ad4fe3bd01 100644
--- a/openstudiocore/src/pat_app/Measures/StandardReports/resources/os_lib_reporting.rb
+++ b/openstudiocore/src/pat_app/Measures/StandardReports/resources/os_lib_reporting.rb
@@ -1026,10 +1026,10 @@ def self.plant_loop_component_summary_logic(component, model)
else
sizing_ip_neat = 'Autosized'
end
- value_source_units = 'Pa'
+ value_source_units = 'W'
value_target_units = 'W'
- if component.ratedFlowRate.is_initialized
- value_ip = OpenStudio.convert(component.ratedFlowRate.get, sizing_source_units, sizing_target_units).get
+ if component.ratedPowerConsumption.is_initialized
+ value_ip = component.ratedPowerConsumption.get
value_ip_neat = OpenStudio.toNeatString(value_ip, 2, true)
else
value_ip_neat = 'Autosized'
@@ -1039,7 +1039,7 @@ def self.plant_loop_component_summary_logic(component, model)
elsif component.to_PumpVariableSpeed.is_initialized
component = component.to_PumpVariableSpeed.get
- sizing_source_units = 'm^3/s'
+ sizing_source_units = 'm^3/s'
sizing_target_units = 'gal/min'
if component.ratedFlowRate.is_initialized
sizing_ip = OpenStudio.convert(component.ratedFlowRate.get, sizing_source_units, sizing_target_units).get
@@ -1047,10 +1047,10 @@ def self.plant_loop_component_summary_logic(component, model)
else
sizing_ip_neat = 'Autosized'
end
- value_source_units = 'Pa'
+ value_source_units = 'W'
value_target_units = 'W'
- if component.ratedFlowRate.is_initialized
- value_ip = OpenStudio.convert(component.ratedFlowRate.get, sizing_source_units, sizing_target_units).get
+ if component.ratedPowerConsumption.is_initialized
+ value_ip = component.ratedPowerConsumption.get
value_ip_neat = OpenStudio.toNeatString(value_ip, 2, true)
else
value_ip_neat = 'Autosized'
@@ -1813,7 +1813,7 @@ def self.exterior_light_section(model, sqlFile, runner, name_only = false)
# Exterior Lighting from output
ext_light_data = {}
ext_light_data[:title] = ''
- ext_light_data[:header] = ['Description', 'Total Power', 'Consumption']
+ ext_light_data[:header] = ['Description', 'Total Power', 'Annual Consumption']
power_units = 'W'
consumption_units = 'kWh'
ext_light_data[:units] = ['', power_units, consumption_units]
@@ -1838,7 +1838,7 @@ def self.exterior_light_section(model, sqlFile, runner, name_only = false)
else
# add data
total_watts_ip = total_watts.get
- consumption_ip = consumption.get * 0.2778 # value * energy conversion GJ to kWh todo - use real conversion
+ consumption_ip = OpenStudio.convert(sqlFile.netSiteEnergy.get,'GJ','kWh').get
total_watts_ip_neat = OpenStudio.toNeatString(total_watts_ip, 2, true)
consumption_ip_neat = OpenStudio.toNeatString(consumption_ip, 2, true)
ext_light_data[:data] << ['Exterior Lighting Total', total_watts_ip_neat, consumption_ip_neat]
@@ -2871,7 +2871,7 @@ def self.interior_lighting_section(model, sqlFile, runner, name_only = false)
# data for query
report_name = 'LightingSummary'
table_name = 'Interior Lighting'
- columns = ['', 'Zone', 'Lighting Power Density', 'Total Power', 'Schedule Name', 'Scheduled Hours/Week', 'Actual Load Hours/Week', 'Return Air Fraction', 'Consumption']
+ columns = ['', 'Zone', 'Lighting Power Density', 'Total Power', 'Schedule Name', 'Scheduled Hours/Week', 'Actual Load Hours/Week', 'Return Air Fraction', 'Annual Consumption']
columns_query = ['', 'Zone', 'Lighting Power Density', 'Total Power', 'Schedule Name', 'Scheduled Hours/Week', 'Full Load Hours/Week', 'Return Air Fraction', 'Consumption']
# populate dynamic rows
diff --git a/openstudiocore/src/pat_app/Measures/StandardReports/tests/ExampleModel.osm b/openstudiocore/src/pat_app/Measures/StandardReports/tests/ExampleModel.osm
index 31c18ddf8aa..fc31cf9e6a0 100755
--- a/openstudiocore/src/pat_app/Measures/StandardReports/tests/ExampleModel.osm
+++ b/openstudiocore/src/pat_app/Measures/StandardReports/tests/ExampleModel.osm
@@ -1,7 +1,7 @@
OS:Version,
- {407f94b6-3561-478a-b6dc-51aa10b1659c}, !- Handle
- 1.10.5; !- Version Identifier
+ {38c2d8db-a7a8-4ea9-bac5-9b2bb64fa982}, !- Handle
+ 1.11.0; !- Version Identifier
OS:SimulationControl,
{41f65c43-2dc9-4d82-a6e4-a562bae08803}, !- Handle
@@ -3232,20 +3232,6 @@ OS:Rendering:Color,
0, !- Rendering Green Value
255; !- Rendering Blue Value
-OS:WeatherFile,
- {cc5a7650-318f-41dd-a20a-acaeef25de6a}, !- Handle
- Denver Centennial Golden Nr, !- City
- CO, !- State Province Region
- USA, !- Country
- TMY3, !- Data Source
- 724666, !- WMO Number
- 39.74, !- Latitude {deg}
- -105.18, !- Longitude {deg}
- -7, !- Time Zone {hr}
- 1829, !- Elevation {m}
- file:///C:/Users/dgoldwas/Documents/GitHub/OpenStudio-measures/NREL working measures/OpenStudioResults/tests/ExampleModel/files/USA_CO_Golden-NREL.724666_TMY3.epw, !- Url
- BDF687C1; !- Checksum
-
OS:Rendering:Color,
{05fe2a32-7705-4617-9d37-17b9d1c310c0}, !- Handle
Rendering Color 3, !- Name
@@ -5314,9 +5300,9 @@ OS:Pump:VariableSpeed,
Pump Variable Speed 2, !- Name
{ed247646-d754-4074-b9a1-53a43f00cba3}, !- Inlet Node Name
{801dc7a8-844d-4acd-83ad-1f4de198c1c4}, !- Outlet Node Name
- , !- Rated Flow Rate {m3/s}
+ 0.00630901963994975, !- Rated Flow Rate {m3/s}
, !- Rated Pump Head {Pa}
- , !- Rated Power Consumption {W}
+ 2500, !- Rated Power Consumption {W}
, !- Motor Efficiency
, !- Fraction of Motor Inefficiencies to Fluid Stream
, !- Coefficient 1 of the Part Load Performance Curve
@@ -6419,3 +6405,17 @@ OS:Connection,
{3ac6de72-4ea4-483d-960c-138d32cbf8d9}, !- Target Object
2; !- Inlet Port
+OS:WeatherFile,
+ {f8d26468-476f-405d-bb2c-6a73e549fd50}, !- Handle
+ Denver Centennial Golden Nr, !- City
+ CO, !- State Province Region
+ USA, !- Country
+ TMY3, !- Data Source
+ 724666, !- WMO Number
+ 39.74, !- Latitude {deg}
+ -105.18, !- Longitude {deg}
+ -7, !- Time Zone {hr}
+ 1829, !- Elevation {m}
+ file:files/USA_CO_Golden-NREL.724666_TMY3.epw, !- Url
+ BDF687C1; !- Checksum
+