Skip to content

Commit

Permalink
Squashed 'resources/hpxml-measures/' changes from 5f73cd14b1e..ed5b6f…
Browse files Browse the repository at this point in the history
…0395e

ed5b6f0395e Latest results.
89a7d03b2ae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
0c0cac417f8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
c65b59f5bdc Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
bf9f8fa1fde Get rid of additional_properties.num_speeds and other cleanup. No diffs expected.
ba2c6a687df Latest results.
40b5b96c12d Bugfix.
05fca76f0bd Fix fan ratio calculation.
d92e6d0a816 Update unit tests to handle new sample files.
447b7e3bde2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
247650e36df Fix rated fan power in net-to-gross calculation for cases not using detailed performance data. Create method for calculating fan power using fan power curve.
09c86473c8c Update unit test expected values.
5e2d4408449 Latest results.
1e88e8a1e5e Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
4c2df0d69e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
c3988289cd5 Fix rated fan power in net-to-gross calculation.
dbdebba3e9b Latest results.
18b2784d941 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
2f611121189 Latest results.
a544b0fdef6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
1bd8bb72a7b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
22871b732d2 Set fixed rated W/cfm for ductless systems.
e4a81204857 Revert use of Table:Lookup for constant values. No diffs expected.
5809cacffe7 Latest results.
fa21b59b1bf Use adaptive step size tol of 0.1; gives results very close to using 0.01 and had no discernible effect on runtime speed.
6ab4baa383d Latest results.
3bcc25dadf1 Latest results.
b2b89b8f2ab Simplify HVACSizing.apply_hvac_fixed_capacities method and minor code cleanup. Diffs only expected for files with detailed performance data.
0eea8a06e1a Simplify/merge code related to capacity ratios; no diffs expected.
f89ba7f01ea Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
ab9f6ff2ee8 Expand sizing tests, and a little cleanup.
7b6da1096ed Latest results.
7e98f954063 Update ductless max_cop_95 coefficients
6df3dea8b4b Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
b506ceb8465 Need to protect from negative lookup table values on the other end of the ODB range as well; found while modeling a NEEP product. No diffs expected.
30279ccd2df Latest results.
7d910615823 Use constant extrapolation
18a0ddc577f Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
4c029939f00 cleanup for heating
48b9ae5a009 cleanups on hvac sizing
60c78768173 Latest results.
0f2c7adb0db bugfix
71f2b28a358 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
2e03763de35 allow increase capacity for detailed performance data inputs
db4a5972aa4 Latest results.
ba031a0c1d9 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
4f5a98a82d9 Create range bounds for independent variables that prevent negative Table:Lookup values and add some error-checking to ensure we aren't creating Table:Lookup objects with negative values. Revert from Table:Lookup to curve objects for HVAC system types other than those using detailed performance data, given there are complexities/risks/performance considerations to using them.
64a4c9bd51b hvac sizing improvement for detailed performance data, some cleanups
227dfb3b37b Refactor similar code into a single interpolate_to_odb_table_point() method. No diffs expected.
3feb77d145d Latest results.
597060828be Always calculate capacity retention factor at 5F when detailed performance data provided.
acd24699a07 fix retention ci error
aa9efdd2c5c adaptive step size first cut
2b552f6f182 oops, forgot to delete dead codes
3b2300d013b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
e21d6f201b8 hvac sizing heating retention adjustment and cleanup
88c7cf06c02 Oops.
152602f54cf A little more cleanup.
1609f0a2f69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
7e65a8751c0 Misc code cleanup; no diffs expected.
3bd9239a3dd Latest results.
122b55a7e40 Add dataSource="software" to defaulted performance data. Remove default heating 17F datapoints, not necessary.
a07ab12f8f9 Cleanup sample files; only need CompressorType="variable speed" for files with detailed performance data.
ca8f765c000 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
d914a9a03d3 Latest results.
87a401538d9 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
65f642ddce7 fix test for new default too
f9eba735499 update the cop vs hspf coefficients
8bde279f32f Latest results.
2e72647ceec Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
7a21680ce01 use compressor lockout temperature in table lookup
8274e22e740 Latest results.
09cb506a0bf Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
4af6da1f2b2 change the heating rated condition
6051e80075e Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
98ef4d3127a Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
f6803ad2437 Fix object names [ci skip]
dcc3f59c6f1 one bugfix for interpolating
f18a78d9c3b Latest results.
35d4abfb057 Latest results.
4355a1b08cc Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
1e1a68ea129 add iq+detailed performance data test file
e0c35ecfa18 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
2323edb5a60 Fix CI failure
d8201192c27 alternative fix for iq
18029c34677 Latest results.
7b4bfc7d138 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
c47592293f1 Show heating capacity retention fraction in in.xml for variable-speed HPs w/o detailed performance data. Document new default for variable-speed HPs. Round capacities/COPs when defaulted in in.xml.
2aab954fbe0 add cooling capacity ratio from max to rated
9bc83c0a7f7 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
ce4c29c3479 fix iq issue
5ab446dc0cc Require CompressorType="variable speed" when providing detailed performance data (for now, at least).
2ebf00caa0d Latest results.
180bf1568d5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
e5a60524d6d Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
bdb6d8f9e81 update wall placement cop correlation
f346a3adcc1 Latest results.
6aa21d1f39e ignore shr warning for now, adjustment is small
4a7ebc84b5d Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
4541de0a944 Fix one CI failure
f50e6f92e14 fix unit tests for cfm/ton
5641df67bad This shouldn't be needed.
522140481aa Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
09b8bceedf3 change cfm/ton to be 400
4d11f610f94 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
5d5f7ce1d1f Allow CompressorType input for MSHPs/MSACs (though it has to be variable speed). Previously we just ignored the input, but now we will throw an error if a user tries to model a single/two stage mini-split.
f0683ee953f Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
dd3f3df38dc simplify constant table lookups
d0f20ae6de6 Removes HeatingCapacityRetention from HP sample files, since it is ignored. Also moves some sample files properties from tasks.rb to hpxml_inputs.json, so they go through the BuildResHPXML measure.
649eb8bed79 First pass on docs. Minor hvac.rb and EPvalidator.xml cleanup.
350cafabc80 Fix order of elements in docs.
e787345881e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
d1f197b4956 Latest results.
28bb9d36bf5 method name issue
48a9031f2c3 remove one comment
a2b189eabf0 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
12135044d57 modify hvac sizing adjustment based on new approach, remove var speed system ft curves
63fdc9a63d1 Latest results.
c36a208e2fb deprecate hspf and seer calculation methods for mshp
393752c864e Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
d04cfa248d9 fix unit test, add performance data unit test
e6528312436 Latest results.
db9c77907f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
35a61e18a99 report user-entered rated capacity instead of maximum
7c88b12b0f3 fix air flow using rated capacity. Add rated capacity as required input for reporting
e65789c1b69 revert cfm/ton
74c4288ebfd Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
c443d6d82b8 fix the order issue, deprecate one more method, add some comments
be86579754f Add error-checking and tests for incomplete datapoint pairs.
46fff775115 more flexibility for detailed performance data specifications
5a38d9090e1 add cop from seer for centrally ducted system
663bfde977c change the method to ensure nonzero capacity for detailed performance data
8c6174957f6 enforce heat pump cooling and heating detailed performance data to be provided together, allow ac detailed performance data inputs
882ae0002aa Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
05238285e90 progress on cooling defaulting implementations
88e752cb782 Latest results.
981161065f7 add ac test files
bcbf0f02f42 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
06280319d45 use HPXML constant instead of hardcoded string
955826cbf7d change tests too
7c20721c7b9 address comments
09eb9a539e2 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
e0312e7e017 fix test default for new defaulted capacity retention of var speed systems
36d044a1758 Latest results.
c953e2cea4d Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
82e48e955fb fix unit test, handle capacity retention inputs for 1/2 speed systems, handle capacity net to gross conversion for all dx systems
b3286c41139 Latest results.
cd44b313e7f fix cooling only case
e9493c71244 fixed a few bugs related to 17F capacity and capacity retentions, added unit test for overriding these two inputs when user provides detailed performance data
c40dd0a0a0c remove top level capacities for detailed performance data test files
8a1034df4f3 moved the default neep data method call to be after hvac sizing call
05b2bd723b1 change user input capacity to be rated instead of maximum
f1eef4900b4 fix autosize error
59194248578 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
ae085206632 small fix
011233a924f heating default methods added
2f01ebcfb0a remove unnecessary data structure
c0e0d8a8532 put two fixme comments for hvac sizing
c6faa2dddd7 connect performance table for heating
98e5764b1f9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
6239d9ee1c8 bugfixes
fad91b6d3d3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
63b01994a19 connect to table lookup
3e6ae519a96 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
ef1015600b7 progress
6b8be82e15d Latest results.
ed102a8ef53 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
8f116be452d A few refactors, add interpolation, add correction for indoor conditions
a65da737308 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
5ec0d4ef568 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
173c3e04a6a added convert_net_to_gross method
2f3aad7f618 Latest results.
e0114e99d1e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
9286bfcfd2f Latest results.
02ef16859ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
8e4d8f883a7 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
752cb34df09 save progress: added clg/htg ap data structure to store neep inputs, added placeholder for methods
13cace3efee Latest results.
45d917f3058 fix bicubic calculation coefficient order to be the same as E+ coefficient order
a273166c603 change variable range for boiler
79a4a8899df Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
7f1e6dc36d9 fix installation quality program and remove calc curve methods
fca5410f6b8 update hpxmls
06e249f812a optional parameter
55230694f3f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
a6ea560387e cleanup and more curve replacement
e4f24eace58 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
280ed3689dd Latest results.
d93d8b929cb Drop support for CapacityFractionOfNominal elements; lets keep things simple for the initial implementation.
ebe25380da3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
29d3ecaaa48 first cut for table lookup, not completed
88f279dc394 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
fdd18943a1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
d93bc6ecf49 Latest results.
e66bd05b544 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
f8d72f4e58d Latest results.
01edbccc4b0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
63f1cf7f750 Latest results.
d69dd9b41d1 update_measures
515b64deb3e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
c721e70c73f Comment [ci skip]
0f45b677a3c Latest results.
b4bf80cf6ec Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance
44ed0dbc394 Bugfix.
41efcfd543c Bugfix.
9bf1fd05852 Add inputs to HPXML class and Schematron. Create sample files.
REVERT: 5f73cd14b1e Merge pull request #1519 from NREL/measure_readmes
REVERT: 24e144863dc Clarify measure outputs.
REVERT: 377e7dda433 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into measure_readmes
REVERT: e55d56f258e Update Changelog.md [ci skip]
REVERT: e9bcb8f210d Add measure README.mds. Automatically generated from README.md.erb templates when running openstudio tasks.rb update_measures.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: ed5b6f0395eb42817b0969429ad270a147e8e8cd
  • Loading branch information
