Skip to content

Commit 9943852

Browse files
shorowitshorowit
committed
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into max_power_ratio_with_unit_multipliers
# Conflicts: # HPXMLtoOpenStudio/measure.xml
2 parents fc2cae2 + f61bbc7 commit 9943852

File tree

8 files changed

+52
-38
lines changed

8 files changed

+52
-38
lines changed

‎HPXMLtoOpenStudio/measure.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.1</schema_version>
44
<name>hpxm_lto_openstudio</name>
55
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
6-
<version_id>1cc8a3f1-6f7e-44fe-be75-4ec42d1ff7c4</version_id>
7-
<version_modified>2024-06-14T16:11:49Z</version_modified>
6+
<version_id>381502ab-7765-4f0b-a10b-78f2efc7bfd3</version_id>
7+
<version_modified>2024-06-17T18:00:58Z</version_modified>
88
<xml_checksum>D8922A73</xml_checksum>
99
<class_name>HPXMLtoOpenStudio</class_name>
1010
<display_name>HPXML to OpenStudio Translator</display_name>
@@ -669,7 +669,7 @@
669669
<filename>test_hvac_sizing.rb</filename>
670670
<filetype>rb</filetype>
671671
<usage_type>test</usage_type>
672-
<checksum>9E608361</checksum>
672+
<checksum>4DA78186</checksum>
673673
</file>
674674
<file>
675675
<filename>test_lighting.rb</filename>

