Skip to content

Commit 1acedcb

Browse files
shorowitshorowit
committed
Squashed 'hpxml-measures/' changes from 03188d6..355a40a
355a40a update xml f4b5d2a Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance. 7f5e307 Merge pull request #715 from NREL/issue-700 53c7184 Minor changes to changelog and docs. a959f0f Merge branch 'master' into issue-700 d3ddf07 Merge pull request #760 from NREL/default_duct_fractions 99a72be Improve hvac test for seasons. 3015034 Merge branch 'issue-700' of github.com:NREL/OpenStudio-HPXML into issue-700 5f4f7d5 When duct surface areas are defaulted, also populate the HPXML FractionDuctArea elements for informational purposes. 1aad9c1 Latest results. 312174a Fix the workflow inputs doc. 50b3b9c Update the changelog. 7562cc7 Updates the sample file to have shorter seasons so that the effect in timeseries results is more obvious. 14d8355 Latest results. a37c223 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into issue-700 f0c8f03 Merge branch 'issue-700' of https://github.com/NREL/OpenStudio-HPXML into issue-700 aa5fe4d Corresponding updates to ideal air load systems. Had to refactor the code a bit to be able to provide the correct sequential load fractions. d875a0d Latest results. 97cc4bb Merge pull request #759 from NREL/comploads_fix ca00dce Latest results. 1d98491 Simplify the schedule type used. b99420f Small bugfix to prevent remote possibility of component loads not being written. 204fe1a Bugfix if season is 1 day. 39e9b67 Fixes bugs and some code simplification. c764609 Latest results. 8a325ea Minor issues in a schedules class. 3c90212 Clean up dup code in schedules resource. 8c88e42 Remove ceiling fan days method. 19ae104 Remove leap day from lighting calcs. 9d61be3 Latest results. dd7cacd Updates to resources and tests. f7a915e Some refactoring around months and days. 3282d45 Fix invalid test. c7cccb0 Merge branch 'issue-700' of github.com:NREL/OpenStudio-HPXML into issue-700 de7a2fa Add osm test for seasons. 7893083 Fix inconsistencies in schema. 9002f83 Latest results. 35704c3 Fix a few things. c646c3a Clean up get_sequential_load_schedule method. 0a0a728 Update the docs. aad7833 Move get_daily_season from hvac to schedule class. 0be9b7a Move YearNumDays from constants to schedule class. e1df265 Update ep validator. 5dff61a Name variables more explicitly. de4b82b Update the changelog. d1b9002 Apply ceiling fan offsets by day. 5aaf9c3 Latest results. 75bf2ca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into issue-700 295abc0 Update ep validator. 74b5c0d Merge branch 'issue-700' of github.com:NREL/OpenStudio-HPXML into issue-700 c6f0b12 Copy updated schema. f7f772a Latest results. 4d166b4 Merge branch 'master' into issue-700 13a6c01 Merge branch 'master' into issue-700 552d15d Merge branch 'master' into issue-700 48d4b1f Missed a hvac control escape. 6ff4a66 Add comment on BA cooling season. f141fcd Merge branch 'issue-700' of github.com:NREL/OpenStudio-HPXML into issue-700 3a57273 Refactor to make seq frac mults more generic. 448b078 Latest results. 9c032fb Add an invalid test file. eabb4ef Update the defaults test file. 3802553 Improve seasons error message. e8bde38 Update the docs. 8599eec Update the changelog. 56d183e Merge branch 'issue-700' of github.com:NREL/OpenStudio-HPXML into issue-700 ac7e517 Remove enabled field and update epvalidator. c33a625 Clean up test xmls. 3886bfb Latest results. 123c103 Merge branch 'master' into issue-700 cf2bab8 Clean up tasks. 06e2625 Consider leap years for correct setpoint schedules. e2af156 Valid dates for seasons default test. ccf4f47 Typo in applying mini split. 1012008 Missed more hvac_control arguments. 2a2137d Merge branch 'master' into issue-700 84a0955 Merge branch 'master' into issue-700 30ccd76 Missed an hvac_control argument. dd8ebe3 Remove stubbed ideal and residual stuff. c23df7b More passing of hvac controls. 9b6959d Pass hvac control object around. 3f3b3e8 Switch setpoints to using hourly by day arrays. e6a4c90 Add test xmls for seasons. c65a0a6 Get seasons begin and end days. 7b6c2f5 Stub tests for seasons defaults. 7ef46ba Stub defaults for when seasons are enabled. 3066c95 Update hpxml resource with season arguments. git-subtree-dir: hpxml-measures git-subtree-split: 355a40a
1 parent 962f186 commit 1acedcb

25 files changed

+2160
-475
lines changed

‎Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ __New Features__
66
- **Breaking change**: Replaces ClothesDryer `extension/IsVented` and `extension/VentedFlowRate` with `Vented` and `VentedFlowRate`.
77
- Allows additional fuel types for generators.
88
- Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
9+
- Allows `HeatingSeason` & `CoolingSeason` to be specified for defining heating and cooling equipment availability.
10+
- Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance.
911