joseph-robertson committed Oct 23, 2023
1 parent 124ba5a commit 3c53afc
Show file tree
Hide file tree
Showing 43 changed files with 7,068 additions and 9,085 deletions.
5,574 changes: 0 additions & 5,574 deletions BuildResidentialHPXML/README.md

This file was deleted.

41 changes: 0 additions & 41 deletions BuildResidentialHPXML/README.md.erb

This file was deleted.

8 changes: 4 additions & 4 deletions BuildResidentialHPXML/measure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument

arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('cooling_system_cooling_compressor_type', compressor_type_choices, false)
arg.setDisplayName('Cooling System: Cooling Compressor Type')
arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner}. If not provided, the OS-HPXML default is used.")
arg.setDescription("The compressor type of the cooling system. Only applies to #{HPXML::HVACTypeCentralAirConditioner} and #{HPXML::HVACTypeMiniSplitAirConditioner}. If not provided, the OS-HPXML default is used.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -1236,7 +1236,7 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument

arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('heat_pump_cooling_compressor_type', compressor_type_choices, false)
arg.setDisplayName('Heat Pump: Cooling Compressor Type')
arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir}. If not provided, the OS-HPXML default is used.")
arg.setDescription("The compressor type of the heat pump. Only applies to #{HPXML::HVACTypeHeatPumpAirToAir} and #{HPXML::HVACTypeHeatPumpMiniSplit}. If not provided, the OS-HPXML default is used.")
args << arg

arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_sensible_heat_fraction', false)
Expand Down Expand Up @@ -4717,7 +4717,7 @@ def self.set_cooling_systems(hpxml, args)
end

if args[:cooling_system_cooling_compressor_type].is_initialized
if cooling_system_type == HPXML::HVACTypeCentralAirConditioner
if [HPXML::HVACTypeCentralAirConditioner, HPXML::HVACTypeMiniSplitAirConditioner].include? cooling_system_type
compressor_type = args[:cooling_system_cooling_compressor_type].get
end
end
Expand Down Expand Up @@ -4856,7 +4856,7 @@ def self.set_heat_pumps(hpxml, args)
end

if args[:heat_pump_cooling_compressor_type].is_initialized
if [HPXML::HVACTypeHeatPumpAirToAir].include? heat_pump_type
if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit].include? heat_pump_type
compressor_type = args[:heat_pump_cooling_compressor_type].get
end
end
Expand Down
24 changes: 6 additions & 18 deletions BuildResidentialHPXML/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>build_residential_hpxml</name>
<uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
<version_id>93c1361d-ce33-4609-ba76-21245e0ee0d7</version_id>
<version_modified>2023-10-23T16:23:38Z</version_modified>
<version_id>f01aed40-4afe-444f-aedb-ff18ba423b46</version_id>
<version_modified>2023-09-28T22:11:32Z</version_modified>
<xml_checksum>2C38F48B</xml_checksum>
<class_name>BuildResidentialHPXML</class_name>
<display_name>HPXML Builder</display_name>
Expand Down Expand Up @@ -2270,7 +2270,7 @@
<argument>
<name>cooling_system_cooling_compressor_type</name>
<display_name>Cooling System: Cooling Compressor Type</display_name>
<description>The compressor type of the cooling system. Only applies to central air conditioner. If not provided, the OS-HPXML default is used.</description>
<description>The compressor type of the cooling system. Only applies to central air conditioner and mini-split. If not provided, the OS-HPXML default is used.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -2534,7 +2534,7 @@
<argument>
<name>heat_pump_cooling_compressor_type</name>
<display_name>Heat Pump: Cooling Compressor Type</display_name>
<description>The compressor type of the heat pump. Only applies to air-to-air. If not provided, the OS-HPXML default is used.</description>
<description>The compressor type of the heat pump. Only applies to air-to-air and mini-split. If not provided, the OS-HPXML default is used.</description>
<type>Choice</type>
<required>false</required>
<model_dependent>false</model_dependent>
Expand Down Expand Up @@ -6731,18 +6731,6 @@
</attribute>
</attributes>
<files>
<file>
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>02398DA0</checksum>
</file>
<file>
<filename>README.md.erb</filename>
<filetype>erb</filetype>
<usage_type>readmeerb</usage_type>
<checksum>513F28E9</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand All @@ -6752,7 +6740,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>D0F900F0</checksum>
<checksum>343A0E56</checksum>
</file>
<file>
<filename>geometry.rb</filename>
Expand All @@ -6764,7 +6752,7 @@
<filename>build_residential_hpxml_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>09CBC38A</checksum>
<checksum>595D0CA1</checksum>
</file>
</files>
</measure>
2 changes: 2 additions & 0 deletions BuildResidentialHPXML/tests/build_residential_hpxml_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,7 @@ def _set_measure_argument_values(hpxml_file, args)
args['heating_system_type'] = 'none'
args['cooling_system_type'] = 'none'
args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
args.delete('heat_pump_cooling_compressor_type')
args['heat_pump_heating_efficiency'] = 10.0
args['heat_pump_cooling_efficiency'] = 19.0
args['heat_pump_heating_capacity'] = 48000.0
Expand Down Expand Up @@ -1048,6 +1049,7 @@ def _set_measure_argument_values(hpxml_file, args)
args['heating_system_type'] = 'none'
args['cooling_system_type'] = 'none'
args['heat_pump_type'] = HPXML::HVACTypeHeatPumpMiniSplit
args.delete('heat_pump_cooling_compressor_type')
args['heat_pump_is_ducted'] = true
args['heat_pump_backup_type'] = HPXML::HeatPumpBackupTypeSeparate
args['heating_system_2_type'] = HPXML::HVACTypeFurnace
Expand Down
85 changes: 0 additions & 85 deletions BuildResidentialScheduleFile/README.md