‎HPXMLtoOpenStudio/tests/test_hvac_sizing.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def test_manual_j_residences
211211
args_hash = {}
212212
args_hash['hpxml_path'] = File.absolute_path(File.join(@test_files_path, 'ACCA_Examples', 'Vatilo_Residence.xml'))
213213
_model, _hpxml, hpxml_bldg = _test_measure(args_hash)
214-
assert_in_delta(9147, hpxml_bldg.hvac_plant.hdl_ducts, 1500)
214+
assert_in_delta(9147, hpxml_bldg.hvac_plant.hdl_ducts, 2000)
215215
assert_in_delta(4234, hpxml_bldg.hvac_plant.hdl_windows, block_tol_btuh)
216216
assert_in_delta(0, hpxml_bldg.hvac_plant.hdl_skylights, block_tol_btuh)
217217
assert_in_delta(574, hpxml_bldg.hvac_plant.hdl_doors, block_tol_btuh)
@@ -222,7 +222,7 @@ def test_manual_j_residences
222222
assert_in_delta(1498, hpxml_bldg.hvac_plant.hdl_ceilings, block_tol_btuh)
223223
assert_in_delta(3089, hpxml_bldg.hvac_plant.hdl_infil, block_tol_btuh)
224224
assert_in_delta(0, hpxml_bldg.hvac_plant.hdl_vent, block_tol_btuh)
225-
assert_in_delta(9973, hpxml_bldg.hvac_plant.cdl_sens_ducts, 2000)
225+
assert_in_delta(9973, hpxml_bldg.hvac_plant.cdl_sens_ducts, 1500)
226226
assert_in_delta(5295, hpxml_bldg.hvac_plant.cdl_sens_windows, block_tol_btuh)
227227
assert_in_delta(0, hpxml_bldg.hvac_plant.cdl_sens_skylights, block_tol_btuh)
228228
assert_in_delta(456, hpxml_bldg.hvac_plant.cdl_sens_doors, block_tol_btuh)
@@ -234,7 +234,7 @@ def test_manual_j_residences
234234
assert_in_delta(769, hpxml_bldg.hvac_plant.cdl_sens_infil, block_tol_btuh)
235235
assert_in_delta(0, hpxml_bldg.hvac_plant.cdl_sens_vent, block_tol_btuh)
236236
assert_in_delta(1890, hpxml_bldg.hvac_plant.cdl_sens_intgains, block_tol_btuh)
237-
assert_in_delta(2488, hpxml_bldg.hvac_plant.cdl_lat_ducts, 1500)
237+
assert_in_delta(2488, hpxml_bldg.hvac_plant.cdl_lat_ducts, 1000)
238238
assert_in_delta(1276, hpxml_bldg.hvac_plant.cdl_lat_infil, block_tol_btuh)
239239
assert_in_delta(0, hpxml_bldg.hvac_plant.cdl_lat_vent, block_tol_btuh)
240240
assert_in_delta(600, hpxml_bldg.hvac_plant.cdl_lat_intgains, block_tol_btuh)
@@ -261,7 +261,7 @@ def test_manual_j_residences
261261
args_hash = {}
262262
args_hash['hpxml_path'] = File.absolute_path(File.join(@test_files_path, 'ACCA_Examples', 'Victor_Residence.xml'))
263263
_model, _hpxml, hpxml_bldg = _test_measure(args_hash)
264-
assert_in_delta(29137, hpxml_bldg.hvac_plant.hdl_ducts, 3000)
264+
assert_in_delta(29137, hpxml_bldg.hvac_plant.hdl_ducts, 2500)
265265
assert_in_delta(9978, hpxml_bldg.hvac_plant.hdl_windows, block_tol_btuh)
266266
assert_in_delta(471, hpxml_bldg.hvac_plant.hdl_skylights, block_tol_btuh)
267267
assert_in_delta(984, hpxml_bldg.hvac_plant.hdl_doors, block_tol_btuh)
@@ -284,7 +284,7 @@ def test_manual_j_residences
284284
assert_in_delta(2181, hpxml_bldg.hvac_plant.cdl_sens_infil, block_tol_btuh)
285285
assert_in_delta(323, hpxml_bldg.hvac_plant.cdl_sens_vent, block_tol_btuh)
286286
assert_in_delta(3320, hpxml_bldg.hvac_plant.cdl_sens_intgains, block_tol_btuh)
287-
assert_in_delta(6282, hpxml_bldg.hvac_plant.cdl_lat_ducts, 4500)
287+
assert_in_delta(6282, hpxml_bldg.hvac_plant.cdl_lat_ducts, 4000)
288288
assert_in_delta(4044, hpxml_bldg.hvac_plant.cdl_lat_infil, block_tol_btuh)
289289
assert_in_delta(600, hpxml_bldg.hvac_plant.cdl_lat_vent, block_tol_btuh)
290290
assert_in_delta(800, hpxml_bldg.hvac_plant.cdl_lat_intgains, block_tol_btuh)
@@ -394,7 +394,7 @@ def test_manual_j_residences
394394
assert_in_delta(459, hpxml_bldg.hvac_plant.cdl_sens_vent, block_tol_btuh)
395395
assert_in_delta(3320, hpxml_bldg.hvac_plant.cdl_sens_intgains, block_tol_btuh)
396396
assert_in_delta(563, hpxml_bldg.hvac_plant.cdl_sens_aedexcursion, block_tol_btuh)
397-
assert_in_delta(565, hpxml_bldg.hvac_plant.cdl_lat_ducts, 1500)
397+
assert_in_delta(565, hpxml_bldg.hvac_plant.cdl_lat_ducts, block_tol_btuh)
398398
assert_in_delta(1651, hpxml_bldg.hvac_plant.cdl_lat_infil, block_tol_btuh)
399399
assert_in_delta(1755, hpxml_bldg.hvac_plant.cdl_lat_vent, block_tol_btuh)
400400
assert_in_delta(800, hpxml_bldg.hvac_plant.cdl_lat_intgains, block_tol_btuh)
@@ -452,7 +452,7 @@ def test_manual_j_residences
452452
assert_in_delta(820, hpxml_bldg.hvac_plant.hdl_ceilings, block_tol_btuh)
453453
assert_in_delta(456, hpxml_bldg.hvac_plant.hdl_infil, block_tol_btuh)
454454
assert_in_delta(990, hpxml_bldg.hvac_plant.hdl_vent, block_tol_btuh)
455-
assert_in_delta(851, hpxml_bldg.hvac_plant.cdl_sens_ducts, 2500)
455+
assert_in_delta(851, hpxml_bldg.hvac_plant.cdl_sens_ducts, 2000)
456456
assert_in_delta(1776, hpxml_bldg.hvac_plant.cdl_sens_windows, block_tol_btuh)
457457
assert_in_delta(3182, hpxml_bldg.hvac_plant.cdl_sens_skylights, block_tol_btuh)
458458
assert_in_delta(442, hpxml_bldg.hvac_plant.cdl_sens_doors, block_tol_btuh)

‎workflow/tests/ACCA_Examples/Bell_Residence.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,31 +1124,31 @@
11241124
<DuctType>supply</DuctType>
11251125
<DuctLeakage>
11261126
<Units>CFM25</Units>
1127-
<Value>23.64</Value>
1127+
<Value>0.0</Value>
11281128
<TotalOrToOutside>to outside</TotalOrToOutside>
11291129
</DuctLeakage>
11301130
</DuctLeakageMeasurement>
11311131
<DuctLeakageMeasurement>
11321132
<DuctType>return</DuctType>
11331133
<DuctLeakage>
11341134
<Units>CFM25</Units>
1135-
<Value>15.36</Value>
1135+
<Value>12.5</Value>
11361136
<TotalOrToOutside>to outside</TotalOrToOutside>
11371137
</DuctLeakage>
11381138
</DuctLeakageMeasurement>
11391139
<Ducts>
11401140
<SystemIdentifier id='Ducts1'/>
11411141
<DuctType>supply</DuctType>
1142-
<DuctEffectiveRValue>1.5</DuctEffectiveRValue>
1142+
<DuctInsulationRValue>0.0</DuctInsulationRValue>
11431143
<DuctLocation>under slab</DuctLocation>
1144-
<DuctSurfaceArea>197.0</DuctSurfaceArea>
1144+
<DuctSurfaceArea>306.0</DuctSurfaceArea>
11451145
</Ducts>
11461146
<Ducts>
11471147
<SystemIdentifier id='Ducts2'/>
11481148
<DuctType>return</DuctType>
1149-
<DuctEffectiveRValue>9.0</DuctEffectiveRValue>
1149+
<DuctInsulationRValue>8.0</DuctInsulationRValue>
11501150
<DuctLocation>attic - vented</DuctLocation>
1151-
<DuctSurfaceArea>64.0</DuctSurfaceArea>
1151+
<DuctSurfaceArea>52.0</DuctSurfaceArea>
11521152
</Ducts>
11531153
<NumberofReturnRegisters>1</NumberofReturnRegisters>
11541154
</AirDistribution>

