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

Jump to bottom

HVAC autosizing and add/replace fixes #263

Merged
merged 11 commits into from
Jun 6, 2019
Merged

HVAC autosizing and add/replace fixes #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
35cd7bd
Avoid autosize of non central systems, and fan coil fixes.
joseph-robertson May 31, 2019
f76b031
Regenerate test osm files.
joseph-robertson May 31, 2019
d4f2e0a
Update hvac unit tests for fan coil fix.
joseph-robertson May 31, 2019
7c04b8e
Couple test osw files for heating and cooling only fan coil.
joseph-robertson May 31, 2019
ca1823a
Couple unit tests for heating and cooling only fan coil.
joseph-robertson May 31, 2019
a665e4a
Update measures and apply rubocop.
joseph-robertson May 31, 2019
51bca27
Fix meter on central cooling pump.
joseph-robertson Jun 1, 2019
e1f5ccf
Fix fan coil remove or replace.
joseph-robertson Jun 3, 2019
61875e0
Remove heating only fan coil central system.
joseph-robertson Jun 5, 2019
5512648
Combine heating only fan coil into heating only boiler baseboards.
joseph-robertson Jun 5, 2019
6cd30a9
Regenerate test osm files.
joseph-robertson Jun 5, 2019
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
2,162 changes: 1,081 additions & 1,081 deletions project_multifamily_beta/housing_characteristics/HVAC System Shared Electricity.tsv
View file
Open in desktop

Large diffs are not rendered by default.

2,162 changes: 1,081 additions & 1,081 deletions project_multifamily_beta/housing_characteristics/HVAC System Shared Fuel Oil.tsv
View file
Open in desktop

Large diffs are not rendered by default.

2,162 changes: 1,081 additions & 1,081 deletions project_multifamily_beta/housing_characteristics/HVAC System Shared Natural Gas.tsv
View file
Open in desktop

Large diffs are not rendered by default.

