Skip to content

Commit 8d142bf

Browse files
joseph-robertsonjoseph-robertson
committed
Squashed 'resources/hpxml-measures/' changes from 97db672b423..cd54d03eff4
cd54d03eff4 Adjustments to test osws and mech vent args. 3e3ee5719cc Merge branch 'master' into build-res-hpxml-v3 fc08a1433f8 Merge pull request #765 from NREL/default_vent_fan_power c0b0d06a486 Latest results. 8e56249cd3f Allows defaulting of mechanical ventilation fan power (by type). e6e5c15e288 Merge pull request #674 from NREL/hvac_dhw_default_efficiencies 08db7a78c6c Update Changelog.md 47c8de4a6e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 7befb82d26c Update projects 3df7ce7b064 Latest results. c4228096c63 update the default efficiency of the electric type heating systems 17f6ebc6982 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies f53765eff2b Merge pull request #763 from NREL/mech_vent_precond_energy_only 3ce2810d6ac Latest results. a2c4fb5ddbd Code changes from NatLabRockies/OpenStudio-HPXML#753, energy impact only. de6fe7c07e9 Merge branch 'master' into build-res-hpxml-v3 c8872d6cb76 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 95409f512f6 address comments f6f88ca30cf Merge pull request #761 from NREL/seasons_followup 045d8b4f6f4 Merge branch 'master' into build-res-hpxml-v3 4e35921a14d Fix base-multiple-buildings.xml to be valid. 896a53ea590 Fix order of HPXML elements. Add nokogiri schema validation to CI tests. 1a601c92fc0 Delete file. 355a40ae7f5 update xml f4b5d2aad20 Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance. 4c8870a3ca1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 3cdc84532b3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 6e5f10028ed fix test_fireplaces 183acefa2d2 update test_defaults fe1e69a8b03 Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies ecae4c26e45 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies dd56e58a76e update fireplace/stove efficiency defaulting 276f9403e86 Latest results. 8601281b4e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 39110093225 Latest results. 6d0c3755a0e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 544a15ad355 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies beefde88b69 update documentation 4948ed5edcd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies fc1faeb7f0d coarse efficiency defaulting for fireplace/stove Use energyplus.rb for fuel type mapping 48da5c83142 Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies b9d4fd4e214 code cleanup and add more tests 4ca0de47899 Latest results. bb4e923461a fix test_furnaces 4e2f3ab4c3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies ee5afad48a3 fix base-misc-defaults.xml 631235b169c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 4bdbd77d33e pick up the rest of the initial comments 2255a1a293c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 3ad035b7e8a pick up some of the initial comments 21d7ecb8e98 another documentation update f6c4f7c3dd0 update documentation f0e0c56b5ed revert assertions for tankless and heatpump water heaters 8a0d1acd330 remove Fixmes 072c0f2ea48 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 5955f3ea884 update hpxml for water heaters and change the assertions for water heater efficiencies 0728f7a1f97 update EPvalidator for water heating systems 861ef8a7b52 Bugfix and update EPvalidator.xml and hpxml.rb 8bf095e758d update test_defaults 2b0fe12a1e0 run tasks.rb fdc7aadff69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 6a477f99a83 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 2e50326547a first pass git-subtree-dir: resources/hpxml-measures git-subtree-split: cd54d03eff41c456b4c5575164d59e673a4ccec2
1 parent 0efb4fe commit 8d142bf

372 files changed

Lines changed: 3611 additions & 2960 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BuildResidentialHPXML/measure.rb‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,11 +1459,11 @@ def arguments(model)
14591459
arg.setDefaultValue(110)
14601460
args << arg
14611461

1462-
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_hours_in_operation', true)
1462+
arg = OpenStudio::Measure::OSArgument::makeStringArgument('mech_vent_hours_in_operation', true)
14631463
arg.setDisplayName('Mechanical Ventilation: Hours In Operation')
14641464
arg.setDescription('The hours in operation of the mechanical ventilation.')
14651465
arg.setUnits('hrs/day')
1466-
arg.setDefaultValue(24)
1466+
arg.setDefaultValue(Constants.Auto)
14671467
args << arg
14681468

