Skip to content

Commit

Permalink
Merge pull request #1185 from NREL/cfis_supplemental_fan
Browse files Browse the repository at this point in the history
Allow modeling CFIS w/ a supplemental fan
  • Loading branch information
shorowit authored Oct 12, 2022
2 parents d0cf4f7 + 9071be5 commit 253c6b2
Show file tree
Hide file tree
Showing 31 changed files with 2,243 additions and 249 deletions.
2 changes: 2 additions & 0 deletions BuildResidentialHPXML/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4987,6 +4987,7 @@ def self.set_ventilation_fans(hpxml, args)

distribution_system_idref = hvac_distribution.id
end
cfis_addtl_runtime_operating_mode = HPXML::CFISModeAirHandler
end

if args[:mech_vent_num_units_served] > 1
Expand Down Expand Up @@ -5019,6 +5020,7 @@ def self.set_ventilation_fans(hpxml, args)

hpxml.ventilation_fans.add(id: "VentilationFan#{hpxml.ventilation_fans.size + 1}",
fan_type: args[:mech_vent_fan_type],
cfis_addtl_runtime_operating_mode: cfis_addtl_runtime_operating_mode,
rated_flow_rate: rated_flow_rate,
hours_in_operation: hours_in_operation,
used_for_whole_building_ventilation: true,
Expand Down
6 changes: 3 additions & 3 deletions BuildResidentialHPXML/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>build_residential_hpxml</name>
<uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
<version_id>42bb3575-dfe5-4a6c-a97b-875bb522461b</version_id>
<version_modified>20220930T164344Z</version_modified>
<version_id>85cba5f3-110e-46bb-b0d6-ae7f5a9e91a6</version_id>
<version_modified>20220930T224205Z</version_modified>
<xml_checksum>2C38F48B</xml_checksum>
<class_name>BuildResidentialHPXML</class_name>
<display_name>HPXML Builder</display_name>
Expand Down Expand Up @@ -6413,7 +6413,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>CE5383BA</checksum>
<checksum>963C6E7F</checksum>
</file>
</files>
</measure>
3 changes: 2 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ __New Features__
- Allows setting the ground soil conductivity used for foundation heat transfer and ground source heat pumps.
- Allows setting the natural ventilation availability (days/week that operable windows can be opened); default changed from 7 to 3 (M/W/F).
- Allows specifying duct surface area multipliers.
- Allows modeling CFIS ventilation systems with supplemental fans.
- Allows shared dishwasher/clothes washer to be attached to a hot water distribution system instead of a single water heater.
- Design temperatures, used to calculate design loads for HVAC equipment autosizing, are now output in `in.xml` and `results_annual.csv`.
- EnergyPlus modeling changes:
- Switches Kiva foundation model timestep from 'Hourly' to 'Timestep'; small increase in runtime for sub-hourly simulations.
Expand All @@ -26,7 +28,6 @@ __New Features__
- Adds optional arguments for utility bill scenarios.
- ReportUtilityBills measure:
- Removes utility rate and PV related arguments in lieu of new utility bill scenarios described inside the HPXML file.
- Allows shared dishwasher/clothes washer to be attached to a hot water distribution system instead of a single water heater.
- Improves Kiva foundation model heat transfer by providing better initial temperature assumptions based on foundation type and insulation levels.

__Bugfixes__
Expand Down
6 changes: 3 additions & 3 deletions HPXMLtoOpenStudio/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def self.create(hpxml, runner, model, hpxml_path, epw_path, cache_path, output_d

# Other

add_airflow(model, weather, spaces, airloop_map)
add_airflow(runner, model, weather, spaces, airloop_map)
add_photovoltaics(model)
add_generators(model)
add_batteries(model, spaces)
Expand Down Expand Up @@ -1733,7 +1733,7 @@ def self.add_pools_and_hot_tubs(runner, model, spaces)
end
end

def self.add_airflow(model, weather, spaces, airloop_map)
def self.add_airflow(runner, model, weather, spaces, airloop_map)
# Ducts
duct_systems = {}
@hpxml.hvac_distributions.each do |hvac_distribution|
Expand Down Expand Up @@ -1764,7 +1764,7 @@ def self.add_airflow(model, weather, spaces, airloop_map)
end
end

Airflow.apply(model, weather, spaces, @hpxml, @cfa, @nbeds,
Airflow.apply(model, runner, weather, spaces, @hpxml, @cfa, @nbeds,
@ncfl_ag, duct_systems, airloop_map, @clg_ssn_sensor, @eri_version,
@frac_windows_operable, @apply_ashrae140_assumptions, @schedules_file)
end
Expand Down
100 changes: 50 additions & 50 deletions HPXMLtoOpenStudio/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>16a08958-1f0b-4db4-ad0b-030757149f8b</version_id>
<version_modified>20221011T163209Z</version_modified>
<version_id>e2eebf1e-46b9-4960-af1f-75ff9df120ad</version_id>
<version_modified>20221011T222505Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -331,12 +331,6 @@
<usage_type>resource</usage_type>
<checksum>B39C3F8E</checksum>
</file>
<file>
<filename>constants.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3593C0B1</checksum>
</file>
<file>
<filename>xmlhelper.rb</filename>
<filetype>rb</filetype>
Expand Down Expand Up @@ -463,42 +457,30 @@
<usage_type>resource</usage_type>
<checksum>0D0399FA</checksum>
</file>
<file>
<filename>test_airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>15015829</checksum>
</file>
<file>
<filename>weather.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>84489603</checksum>
</file>
<file>
<filename>airflow.rb</filename>
<filename>hotwater_appliances.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>A2B7F8E1</checksum>
<checksum>1BAC39B2</checksum>
</file>
<file>
<filename>hotwater_appliances.rb</filename>
<filename>constants.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>1BAC39B2</checksum>
<checksum>747ABEC3</checksum>
</file>
<file>
<filename>materials.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>24DCB986</checksum>
</file>
<file>
<filename>test_validation.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>675AC983</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
Expand All @@ -511,35 +493,59 @@
<usage_type>test</usage_type>
<checksum>CEA9E398</checksum>
</file>
<file>
<filename>waterheater.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>65181200</checksum>
</file>
<file>
<filename>test_water_heater.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>E26F31D2</checksum>
</file>
<file>
<filename>test_airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>5F417A29</checksum>
</file>
<file>
<filename>hvac_sizing.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>42C2E302</checksum>
<checksum>09DA3620</checksum>
</file>
<file>
<filename>waterheater.rb</filename>
<filename>hpxml_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>65181200</checksum>
<checksum>D7B1CC89</checksum>
</file>
<file>
<filename>test_defaults.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>48381849</checksum>
<checksum>9905D1E0</checksum>
</file>
<file>
<filename>hpxml_defaults.rb</filename>
<filename>airflow.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>16DE62B1</checksum>
<checksum>5B40593B</checksum>
</file>
<file>
<filename>test_water_heater.rb</filename>
<filename>test_enclosure.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>E26F31D2</checksum>
<checksum>28C93337</checksum>
</file>
<file>
<filename>constructions.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>3BD28894</checksum>
</file>
<file>
<version>
Expand All @@ -550,32 +556,20 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>91DCE8AA</checksum>
<checksum>6DE985B6</checksum>
</file>
<file>
<filename>constructions.rb</filename>
<filetype>rb</filetype>
<filename>hpxml_schema/HPXMLDataTypes.xsd</filename>
<filetype>xsd</filetype>
<usage_type>resource</usage_type>
<checksum>3BD28894</checksum>
</file>
<file>
<filename>test_enclosure.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>28C93337</checksum>
<checksum>5ED1C14F</checksum>
</file>
<file>
<filename>hpxml_schema/HPXMLBaseElements.xsd</filename>
<filetype>xsd</filetype>
<usage_type>resource</usage_type>
<checksum>AA9487CE</checksum>
</file>
<file>
<filename>hpxml_schema/HPXMLDataTypes.xsd</filename>
<filetype>xsd</filetype>
<usage_type>resource</usage_type>
<checksum>5ED1C14F</checksum>
</file>
<file>
<filename>hpxml_schematron/HPXMLvalidator.xml</filename>
<filetype>xml</filetype>
Expand All @@ -586,13 +580,19 @@
<filename>hpxml_schematron/EPvalidator.xml</filename>
<filetype>xml</filetype>
<usage_type>resource</usage_type>
<checksum>01E48A1C</checksum>
<checksum>547D4876</checksum>
</file>
<file>
<filename>test_validation.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>A673B23D</checksum>
</file>
<file>
<filename>hpxml.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>80E63F64</checksum>
<checksum>AD09E7FF</checksum>
</file>
</files>
</measure>
Loading

0 comments on commit 253c6b2

Please sign in to comment.