2,162 changes: 1,081 additions & 1,081 deletions project_multifamily_beta/housing_characteristics/HVAC System Shared Propane.tsv
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions project_testing/housing_characteristics/HVAC System Shared Electricity.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=Fan Coil Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 0 0.5 0 0 0 0.5
Fuel Oil Both Shared 1 0 0 0 0 0
Natural Gas Both Shared 1 0 0 0 0 0
Propane Both Shared 1 0 0 0 0 0
Electricity Neither Shared 1 0 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0 0
Propane Neither Shared 1 0 0 0 0 0
Electricity Only Cooling Shared 0 0 1 0 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0 0
Propane Only Cooling Shared 1 0 0 0 0 0
Electricity Only Heating Shared 0 0 0 0.5 0.5 0
Fuel Oil Only Heating Shared 1 0 0 0 0 0
Natural Gas Only Heating Shared 1 0 0 0 0 0
Propane Only Heating Shared 1 0 0 0 0 0
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 0 0.5 0 0 0.5
Fuel Oil Both Shared 1 0 0 0 0
Natural Gas Both Shared 1 0 0 0 0
Propane Both Shared 1 0 0 0 0
Electricity Neither Shared 1 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0
Propane Neither Shared 1 0 0 0 0
Electricity Only Cooling Shared 0 0 1 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0
Propane Only Cooling Shared 1 0 0 0 0
Electricity Only Heating Shared 0 0 0 1 0
Fuel Oil Only Heating Shared 1 0 0 0 0
Natural Gas Only Heating Shared 1 0 0 0 0
Propane Only Heating Shared 1 0 0 0 0
34 changes: 17 additions & 17 deletions project_testing/housing_characteristics/HVAC System Shared Fuel Oil.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=Fan Coil Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0 0
Fuel Oil Both Shared 0 0.5 0 0 0 0.5
Natural Gas Both Shared 1 0 0 0 0 0
Propane Both Shared 1 0 0 0 0 0
Electricity Neither Shared 1 0 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0 0
Propane Neither Shared 1 0 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0 0
Fuel Oil Only Cooling Shared 0 0 1 0 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0 0
Propane Only Cooling Shared 1 0 0 0 0 0
Electricity Only Heating Shared 1 0 0 0 0 0
Fuel Oil Only Heating Shared 0 0 0 0.5 0.5 0
Natural Gas Only Heating Shared 1 0 0 0 0 0
Propane Only Heating Shared 1 0 0 0 0 0
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0
Fuel Oil Both Shared 0 0.5 0 0 0.5
Natural Gas Both Shared 1 0 0 0 0
Propane Both Shared 1 0 0 0 0
Electricity Neither Shared 1 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0
Propane Neither Shared 1 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0
Fuel Oil Only Cooling Shared 0 0 1 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0
Propane Only Cooling Shared 1 0 0 0 0
Electricity Only Heating Shared 1 0 0 0 0
Fuel Oil Only Heating Shared 0 0 0 1 0
Natural Gas Only Heating Shared 1 0 0 0 0
Propane Only Heating Shared 1 0 0 0 0
34 changes: 17 additions & 17 deletions project_testing/housing_characteristics/HVAC System Shared Natural Gas.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=Fan Coil Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0 0
Fuel Oil Both Shared 1 0 0 0 0 0
Natural Gas Both Shared 0 0.5 0 0 0 0.5
Propane Both Shared 1 0 0 0 0 0
Electricity Neither Shared 1 0 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0 0
Propane Neither Shared 1 0 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0 0
Natural Gas Only Cooling Shared 0 0 1 0 0 0
Propane Only Cooling Shared 1 0 0 0 0 0
Electricity Only Heating Shared 1 0 0 0 0 0
Fuel Oil Only Heating Shared 1 0 0 0 0 0
Natural Gas Only Heating Shared 0 0 0 0.5 0.5 0
Propane Only Heating Shared 1 0 0 0 0 0
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0
Fuel Oil Both Shared 1 0 0 0 0
Natural Gas Both Shared 0 0.5 0 0 0.5
Propane Both Shared 1 0 0 0 0
Electricity Neither Shared 1 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0
Propane Neither Shared 1 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0
Natural Gas Only Cooling Shared 0 0 1 0 0
Propane Only Cooling Shared 1 0 0 0 0
Electricity Only Heating Shared 1 0 0 0 0
Fuel Oil Only Heating Shared 1 0 0 0 0
Natural Gas Only Heating Shared 0 0 0 1 0
Propane Only Heating Shared 1 0 0 0 0
34 changes: 17 additions & 17 deletions project_testing/housing_characteristics/HVAC System Shared Propane.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=Fan Coil Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0 0
Fuel Oil Both Shared 1 0 0 0 0 0
Natural Gas Both Shared 1 0 0 0 0 0
Propane Both Shared 0 0.5 0 0 0 0.5
Electricity Neither Shared 1 0 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0 0
Propane Neither Shared 1 0 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0 0
Propane Only Cooling Shared 0 0 1 0 0 0
Electricity Only Heating Shared 1 0 0 0 0 0
Fuel Oil Only Heating Shared 1 0 0 0 0 0
Natural Gas Only Heating Shared 1 0 0 0 0 0
Propane Only Heating Shared 0 0 0 0.5 0.5 0
Dependency=Heating Fuel Dependency=HVAC System Is Shared Option=None Option=Fan Coil Heating And Cooling Option=Fan Coil Cooling Only Option=Boiler Baseboards Heating Only Option=PTAC Heating And Cooling
Electricity Both Shared 1 0 0 0 0
Fuel Oil Both Shared 1 0 0 0 0
Natural Gas Both Shared 1 0 0 0 0
Propane Both Shared 0 0.5 0 0 0.5
Electricity Neither Shared 1 0 0 0 0
Fuel Oil Neither Shared 1 0 0 0 0
Natural Gas Neither Shared 1 0 0 0 0
Propane Neither Shared 1 0 0 0 0
Electricity Only Cooling Shared 1 0 0 0 0
Fuel Oil Only Cooling Shared 1 0 0 0 0
Natural Gas Only Cooling Shared 1 0 0 0 0
Propane Only Cooling Shared 0 0 1 0 0
Electricity Only Heating Shared 1 0 0 0 0
Fuel Oil Only Heating Shared 1 0 0 0 0
Natural Gas Only Heating Shared 1 0 0 0 0
Propane Only Heating Shared 0 0 0 1 0
20 changes: 10 additions & 10 deletions resources/measures/HPXMLtoOpenStudio/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>hpxml_translator</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>630fa762-155b-40ec-882c-030f94a0df60</version_id>
<version_modified>20190522T213736Z</version_modified>
<version_id>7a630527-e43f-4c61-bd5a-ec07060508fd</version_id>
<version_modified>20190605T192628Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLTranslator</class_name>
<display_name>HPXML Translator</display_name>
Expand Down Expand Up @@ -405,12 +405,6 @@
<usage_type>resource</usage_type>
<checksum>BC658FAA</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>8AED1B98</checksum>
</file>
<file>
<filename>airflow.rb</filename>
<filetype>rb</filetype>
Expand Down Expand Up @@ -453,17 +447,23 @@
<usage_type>resource</usage_type>
<checksum>E071B750</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>63542680</checksum>
</file>
<file>
<filename>util.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3B273855</checksum>
<checksum>2E8113BE</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>37452127</checksum>
<checksum>02668093</checksum>
</file>
</files>
</measure>
Loading