Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fact sheets 2023 + HVAC sizing bugfixes #1151

Draft
wants to merge 2 commits into
base: fact_sheets_2023
Choose a base branch
from
Draft

Fact sheets 2023 + HVAC sizing bugfixes #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cad8a
Manually copy changes from hvac_sizing_bugfixes branch.
joseph-robertson Oct 24, 2023
61949d8
Latest results.
Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 2 additions & 44 deletions measures/UpgradeCosts/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>upgrade_costs</name>
<uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
<version_id>c1701f5c-37ad-4148-aff8-70f5e42e8a60</version_id>
<version_modified>2023-08-21T22:09:39Z</version_modified>
<version_id>740cc631-b3c7-49f7-9976-669dda637ef4</version_id>
<version_modified>2023-10-24T18:40:48Z</version_modified>
<xml_checksum>9BF1E6AC</xml_checksum>
<class_name>UpgradeCosts</class_name>
<display_name>Upgrade Costs</display_name>
Expand Down Expand Up @@ -119,12 +119,6 @@
<usage_type>test</usage_type>
<checksum>B9183037</checksum>
</file>
<file>
<filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>65449877</checksum>
</file>
<file>
<filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -149,24 +143,12 @@
<usage_type>test</usage_type>
<checksum>ABFCA3DB</checksum>
</file>
<file>
<filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>076668CA</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
<filetype>osw</filetype>
<usage_type>test</usage_type>
<checksum>B57303D3</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>451F9215</checksum>
</file>
<file>
<filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
<filetype>osw</filetype>
Expand All @@ -179,12 +161,6 @@
<usage_type>test</usage_type>
<checksum>986E1AAD</checksum>
</file>
<file>
<filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>DDDC28CD</checksum>
</file>
<file>
<filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
<filetype>osw</filetype>
Expand Down Expand Up @@ -221,24 +197,6 @@
<usage_type>test</usage_type>
<checksum>B165DD4B</checksum>
</file>
<file>
<filename>in.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>in.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>06875597</checksum>
</file>
<file>
<filename>in.xml</filename>
<filetype>xml</filetype>
<usage_type>test</usage_type>
<checksum>BD7C5A72</checksum>
</file>
<file>
<filename>upgrade_costs_test.rb</filename>
<filetype>rb</filetype>
Expand Down
16 changes: 11 additions & 5 deletions resources/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4059,11 +4059,17 @@ def distribution_system
end

def is_dual_fuel
if @backup_heating_fuel.nil?
return false
end
if @backup_heating_fuel.to_s == @heat_pump_fuel.to_s
return false
if backup_system.nil?
if @backup_heating_fuel.nil?
return false
end
if @backup_heating_fuel.to_s == @heat_pump_fuel.to_s
return false
end
else
if backup_system.heating_system_fuel.to_s == @heat_pump_fuel.to_s
return false
end
end

return true
Expand Down
160 changes: 91 additions & 69 deletions resources/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
View file
Open in desktop

Large diffs are not rendered by default.

25,672 changes: 12,836 additions & 12,836 deletions resources/options_lookup.tsv
View file
Open in desktop

Large diffs are not rendered by default.

290 changes: 145 additions & 145 deletions test/base_results/baseline/annual/results_output.csv
View file
Open in desktop

Large diffs are not rendered by default.

35,040 changes: 17,520 additions & 17,520 deletions test/base_results/baseline/timeseries/buildstockbatch.csv
View file
Open in desktop

Large diffs are not rendered by default.

35,040 changes: 17,520 additions & 17,520 deletions test/base_results/baseline/timeseries/results_output.csv
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions test/base_results/upgrades/annual/results_output.csv
View file
Open in desktop

Large diffs are not rendered by default.

33,942 changes: 16,971 additions & 16,971 deletions test/base_results/upgrades/timeseries/buildstockbatch.csv
View file
Open in desktop

Large diffs are not rendered by default.

33,942 changes: 16,971 additions & 16,971 deletions test/base_results/upgrades/timeseries/results_output.csv
View file
Open in desktop

Large diffs are not rendered by default.