This file was deleted.

41 changes: 0 additions & 41 deletions BuildResidentialScheduleFile/README.md.erb

This file was deleted.

16 changes: 2 additions & 14 deletions BuildResidentialScheduleFile/measure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>build_residential_schedule_file</name>
<uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
<version_id>6ffac26f-845e-43f7-be19-85319df0ee76</version_id>
<version_modified>2023-10-23T16:23:40Z</version_modified>
<version_id>d6668365-a78e-4e88-afa1-514e180dc8e2</version_id>
<version_modified>2023-09-19T22:23:01Z</version_modified>
<xml_checksum>03F02484</xml_checksum>
<class_name>BuildResidentialScheduleFile</class_name>
<display_name>Schedule File Builder</display_name>
Expand Down Expand Up @@ -85,18 +85,6 @@
</attribute>
</attributes>
<files>
<file>
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>D4DEE065</checksum>
</file>
<file>
<filename>README.md.erb</filename>
<filetype>erb</filetype>
<usage_type>readmeerb</usage_type>
<checksum>513F28E9</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand Down
1 change: 0 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ __New Features__
- Battery losses now split between charging and discharging.
- Interior/exterior window shading multipliers are now modeled using the EnergyPlus incident solar multiplier.
- Improvements to HERS & MaxLoad heat pump sizing methodologies.
- Added README.md documentation for all OpenStudio measures.

__Bugfixes__
- Fixes battery resilience output to properly incorporate battery losses.
Expand Down
Loading

0 comments on commit 3c53afc

Please sign in to comment.