Skip to content

Commit cbaec14

Browse files
shorowitshorowit
committed
Small bugfixes/improvements.
1 parent 34afa09 commit cbaec14

7 files changed

Lines changed: 120 additions & 121 deletions

File tree

‎ReportHPXMLOutput/measure.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ def report_output_results(runner, bldg_outputs, output_format, output_path)
181181
runner.registerInfo("Wrote hpxml output to #{output_path}.")
182182

183183
results_out.each do |name, value|
184-
next if name.nil? # line breaks
184+
next if name.nil? || value.nil?
185185

186-
name = OpenStudio::toUnderscoreCase(name)
186+
name = OpenStudio::toUnderscoreCase(name).chomp('_')
187187

188188
runner.registerValue(name, value)
189189
runner.registerInfo("Registering #{value} for #{name}.")

‎ReportHPXMLOutput/measure.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.0</schema_version>
44
<name>report_hpxml_output</name>
55
<uid>9561a0d7-60ad-48c5-8337-2461df044d80</uid>
6-
<version_id>54d149eb-c539-41f6-873e-a9b408f370c3</version_id>
7-
<version_modified>20220909T194213Z</version_modified>
6+
<version_id>7bb635bd-994a-4f18-a40a-8cd4bdf44a2a</version_id>
7+
<version_modified>20220912T215712Z</version_modified>
88
<xml_checksum>9BF1E6AC</xml_checksum>
99
<class_name>ReportHPXMLOutput</class_name>
1010
<display_name>HPXML Output Report</display_name>
@@ -64,6 +64,12 @@
6464
<usage_type>resource</usage_type>
6565
<checksum>084AB878</checksum>
6666
</file>
67+
<file>
68+
<filename>hpxml_output_report_test.rb</filename>
69+
<filetype>rb</filetype>
70+
<usage_type>test</usage_type>
71+
<checksum>C0E4766D</checksum>
72+
</file>
6773
<file>
6874
<version>
6975
<software_program>OpenStudio</software_program>
@@ -73,13 +79,7 @@
7379
<filename>measure.rb</filename>
7480
<filetype>rb</filetype>
7581
<usage_type>script</usage_type>
76-
<checksum>4A56EEB4</checksum>
77-
</file>
78-
<file>
79-
<filename>hpxml_output_report_test.rb</filename>
80-
<filetype>rb</filetype>
81-
<usage_type>test</usage_type>
82-
<checksum>C0E4766D</checksum>
82+
<checksum>642666E6</checksum>
8383
</file>
8484
</files>
8585
</measure>

‎ReportSimulationOutput/measure.rb‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -568,27 +568,27 @@ def run(runner, user_arguments)
568568

569569
# Write/report results
570570
report_runperiod_output_results(runner, outputs, output_format, annual_output_path, runperiod_n_digits, generate_eri_outputs)
571-
write_timeseries_output_results(runner, outputs, output_format,
572-
timeseries_output_path,
573-
timeseries_frequency,
574-
include_timeseries_total_consumptions,
575-
include_timeseries_fuel_consumptions,
576-
include_timeseries_end_use_consumptions,
577-
include_timeseries_emissions,
578-
include_timeseries_emission_fuels,
579-
include_timeseries_emission_end_uses,
580-
include_timeseries_hot_water_uses,
581-
include_timeseries_total_loads,
582-
include_timeseries_component_loads,
583-
include_timeseries_unmet_hours,
584-
include_timeseries_zone_temperatures,
585-
include_timeseries_airflows,
586-
include_timeseries_weather,
587-
add_dst_column,
588-
add_utc_column,
589-
timestamps_dst,
590-
timestamps_utc,
591-
use_dview_format)
571+
report_timeseries_output_results(runner, outputs, output_format,
572+
timeseries_output_path,
573+
timeseries_frequency,
574+
include_timeseries_total_consumptions,
575+
include_timeseries_fuel_consumptions,
576+
include_timeseries_end_use_consumptions,
577+
include_timeseries_emissions,
578+
include_timeseries_emission_fuels,
579+
include_timeseries_emission_end_uses,
580+
include_timeseries_hot_water_uses,
581+
include_timeseries_total_loads,
582+
include_timeseries_component_loads,
583+
include_timeseries_unmet_hours,
584+
include_timeseries_zone_temperatures,
585+
include_timeseries_airflows,
586+
include_timeseries_weather,
587+
add_dst_column,
588+
add_utc_column,
589+
timestamps_dst,
590+
timestamps_utc,
591+
use_dview_format)
592592

