Skip to content

Commit 6deec8d

Browse files
shorowitshorowit
committed
Squashed 'hpxml-measures/' changes from 4e35921a1..862d05663
862d05663 Minor docs update. fc08a1433 Merge pull request #765 from NREL/default_vent_fan_power c0b0d06a4 Latest results. 8e56249cd Allows defaulting of mechanical ventilation fan power (by type). e6e5c15e2 Merge pull request #674 from NREL/hvac_dhw_default_efficiencies 08db7a78c Update Changelog.md 47c8de4a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 7befb82d2 Update projects 3df7ce7b0 Latest results. c4228096c update the default efficiency of the electric type heating systems 17f6ebc69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies f53765eff Merge pull request #763 from NREL/mech_vent_precond_energy_only 3ce2810d6 Latest results. a2c4fb5dd Code changes from NREL/OpenStudio-HPXML#753, energy impact only. c8872d6cb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 95409f512 address comments f6f88ca30 Merge pull request #761 from NREL/seasons_followup 4c8870a3c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 3cdc84532 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 6e5f10028 fix test_fireplaces 183acefa2 update test_defaults fe1e69a8b Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies ecae4c26e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies dd56e58a7 update fireplace/stove efficiency defaulting 276f9403e Latest results. 8601281b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 391100932 Latest results. 6d0c3755a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 544a15ad3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies beefde88b update documentation 4948ed5ed Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies fc1faeb7f coarse efficiency defaulting for fireplace/stove Use energyplus.rb for fuel type mapping 48da5c831 Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies b9d4fd4e2 code cleanup and add more tests 4ca0de478 Latest results. bb4e92346 fix test_furnaces 4e2f3ab4c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies ee5afad48 fix base-misc-defaults.xml 631235b16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 4bdbd77d3 pick up the rest of the initial comments 2255a1a29 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 3ad035b7e pick up some of the initial comments 21d7ecb8e another documentation update f6c4f7c3d update documentation f0e0c56b5 revert assertions for tankless and heatpump water heaters 8a0d1acd3 remove Fixmes 072c0f2ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 5955f3ea8 update hpxml for water heaters and change the assertions for water heater efficiencies 0728f7a1f update EPvalidator for water heating systems 861ef8a7b Bugfix and update EPvalidator.xml and hpxml.rb 8bf095e75 update test_defaults 2b0fe12a1 run tasks.rb fdc7aadff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 6a477f99a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies 2e5032654 first pass git-subtree-dir: hpxml-measures git-subtree-split: 862d056638eb1df40cc0e2eb7be60cf1e5210a96
1 parent 0e8508b commit 6deec8d

23 files changed

+1442
-282
lines changed

‎Changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ __New Features__
88
- Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
99
- Allows `HeatingSeason` & `CoolingSeason` to be specified for defining heating and cooling equipment availability.
1010
- Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance.
11+
- Revises shared mechanical ventilation preconditioning control logic to operate less often.
12+
- Allows defaulting of HVAC/DHW system efficiency (by age).
13+
- Allows defaulting of mechanical ventilation fan power (by type).
1114

1215
__Bugfixes__
1316
- Improves ground reflectance when there is shading of windows/skylights.

‎HPXMLtoOpenStudio/measure.xml‎