‎workflow/tests/ACCA_Examples/Cobb_Residence.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,31 +446,31 @@
446446
<DuctType>supply</DuctType>
447447
<DuctLeakage>
448448
<Units>CFM25</Units>
449-
<Value>32.64</Value>
449+
<Value>58.3</Value>
450450
<TotalOrToOutside>to outside</TotalOrToOutside>
451451
</DuctLeakage>
452452
</DuctLeakageMeasurement>
453453
<DuctLeakageMeasurement>
454454
<DuctType>return</DuctType>
455455
<DuctLeakage>
456456
<Units>CFM25</Units>
457-
<Value>20.64</Value>
457+
<Value>34.3</Value>
458458
<TotalOrToOutside>to outside</TotalOrToOutside>
459459
</DuctLeakage>
460460
</DuctLeakageMeasurement>
461461
<Ducts>
462462
<SystemIdentifier id='Ducts1'/>
463463
<DuctType>supply</DuctType>
464-
<DuctEffectiveRValue>5.0</DuctEffectiveRValue>
464+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
465465
<DuctLocation>exterior wall</DuctLocation>
466-
<DuctSurfaceArea>272.0</DuctSurfaceArea>
466+
<DuctSurfaceArea>486.0</DuctSurfaceArea>
467467
</Ducts>
468468
<Ducts>
469469
<SystemIdentifier id='Ducts2'/>
470470
<DuctType>return</DuctType>
471-
<DuctEffectiveRValue>5.0</DuctEffectiveRValue>
471+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
472472
<DuctLocation>exterior wall</DuctLocation>
473-
<DuctSurfaceArea>86.0</DuctSurfaceArea>
473+
<DuctSurfaceArea>143.0</DuctSurfaceArea>
474474
</Ducts>
475475
<NumberofReturnRegisters>1</NumberofReturnRegisters>
476476
</AirDistribution>

‎workflow/tests/ACCA_Examples/Smith_Residence.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,31 +1313,45 @@
13131313
<DuctType>supply</DuctType>
13141314
<DuctLeakage>
13151315
<Units>CFM25</Units>
1316-
<Value>95.2</Value>
1316+
<Value>25.5</Value>
13171317
<TotalOrToOutside>to outside</TotalOrToOutside>
13181318
</DuctLeakage>
13191319
</DuctLeakageMeasurement>
13201320
<DuctLeakageMeasurement>
13211321
<DuctType>return</DuctType>
13221322
<DuctLeakage>
13231323
<Units>CFM25</Units>
1324-
<Value>60.2</Value>
1324+
<Value>15.1</Value>
13251325
<TotalOrToOutside>to outside</TotalOrToOutside>
13261326
</DuctLeakage>
13271327
</DuctLeakageMeasurement>
13281328
<Ducts>
13291329
<SystemIdentifier id='Ducts1'/>
13301330
<DuctType>supply</DuctType>
1331-
<DuctEffectiveRValue>3.0</DuctEffectiveRValue>
1331+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
13321332
<DuctLocation>crawlspace - unvented</DuctLocation>
1333-
<DuctSurfaceArea>272.0</DuctSurfaceArea>
1333+
<DuctSurfaceArea>72.9</DuctSurfaceArea>
13341334
</Ducts>
13351335
<Ducts>
13361336
<SystemIdentifier id='Ducts2'/>
13371337
<DuctType>return</DuctType>
1338-
<DuctEffectiveRValue>3.0</DuctEffectiveRValue>
1338+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
13391339
<DuctLocation>crawlspace - unvented</DuctLocation>
1340-
<DuctSurfaceArea>86.0</DuctSurfaceArea>
1340+
<DuctSurfaceArea>21.5</DuctSurfaceArea>
1341+
</Ducts>
1342+
<Ducts>
1343+
<SystemIdentifier id='Ducts3'/>
1344+
<DuctType>supply</DuctType>
1345+
<DuctInsulationRValue>0.0</DuctInsulationRValue>
1346+
<DuctLocation>conditioned space</DuctLocation>
1347+
<DuctSurfaceArea>413.1</DuctSurfaceArea>
1348+
</Ducts>
1349+
<Ducts>
1350+
<SystemIdentifier id='Ducts4'/>
1351+
<DuctType>return</DuctType>
1352+
<DuctInsulationRValue>0.0</DuctInsulationRValue>
1353+
<DuctLocation>conditioned space</DuctLocation>
1354+
<DuctSurfaceArea>121.6</DuctSurfaceArea>
13411355
</Ducts>
13421356
<NumberofReturnRegisters>1</NumberofReturnRegisters>
13431357
</AirDistribution>