1012
__Bugfixes__
1113
- Improves ground reflectance when there is shading of windows/skylights.

‎HPXMLtoOpenStudio/measure.rb

Lines changed: 93 additions & 50 deletions
Large diffs are not rendered by default.

‎HPXMLtoOpenStudio/measure.xml

Lines changed: 77 additions & 83 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>afce8152-396b-46d7-96f8-8c2e1ce1f0bf</version_id>
8-
<version_modified>20210505T002722Z</version_modified>
7+
<version_id>4357fba8-0846-4d0b-9e78-720564ced1fd</version_id>
8+
<version_modified>20210513T142945Z</version_modified>
99
<xml_checksum>D8922A73</xml_checksum>
1010
<class_name>HPXMLtoOpenStudio</class_name>
1111
<display_name>HPXML to OpenStudio Translator</display_name>
@@ -173,12 +173,6 @@
173173
<usage_type>resource</usage_type>
174174
<checksum>BB8F37B8</checksum>
175175
</file>
176-
<file>
177-
<filename>weather.rb</filename>
178-
<filetype>rb</filetype>
179-
<usage_type>resource</usage_type>
180-
<checksum>A951F41D</checksum>
181-
</file>
182176
<file>
183177
<filename>data_ashrae_622_wsf.csv</filename>
184178
<filetype>csv</filetype>
@@ -317,12 +311,6 @@
317311
<usage_type>resource</usage_type>
318312
<checksum>6BF095D2</checksum>
319313
</file>
320-
<file>
321-
<filename>schedules.rb</filename>
322-
<filetype>rb</filetype>
323-
<usage_type>resource</usage_type>
324-
<checksum>C2B5A5E7</checksum>
325-
</file>
326314
<file>
327315
<filename>unit_conversions.rb</filename>
328316
<filetype>rb</filetype>
@@ -335,24 +323,12 @@
335323
<usage_type>resource</usage_type>
336324
<checksum>CB27A3C5</checksum>
337325
</file>
338-
<file>
339-
<filename>lighting.rb</filename>
340-
<filetype>rb</filetype>
341-
<usage_type>resource</usage_type>
342-
<checksum>45BBD265</checksum>
343-
</file>
344326
<file>
345327
<filename>hotwater_appliances.rb</filename>
346328
<filetype>rb</filetype>
347329
<usage_type>resource</usage_type>
348330
<checksum>E5A74D5B</checksum>
349331
</file>
350-
<file>
351-
<filename>constants.rb</filename>
352-
<filetype>rb</filetype>
353-
<usage_type>resource</usage_type>
354-
<checksum>F76E3AB7</checksum>
355-
</file>
356332
<file>
357333
<filename>misc_loads.rb</filename>
358334
<filetype>rb</filetype>
@@ -413,12 +389,6 @@
413389
<usage_type>resource</usage_type>
414390
<checksum>C18610A9</checksum>
415391
</file>
416-
<file>
417-
<filename>test_defaults.rb</filename>
418-
<filetype>rb</filetype>
419-
<usage_type>test</usage_type>
420-
<checksum>3065BE57</checksum>
421-
</file>
422392
<file>
423393
<filename>test_water_heater.rb</filename>
424394
<filetype>rb</filetype>
@@ -449,24 +419,6 @@
449419
<usage_type>resource</usage_type>
450420
<checksum>3AB6308D</checksum>
451421
</file>
452-
<file>
453-
<filename>HPXMLDataTypes.xsd</filename>
454-
<filetype>xsd</filetype>
455-
<usage_type>resource</usage_type>
456-
<checksum>3259B8DD</checksum>
457-
</file>
458-
<file>
459-
<filename>BaseElements.xsd</filename>
460-
<filetype>xsd</filetype>
461-
<usage_type>resource</usage_type>
462-
<checksum>CAF4AA69</checksum>
463-
</file>
464-
<file>
465-
<filename>HPXMLvalidator.xml</filename>
466-
<filetype>xml</filetype>
467-
<usage_type>resource</usage_type>
468-
<checksum>2CEB5892</checksum>
469-
</file>
470422
<file>
471423
<filename>generator.rb</filename>
472424
<filetype>rb</filetype>
@@ -497,12 +449,6 @@
497449
<usage_type>resource</usage_type>
498450
<checksum>AF98955A</checksum>
499451
</file>
500-
<file>
501-
<filename>test_hvac.rb</filename>
502-
<filetype>rb</filetype>
503-
<usage_type>test</usage_type>
504-
<checksum>93BE4E7C</checksum>
505-
</file>
506452
<file>
507453
<filename>test_airflow.rb</filename>
508454
<filetype>rb</filetype>
@@ -528,69 +474,117 @@
528474
<checksum>CA9A2E46</checksum>
529475
</file>
530476
<file>
531-
<version>
532-
<software_program>OpenStudio</software_program>
533-
<identifier>2.1.1</identifier>
534-
<min_compatible>2.1.1</min_compatible>
535-
</version>
536-
<filename>measure.rb</filename>
477+
<filename>version.rb</filename>
537478
<filetype>rb</filetype>
538-
<usage_type>script</usage_type>
539-
<checksum>C3F9378E</checksum>
479+
<usage_type>resource</usage_type>
480+
<checksum>1277B716</checksum>
540481
</file>
541482
<file>
542-
<filename>hpxml_defaults.rb</filename>
483+
<filename>hvac_sizing.rb</filename>
543484
<filetype>rb</filetype>
544485
<usage_type>resource</usage_type>
545-
<checksum>7E2C2773</checksum>
486+
<checksum>25E2DA28</checksum>
546487
</file>
547488
<file>
548-
<filename>hvac.rb</filename>
489+
<filename>util.rb</filename>
490+
<filetype>rb</filetype>
491+
<usage_type>test</usage_type>
492+
<checksum>B185ACE7</checksum>
493+
</file>
494+
<file>
495+
<filename>minitest_helper.rb</filename>
549496
<filetype>rb</filetype>
550497
<usage_type>resource</usage_type>
551-
<checksum>DB801686</checksum>
498+
<checksum>F3E1BE58</checksum>
552499
</file>
553500
<file>
554-
<filename>version.rb</filename>
501+
<filename>weather.rb</filename>
555502
<filetype>rb</filetype>
556503
<usage_type>resource</usage_type>
557-
<checksum>1277B716</checksum>
504+
<checksum>9BDDB2C2</checksum>
558505
</file>
559506
<file>
560-
<filename>hvac_sizing.rb</filename>
507+
<filename>schedules.rb</filename>
561508
<filetype>rb</filetype>
562509
<usage_type>resource</usage_type>
563-
<checksum>25E2DA28</checksum>
510+
<checksum>38A6C75D</checksum>
564511
</file>
565512
<file>
566-
<filename>hpxml.rb</filename>
513+
<filename>lighting.rb</filename>
567514
<filetype>rb</filetype>
568515
<usage_type>resource</usage_type>
569-
<checksum>018B0831</checksum>
516+
<checksum>C028223B</checksum>
570517
</file>
571518
<file>
572-
<filename>EPvalidator.xml</filename>
519+
<filename>constants.rb</filename>
520+
<filetype>rb</filetype>
521+
<usage_type>resource</usage_type>
522+
<checksum>F895FFF9</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>BaseElements.xsd</filename>
532+
<filetype>xsd</filetype>
533+
<usage_type>resource</usage_type>
534+
<checksum>FD773DB8</checksum>
535+
</file>
536+
<file>
537+
<filename>HPXMLvalidator.xml</filename>
573538
<filetype>xml</filetype>
574539
<usage_type>resource</usage_type>
575-
<checksum>02CE0CAA</checksum>
540+
<checksum>E14BA8AB</checksum>
576541
</file>
577542
<file>
578-
<filename>util.rb</filename>
543+
<filename>test_hvac.rb</filename>
579544
<filetype>rb</filetype>
580545
<usage_type>test</usage_type>
581-
<checksum>B185ACE7</checksum>
546+
<checksum>F3E85A51</checksum>
582547
</file>
583548
<file>
584-
<filename>minitest_helper.rb</filename>
549+
<version>
550+
<software_program>OpenStudio</software_program>
551+
<identifier>2.1.1</identifier>
552+
<min_compatible>2.1.1</min_compatible>
553+
</version>
554+
<filename>measure.rb</filename>
555+
<filetype>rb</filetype>
556+
<usage_type>script</usage_type>
557+
<checksum>76BEB7AB</checksum>
558+
</file>
559+
<file>
560+
<filename>hvac.rb</filename>
585561
<filetype>rb</filetype>
586562
<usage_type>resource</usage_type>
587-
<checksum>F3E1BE58</checksum>
563+
<checksum>ECBD9662</checksum>
588564
</file>
589565
<file>
590-
<filename>in.xml</filename>
591-
<filetype>xml</filetype>
566+
<filename>test_defaults.rb</filename>
567+
<filetype>rb</filetype>
592568
<usage_type>test</usage_type>
593-
<checksum>229ECDE9</checksum>
569+
<checksum>BB81D4C0</checksum>
570+
</file>
571+
<file>
572+
<filename>hpxml_defaults.rb</filename>
573+
<filetype>rb</filetype>
574+
<usage_type>resource</usage_type>
575+
<checksum>EDF78BC3</checksum>
576+
</file>
577+
<file>
578+
<filename>hpxml.rb</filename>
579+
<filetype>rb</filetype>
580+
<usage_type>resource</usage_type>
581+
<checksum>EC5DCE66</checksum>
582+
</file>
583+
<file>
584+
<filename>EPvalidator.xml</filename>
585+
<filetype>xml</filetype>
586+
<usage_type>resource</usage_type>
587+
<checksum>8EE695FA</checksum>
594588
</file>
595589
</files>
596590
</measure>

0 commit comments

Comments
 (0)