593593
return true
594594
end
@@ -1245,10 +1245,9 @@ def report_runperiod_output_results(runner, outputs, output_format, annual_outpu
12451245
runner.registerInfo("Wrote annual output results to #{annual_output_path}.")
12461246

12471247
results_out.each do |name, value|
1248-
next if name.nil? # line breaks
1249-
next if name.start_with?('ERI')
1248+
next if name.nil? || value.nil?
12501249

1251-
name = OpenStudio::toUnderscoreCase(name)
1250+
name = OpenStudio::toUnderscoreCase(name).chomp('_')
12521251

12531252
runner.registerValue(name, value)
12541253
runner.registerInfo("Registering #{value} for #{name}.")
@@ -1518,27 +1517,27 @@ def get_ids(ids, seed_id_map = {})
15181517
return results_out
15191518
end
15201519

1521-
def write_timeseries_output_results(runner, outputs, output_format,
1522-
timeseries_output_path,
1523-
timeseries_frequency,
1524-
include_timeseries_total_consumptions,
1525-
include_timeseries_fuel_consumptions,
1526-
include_timeseries_end_use_consumptions,
1527-
include_timeseries_emissions,
1528-
include_timeseries_emission_fuels,
1529-
include_timeseries_emission_end_uses,
1530-
include_timeseries_hot_water_uses,
1531-
include_timeseries_total_loads,
1532-
include_timeseries_component_loads,
1533-
include_timeseries_unmet_hours,
1534-
include_timeseries_zone_temperatures,
1535-
include_timeseries_airflows,
1536-
include_timeseries_weather,
1537-
add_dst_column,
1538-
add_utc_column,
1539-
timestamps_dst,
1540-
timestamps_utc,
1541-
use_dview_format)
1520+
def report_timeseries_output_results(runner, outputs, output_format,
1521+
timeseries_output_path,
1522+
timeseries_frequency,
1523+
include_timeseries_total_consumptions,
1524+
include_timeseries_fuel_consumptions,
1525+
include_timeseries_end_use_consumptions,
1526+
include_timeseries_emissions,
1527+
include_timeseries_emission_fuels,
1528+
include_timeseries_emission_end_uses,
1529+
include_timeseries_hot_water_uses,
1530+
include_timeseries_total_loads,
1531+
include_timeseries_component_loads,
1532+
include_timeseries_unmet_hours,
1533+
include_timeseries_zone_temperatures,
1534+
include_timeseries_airflows,
1535+
include_timeseries_weather,
1536+
add_dst_column,
1537+
add_utc_column,
1538+
timestamps_dst,
1539+
timestamps_utc,
1540+
use_dview_format)
15421541
return if @timestamps.nil?
15431542

15441543
if not ['timestep', 'hourly', 'daily', 'monthly'].include? timeseries_frequency

‎ReportSimulationOutput/measure.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.0</schema_version>
44
<name>report_simulation_output</name>
55
<uid>df9d170c-c21a-4130-866d-0d46b06073fd</uid>
6-
<version_id>3c798188-befd-4a86-83f1-17a0044c8bd6</version_id>
7-
<version_modified>20220909T233014Z</version_modified>
6+
<version_id>1370ace1-fa80-473f-8fab-9e50962134d1</version_id>
7+
<version_modified>20220912T215713Z</version_modified>
88
<xml_checksum>9BF1E6AC</xml_checksum>
99
<class_name>ReportSimulationOutput</class_name>
1010
<display_name>HPXML Simulation Output Report</display_name>
@@ -1499,6 +1499,12 @@
14991499
</attribute>
15001500
</attributes>
15011501
<files>
1502+
<file>
1503+
<filename>output_report_test.rb</filename>
1504+
<filetype>rb</filetype>
1505+
<usage_type>test</usage_type>
1506+
<checksum>CB5671F9</checksum>
1507+
</file>
15021508
<file>
15031509
<version>
15041510
<software_program>OpenStudio</software_program>
@@ -1508,13 +1514,7 @@
15081514
<filename>measure.rb</filename>
15091515
<filetype>rb</filetype>
15101516
<usage_type>script</usage_type>
1511-
<checksum>930E7C54</checksum>
1512-
</file>
1513-
<file>
1514-
<filename>output_report_test.rb</filename>
1515-
<filetype>rb</filetype>
1516-
<usage_type>test</usage_type>
1517-
<checksum>CB5671F9</checksum>
1517+
<checksum>B44D38C9</checksum>
15181518
</file>
15191519
</files>
15201520
</measure>

‎ReportUtilityBills/measure.rb‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def report_runperiod_output_results(runner, utility_bills, output_format, output
225225
segment = segment.strip
226226

227227
results_out = []
228-
results_out << ["#{bill_scenario_name}: Total ($)", utility_bills.values.sum { |bill| bill.annual_total.round(2) }.round(2)]
228+
results_out << ["#{bill_scenario_name}: Total (USD)", utility_bills.values.sum { |bill| bill.annual_total.round(2) }.round(2)]
229229

230230
utility_bills.each do |fuel_type, bill|
231231
new_segment = fuel_type.split(':', 2)[0]
@@ -234,10 +234,10 @@ def report_runperiod_output_results(runner, utility_bills, output_format, output
234234
segment = new_segment
235235
end
236236

237-
results_out << ["#{bill_scenario_name}: #{fuel_type}: Fixed ($)", bill.annual_fixed_charge.round(2)] if bill.annual_fixed_charge != 0
238-
results_out << ["#{bill_scenario_name}: #{fuel_type}: Marginal ($)", bill.annual_energy_charge.round(2)] if bill.annual_energy_charge != 0
239-
results_out << ["#{bill_scenario_name}: #{fuel_type}: PV Credit ($)", bill.annual_production_credit.round(2)] if [FT::Elec].include?(fuel_type) && bill.annual_production_credit != 0
240-
results_out << ["#{bill_scenario_name}: #{fuel_type}: Total ($)", bill.annual_total.round(2)] if bill.annual_total != 0
237+
results_out << ["#{bill_scenario_name}: #{fuel_type}: Fixed (USD)", bill.annual_fixed_charge.round(2)] if bill.annual_fixed_charge != 0
238+
results_out << ["#{bill_scenario_name}: #{fuel_type}: Marginal (USD)", bill.annual_energy_charge.round(2)] if bill.annual_energy_charge != 0
239+
results_out << ["#{bill_scenario_name}: #{fuel_type}: PV Credit (USD)", bill.annual_production_credit.round(2)] if [FT::Elec].include?(fuel_type) && bill.annual_production_credit != 0
240+
results_out << ["#{bill_scenario_name}: #{fuel_type}: Total (USD)", bill.annual_total.round(2)] if bill.annual_total != 0
241241
end
242242

243243
if ['csv'].include? output_format
@@ -264,8 +264,9 @@ def report_runperiod_output_results(runner, utility_bills, output_format, output
264264
runner.registerInfo("Wrote bills output to #{output_path}.")
265265

266266
results_out.each do |name, value|
267-
name = name.gsub('($)', 'USD')
268-
name = OpenStudio::toUnderscoreCase(name)
267+
next if name.nil? || value.nil?
268+
269+
name = OpenStudio::toUnderscoreCase(name).chomp('_')
269270

270271
runner.registerValue(name, value)
271272
runner.registerInfo("Registering #{value} for #{name}.")

‎ReportUtilityBills/measure.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.0</schema_version>
44
<name>report_utility_bills</name>
55
<uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
6-
<version_id>a1cea768-0ae8-4dfa-95db-ab063beebe79</version_id>
7-
<version_modified>20220909T205602Z</version_modified>
6+
<version_id>3e045d35-d86a-4e0c-87ad-af9aadf19eb5</version_id>
7+
<version_modified>20220912T215714Z</version_modified>
88
<xml_checksum>15BF4E57</xml_checksum>
99
<class_name>ReportUtilityBills</class_name>
1010
<display_name>Utility Bills Report</display_name>
@@ -117,13 +117,13 @@
117117
<filename>measure.rb</filename>
118118
<filetype>rb</filetype>
119119
<usage_type>script</usage_type>
120-
<checksum>BEA20B8C</checksum>
120+
<checksum>15679DA0</checksum>
121121
</file>
122122
<file>
123123
<filename>utility_bills_test.rb</filename>
124124
<filetype>rb</filetype>
125125
<usage_type>test</usage_type>
126-
<checksum>8F88B002</checksum>
126+
<checksum>C70DDC4F</checksum>
127127
</file>
128128
</files>
129129
</measure>

0 commit comments

Comments
 (0)