‎workflow/tests/ACCA_Examples/Vatilo_Residence.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,14 +390,14 @@
390390
<Ducts>
391391
<SystemIdentifier id='Ducts1'/>
392392
<DuctType>supply</DuctType>
393-
<DuctEffectiveRValue>5.0</DuctEffectiveRValue>
393+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
394394
<DuctLocation>attic - vented</DuctLocation>
395395
<DuctSurfaceArea>366.0</DuctSurfaceArea>
396396
</Ducts>
397397
<Ducts>
398398
<SystemIdentifier id='Ducts2'/>
399399
<DuctType>return</DuctType>
400-
<DuctEffectiveRValue>5.0</DuctEffectiveRValue>
400+
<DuctInsulationRValue>4.0</DuctInsulationRValue>
401401
<DuctLocation>attic - vented</DuctLocation>
402402
<DuctSurfaceArea>70.0</DuctSurfaceArea>
403403
</Ducts>

‎workflow/tests/ACCA_Examples/Victor_Residence.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,14 @@
380380
<Ducts>
381381
<SystemIdentifier id='Ducts1'/>
382382
<DuctType>supply</DuctType>
383-
<DuctEffectiveRValue>3.0</DuctEffectiveRValue>
383+
<DuctInsulationRValue>2.0</DuctInsulationRValue>
384384
<DuctLocation>crawlspace - unvented</DuctLocation>
385385
<DuctSurfaceArea>516.0</DuctSurfaceArea>
386386
</Ducts>
387387
<Ducts>
388388
<SystemIdentifier id='Ducts2'/>
389389
<DuctType>return</DuctType>
390-
<DuctEffectiveRValue>3.0</DuctEffectiveRValue>
390+
<DuctInsulationRValue>2.0</DuctInsulationRValue>
391391
<DuctLocation>crawlspace - unvented</DuctLocation>
392392
<DuctSurfaceArea>125.0</DuctSurfaceArea>
393393
</Ducts>

‎workflow/tests/ACCA_Examples/Walker_Residence.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -990,31 +990,31 @@
990990
<DuctType>supply</DuctType>
991991
<DuctLeakage>
992992
<Units>CFM25</Units>
993-
<Value>32.64</Value>
993+
<Value>26.6</Value>
994994
<TotalOrToOutside>to outside</TotalOrToOutside>
995995
</DuctLeakage>
996996
</DuctLeakageMeasurement>
997997
<DuctLeakageMeasurement>
998998
<DuctType>return</DuctType>
999999
<DuctLeakage>
10001000
<Units>CFM25</Units>
1001-
<Value>20.64</Value>
1001+
<Value>17.5</Value>
10021002
<TotalOrToOutside>to outside</TotalOrToOutside>
10031003
</DuctLeakage>
10041004
</DuctLeakageMeasurement>
10051005
<Ducts>
10061006
<SystemIdentifier id='Ducts1'/>
10071007
<DuctType>supply</DuctType>
1008-
<DuctEffectiveRValue>9.0</DuctEffectiveRValue>
1008+
<DuctInsulationRValue>8.0</DuctInsulationRValue>
10091009
<DuctLocation>attic - vented</DuctLocation>
1010-
<DuctSurfaceArea>272.0</DuctSurfaceArea>
1010+
<DuctSurfaceArea>222.0</DuctSurfaceArea>
10111011
</Ducts>
10121012
<Ducts>
10131013
<SystemIdentifier id='Ducts2'/>
10141014
<DuctType>return</DuctType>
1015-
<DuctEffectiveRValue>9.0</DuctEffectiveRValue>
1015+
<DuctInsulationRValue>8.0</DuctInsulationRValue>
10161016
<DuctLocation>attic - vented</DuctLocation>
1017-
<DuctSurfaceArea>86.0</DuctSurfaceArea>
1017+
<DuctSurfaceArea>73.0</DuctSurfaceArea>
10181018
</Ducts>
10191019
<NumberofReturnRegisters>1</NumberofReturnRegisters>
10201020
</AirDistribution>

0 commit comments

Comments
 (0)