14691469
arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('mech_vent_recovery_efficiency_type', mech_vent_recovery_efficiency_type_choices, true)
@@ -1486,11 +1486,11 @@ def arguments(model)
14861486
arg.setDefaultValue(0.72)
14871487
args << arg
14881488

1489-
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('mech_vent_fan_power', true)
1489+
arg = OpenStudio::Measure::OSArgument::makeStringArgument('mech_vent_fan_power', true)
14901490
arg.setDisplayName('Mechanical Ventilation: Fan Power')
14911491
arg.setDescription('The fan power of the mechanical ventilation.')
14921492
arg.setUnits('W')
1493-
arg.setDefaultValue(30)
1493+
arg.setDefaultValue(Constants.Auto)
14941494
args << arg
14951495

14961496
arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('mech_vent_num_units_served', true)
@@ -4446,16 +4446,24 @@ def self.set_ventilation_fans(hpxml, runner, args)
44464446
end
44474447
end
44484448

4449+
if args[:mech_vent_hours_in_operation] != Constants.Auto
4450+
hours_in_operation = args[:mech_vent_hours_in_operation]
4451+
end
4452+
4453+
if args[:mech_vent_fan_power] != Constants.Auto
4454+
fan_power = args[:mech_vent_fan_power]
4455+
end
4456+
44494457
hpxml.ventilation_fans.add(id: 'MechanicalVentilation',
44504458
fan_type: args[:mech_vent_fan_type],
44514459
rated_flow_rate: args[:mech_vent_flow_rate],
4452-
hours_in_operation: args[:mech_vent_hours_in_operation],
4460+
hours_in_operation: hours_in_operation,
44534461
used_for_whole_building_ventilation: true,
44544462
total_recovery_efficiency: total_recovery_efficiency,
44554463
total_recovery_efficiency_adjusted: total_recovery_efficiency_adjusted,
44564464
sensible_recovery_efficiency: sensible_recovery_efficiency,
44574465
sensible_recovery_efficiency_adjusted: sensible_recovery_efficiency_adjusted,
4458-
fan_power: args[:mech_vent_fan_power],
4466+
fan_power: fan_power,
44594467
distribution_system_idref: distribution_system_idref,
44604468
is_shared_system: is_shared_system,
44614469
in_unit_flow_rate: in_unit_flow_rate,
@@ -4487,16 +4495,24 @@ def self.set_ventilation_fans(hpxml, runner, args)
44874495
end
44884496
end
44894497

4498+
if args[:mech_vent_hours_in_operation_2] != Constants.Auto
4499+
hours_in_operation = args[:mech_vent_hours_in_operation_2]
4500+
end
4501+
4502+
if args[:mech_vent_fan_power_2] != Constants.Auto
4503+
fan_power = args[:mech_vent_fan_power_2]
4504+
end
4505+
44904506
hpxml.ventilation_fans.add(id: 'SecondMechanicalVentilation',
44914507
fan_type: args[:mech_vent_fan_type_2],
44924508
rated_flow_rate: args[:mech_vent_flow_rate_2],
4493-
hours_in_operation: args[:mech_vent_hours_in_operation_2],
4509+
hours_in_operation: hours_in_operation,
44944510
used_for_whole_building_ventilation: true,
44954511
total_recovery_efficiency: total_recovery_efficiency,
44964512
total_recovery_efficiency_adjusted: total_recovery_efficiency_adjusted,
44974513
sensible_recovery_efficiency: sensible_recovery_efficiency,
44984514
sensible_recovery_efficiency_adjusted: sensible_recovery_efficiency_adjusted,
4499-
fan_power: args[:mech_vent_fan_power_2])
4515+
fan_power: fan_power)
45004516
end
45014517

45024518
if (args[:kitchen_fans_quantity] == Constants.Auto) || (args[:kitchen_fans_quantity].to_i > 0)

0 commit comments

Comments
 (0)