Lines changed: 105 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<error>Unable to extract OpenStudio::Measure::OSMeasure object from /mnt/c/git/openstudio-hpxml/HPXMLtoOpenStudio/measure.rb. The script should contain a class that derives from OpenStudio::Measure::OSMeasure and should close with a line stating the class name followed by .new.registerWithApplication.</error>
55
<name>hpxm_lto_openstudio</name>
66
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
7-
<version_id>c929f134-7b14-43a4-a9ee-11bb8d27da1f</version_id>
8-
<version_modified>20210513T171148Z</version_modified>
7+
<version_id>3a7ed856-c7c0-4fdd-8935-6790d45807f7</version_id>
8+
<version_modified>20210517T151947Z</version_modified>
99
<xml_checksum>D8922A73</xml_checksum>
1010
<class_name>HPXMLtoOpenStudio</class_name>
1111
<display_name>HPXML to OpenStudio Translator</display_name>
@@ -149,12 +149,6 @@
149149
<usage_type>resource</usage_type>
150150
<checksum>38ED685E</checksum>
151151
</file>
152-
<file>
153-
<filename>util.rb</filename>
154-
<filetype>rb</filetype>
155-
<usage_type>resource</usage_type>
156-
<checksum>7DAA5F02</checksum>
157-
</file>
158152
<file>
159153
<filename>materials.rb</filename>
160154
<filetype>rb</filetype>
@@ -378,46 +372,52 @@
378372
<checksum>19007457</checksum>
379373
</file>
380374
<file>
381-
<filename>test_hotwater_appliance.rb</filename>
375+
<filename>test_water_heater.rb</filename>
382376
<filetype>rb</filetype>
383377
<usage_type>test</usage_type>
384-
<checksum>E962DB16</checksum>
378+
<checksum>C8BB1267</checksum>
385379
</file>
386380
<file>
387-
<filename>simcontrols.rb</filename>
381+
<filename>test_airflow.rb</filename>
388382
<filetype>rb</filetype>
389-
<usage_type>resource</usage_type>
390-
<checksum>C18610A9</checksum>
383+
<usage_type>test</usage_type>
384+
<checksum>9219EDE1</checksum>
391385
</file>
392386
<file>
393-
<filename>test_water_heater.rb</filename>
387+
<filename>test_enclosure.rb</filename>
394388
<filetype>rb</filetype>
395389
<usage_type>test</usage_type>
396-
<checksum>C8BB1267</checksum>
390+
<checksum>2A7EF627</checksum>
397391
</file>
398392
<file>
399-
<filename>validator.rb</filename>
393+
<filename>constructions.rb</filename>
400394
<filetype>rb</filetype>
401395
<usage_type>resource</usage_type>
402-
<checksum>BF53D293</checksum>
396+
<checksum>2BDDE11F</checksum>
403397
</file>
404398
<file>
405-
<filename>test_validation.rb</filename>
399+
<filename>energyplus.rb</filename>
400+
<filetype>rb</filetype>
401+
<usage_type>resource</usage_type>
402+
<checksum>CA9A2E46</checksum>
403+
</file>
404+
<file>
405+
<filename>test_generator.rb</filename>
406406
<filetype>rb</filetype>
407407
<usage_type>test</usage_type>
408-
<checksum>4C662AE0</checksum>
408+
<checksum>19007457</checksum>
409409
</file>
410410
<file>
411-
<filename>airflow.rb</filename>
411+
<filename>test_lighting.rb</filename>
412412
<filetype>rb</filetype>
413-
<usage_type>resource</usage_type>
414-
<checksum>99EB6060</checksum>
413+
<usage_type>test</usage_type>
414+
<checksum>CC725437</checksum>
415415
</file>
416416
<file>
417-
<filename>geometry.rb</filename>
417+
<filename>simcontrols.rb</filename>
418418
<filetype>rb</filetype>
419419
<usage_type>resource</usage_type>
420-
<checksum>3AB6308D</checksum>
420+
<checksum>C18610A9</checksum>
421421
</file>
422422
<file>
423423
<filename>generator.rb</filename>
@@ -432,88 +432,112 @@
432432
<checksum>2ADA335B</checksum>
433433
</file>
434434
<file>
435-
<filename>waterheater.rb</filename>
435+
<filename>xmlhelper.rb</filename>
436436
<filetype>rb</filetype>
437437
<usage_type>resource</usage_type>
438-
<checksum>A9868999</checksum>
438+
<checksum>CD54C911</checksum>
439439
</file>
440440
<file>
441-
<filename>xmlhelper.rb</filename>
441+
<filename>util.rb</filename>
442442
<filetype>rb</filetype>
443443
<usage_type>resource</usage_type>
444-
<checksum>CD54C911</checksum>
444+
<checksum>7DAA5F02</checksum>
445445
</file>
446446
<file>
447-
<filename>pv.rb</filename>
447+
<filename>minitest_helper.rb</filename>
448448
<filetype>rb</filetype>
449449
<usage_type>resource</usage_type>
450-
<checksum>AF98955A</checksum>
450+
<checksum>F3E1BE58</checksum>
451451
</file>
452452
<file>
453-
<filename>test_airflow.rb</filename>
453+
<filename>test_validation.rb</filename>
454454
<filetype>rb</filetype>
455455
<usage_type>test</usage_type>
456-
<checksum>9219EDE1</checksum>
456+
<checksum>4C662AE0</checksum>
457457
</file>
458458
<file>
459-
<filename>test_enclosure.rb</filename>
459+
<filename>test_hotwater_appliance.rb</filename>
460460
<filetype>rb</filetype>
461461
<usage_type>test</usage_type>
462-
<checksum>2A7EF627</checksum>
462+
<checksum>E962DB16</checksum>
463463
</file>
464464
<file>
465-
<filename>constructions.rb</filename>
465+
<filename>util.rb</filename>
466+
<filetype>rb</filetype>
467+
<usage_type>test</usage_type>
468+
<checksum>B185ACE7</checksum>
469+
</file>
470+
<file>
471+
<filename>weather.rb</filename>
466472
<filetype>rb</filetype>
467473
<usage_type>resource</usage_type>
468-
<checksum>2BDDE11F</checksum>
474+
<checksum>9BDDB2C2</checksum>
469475
</file>
470476
<file>
471-
<filename>energyplus.rb</filename>
477+
<filename>pv.rb</filename>
472478
<filetype>rb</filetype>
473479
<usage_type>resource</usage_type>
474-
<checksum>CA9A2E46</checksum>
480+
<checksum>AF98955A</checksum>
475481
</file>
476482
<file>
477-
<filename>version.rb</filename>
483+
<filename>validator.rb</filename>
478484
<filetype>rb</filetype>
479485
<usage_type>resource</usage_type>
480-
<checksum>1277B716</checksum>
486+
<checksum>BF53D293</checksum>
481487
</file>
482488
<file>
483-
<filename>hvac_sizing.rb</filename>
489+
<filename>geometry.rb</filename>
484490
<filetype>rb</filetype>
485491
<usage_type>resource</usage_type>
486-
<checksum>25E2DA28</checksum>
492+
<checksum>3AB6308D</checksum>
487493
</file>
488494
<file>
489-
<filename>util.rb</filename>
495+
<filename>test_hvac.rb</filename>
490496
<filetype>rb</filetype>
491497
<usage_type>test</usage_type>
492-
<checksum>B185ACE7</checksum>
498+
<checksum>F3E85A51</checksum>
493499
</file>
494500
<file>
495-
<filename>minitest_helper.rb</filename>
501+
<filename>hvac.rb</filename>
496502
<filetype>rb</filetype>
497503
<usage_type>resource</usage_type>
498-
<checksum>F3E1BE58</checksum>
504+
<checksum>96320EA4</checksum>
499505
</file>
500506
<file>
501-
<filename>weather.rb</filename>
507+
<filename>waterheater.rb</filename>
502508
<filetype>rb</filetype>
503509
<usage_type>resource</usage_type>
504-
<checksum>9BDDB2C2</checksum>
510+
<checksum>25442288</checksum>
505511
</file>
506512
<file>
507-
<filename>schedules.rb</filename>
513+
<filename>airflow.rb</filename>
508514
<filetype>rb</filetype>
509515
<usage_type>resource</usage_type>
510-
<checksum>38A6C75D</checksum>
516+
<checksum>E5C505B7</checksum>
511517
</file>
512518
<file>
513-
<filename>lighting.rb</filename>
519+
<filename>BaseElements.xsd</filename>
520+
<filetype>xsd</filetype>
521+
<usage_type>resource</usage_type>
522+
<checksum>FD773DB8</checksum>
523+
</file>
524+
<file>
525+
<filename>HPXMLDataTypes.xsd</filename>
526+
<filetype>xsd</filetype>
527+
<usage_type>resource</usage_type>
528+
<checksum>CA8F8CC3</checksum>
529+
</file>
530+
<file>
531+
<filename>HPXMLvalidator.xml</filename>
532+
<filetype>xml</filetype>
533+
<usage_type>resource</usage_type>
534+
<checksum>E14BA8AB</checksum>
535+
</file>
536+
<file>
537+
<filename>hpxml.rb</filename>
514538
<filetype>rb</filetype>
515539
<usage_type>resource</usage_type>
516-
<checksum>C028223B</checksum>
540+
<checksum>66982214</checksum>
517541
</file>
518542
<file>
519543
<filename>constants.rb</filename>
@@ -522,69 +546,69 @@
522546
<checksum>F895FFF9</checksum>
523547
</file>
524548
<file>
525-
<filename>HPXMLDataTypes.xsd</filename>
526-
<filetype>xsd</filetype>
549+
<filename>hvac_sizing.rb</filename>
550+
<filetype>rb</filetype>
527551
<usage_type>resource</usage_type>
528-
<checksum>CA8F8CC3</checksum>
552+
<checksum>25E2DA28</checksum>
529553
</file>
530554
<file>
531-
<filename>BaseElements.xsd</filename>
532-
<filetype>xsd</filetype>
555+
<filename>lighting.rb</filename>
556+
<filetype>rb</filetype>
533557
<usage_type>resource</usage_type>
534-
<checksum>FD773DB8</checksum>
558+
<checksum>C028223B</checksum>
535559
</file>
536560
<file>
537-
<filename>HPXMLvalidator.xml</filename>
538-
<filetype>xml</filetype>
561+
<filename>lu_hvac_equipment_efficiency.csv</filename>
562+
<filetype>csv</filetype>
539563
<usage_type>resource</usage_type>
540-
<checksum>E14BA8AB</checksum>
564+
<checksum>69BCF0A4</checksum>
541565
</file>
542566
<file>
543-
<filename>test_hvac.rb</filename>
567+
<filename>lu_water_heater_efficiency.csv</filename>
568+
<filetype>csv</filetype>
569+
<usage_type>resource</usage_type>
570+
<checksum>9EC3B4D6</checksum>
571+
</file>
572+
<file>
573+
<filename>schedules.rb</filename>
544574
<filetype>rb</filetype>
545-
<usage_type>test</usage_type>
546-
<checksum>F3E85A51</checksum>
575+
<usage_type>resource</usage_type>
576+
<checksum>38A6C75D</checksum>
577+
</file>
578+
<file>
579+
<filename>version.rb</filename>
580+
<filetype>rb</filetype>
581+
<usage_type>resource</usage_type>
582+
<checksum>1277B716</checksum>
547583
</file>
548584
<file>
549585
<version>
550586
<software_program>OpenStudio</software_program>
551-
<identifier>2.1.1</identifier>
552-
<min_compatible>2.1.1</min_compatible>
587+
<identifier>3.2.0</identifier>
588+
<min_compatible>3.2.0</min_compatible>
553589
</version>
554590
<filename>measure.rb</filename>
555591
<filetype>rb</filetype>
556592
<usage_type>script</usage_type>
557593
<checksum>76BEB7AB</checksum>
558594
</file>
559-
<file>
560-
<filename>hvac.rb</filename>
561-
<filetype>rb</filetype>
562-
<usage_type>resource</usage_type>
563-
<checksum>ECBD9662</checksum>
564-
</file>
565595
<file>
566596
<filename>test_defaults.rb</filename>
567597
<filetype>rb</filetype>
568598
<usage_type>test</usage_type>
569-
<checksum>BB81D4C0</checksum>
599+
<checksum>6E8F8702</checksum>
570600
</file>
571601
<file>
572602
<filename>hpxml_defaults.rb</filename>
573603
<filetype>rb</filetype>
574604
<usage_type>resource</usage_type>
575-
<checksum>EDF78BC3</checksum>
605+
<checksum>5B7CE0A0</checksum>
576606
</file>
577607
<file>
578608
<filename>EPvalidator.xml</filename>
579609
<filetype>xml</filetype>
580610
<usage_type>resource</usage_type>
581-
<checksum>8EE695FA</checksum>
582-
</file>
583-
<file>
584-
<filename>hpxml.rb</filename>
585-
<filetype>rb</filetype>
586-
<usage_type>resource</usage_type>
587-
<checksum>4BBE084E</checksum>
611+
<checksum>EABD489B</checksum>
588612
</file>
589613
</files>
590614
</measure>

0 commit comments

Comments
 (0)