Squashed 'hpxml-measures/' changes from 896a53e..f34a377

f34a377 Make script more generic.
f032171 Merge branch 'master' into comparisons
cb53347 Merge pull request #785 from NREL/enclosure_tests
26c5c66 Updates to compare script.
3e7fbc2 Latest results.
f988830 Merge branch 'enclosure_tests' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
226ff73 Adds tests for foundation walls, slabs, and radiant barriers.
3a0de93 Latest results.
4425097 Add tests for doors.
f964d78 Revert framing factors to ASHRAE 140.
3e9d66a Add tests for ceilings & floors.
dfbafd6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
9e9d553 Small mod to end uses reported.
20fe1fa Make base compare class.
cfa39de Update config and compare py.
b5bbf21 Merge branch 'master' into comparisons
7f25607 Merge pull request #800 from NREL/fwall_ins_top_bottom
154723a Merge pull request #799 from NREL/fwall_length
8303b4e Merge branch 'fwall_length' of https://github.com/NREL/OpenStudio-HPXML into fwall_ins_top_bottom
3d1df36 Allows foundation wall distance to top/bottom of insulation to be defaulted.
e4293a0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fwall_length
4bf5056 Merge pull request #798 from NREL/optional_rb_grade
60bf99e Allows `Length` to be provided instead of `Area` for foundation walls.
d8f9495 Allows `Roof/RadiantBarrierGrade` to be not provided and defaulted.
e9be354 Include index in hover.
e8845c5 Also save html plots.
fa8c8bf Updates for groupby.
b3b08b2 Uncommit comparisons folder.
b16809c First crack at visualizations.
0a91114 Simplify diff using pandas.
d9bad2e Refactor the compare script.
f092715 Call new python script.
3fc6a5b Merge pull request #796 from NREL/orientation
240142f Merge branch 'orientation' of https://github.com/NREL/OpenStudio-HPXML into orientation
6bd0a70 Minor cleanup.
92e61de Latest results.
73faf6d Allows `Orientation` to be provided instead of `Azimuth` for all applicable surfaces, PV systems, and solar thermal systems.
656a388 Merge pull request #795 from NREL/docs_output_capacity
30365bf Merge pull request #794 from NREL/fraction_duct_area
197c0c2 Latest results.
38cb37c Updates docs to clarify that all heating and cooling capacities are output (not input) capacities.
3179821 Fix sample file.
497f650 Merge branch 'fraction_duct_area' of https://github.com/NREL/OpenStudio-HPXML into fraction_duct_area
e597e59 Minor docs cleanup.
c2ee85e Latest results.
0b95e91 Fix CI tests.
98e300e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fraction_duct_area
294351a Merge pull request #775 from NREL/os321
75764ca First pass to support Ducts/FractionDuctArea.
68090f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os321
4a74ffc Merge branch 'os321' of https://github.com/NREL/OpenStudio-HPXML into os321
b30d789 Final 3.2.1
7de9198 Updates docs to reflect that number of bedrooms constraint no longer applies.
85ff0ac Merge pull request #793 from NREL/reporting_measure_register_net_elec
e62d2ec Includes net electricity in the registered values by the SimulationOutputReport reporting measure.
116c55a Merge pull request #790 from NREL/optional_door_azimuth
554500f Latest results.
20cddd2 Allows `Door/Azimuth` to be optional and defaulted.
4027b9e Latest results.
ce61991 Merge branch 'enclosure_tests' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
10fe593 Add tests for roofs and rim joists.
99f5daa Merge pull request #789 from NREL/gshp-sizing-bugfix
94fce5a Latest results.
6a1d1fe fix typo
d29bf74 Bugfix.
c4c4395 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
21c4c2c Merge branch 'enclosure_tests' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
bdb2ca9 More cleanup.
7b2a02e Merge pull request #787 from NREL/default_color
c247fc0 Latest results.
de1c32c Latest results.
85f9d53 Allows defaulting of color (solar absorptance) for walls, roofs, and rim joists.
a06c2a5 Bugfix and cleanup.
d30235e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into enclosure_tests
cd03b6f Adds wall unit tests.
a7fb630 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os321
8ff9f1b Merge pull request #784 from NREL/dhw_usage_bin
26fe68b Latest results.
2b6749e Fix sample files.
e472762 Small change to docs.
4087b31 Update changelog.
592e122 First pass.
ce85f47 Merge pull request #778 from NREL/interior_finish
9dd9d9d Merge branch 'interior_finish' of https://github.com/NREL/OpenStudio-HPXML into interior_finish
8a33ac6 Simplify a little.
621e2ae Latest results.
ae48c12 Bugfix.
fc647c5 Merge branch 'interior_finish' of https://github.com/NREL/OpenStudio-HPXML into interior_finish
760a6ef Update a couple sample files.
0bdfcde Latest results.
de32dc8 Clean up Material classes and switch to kwargs.
c99aceb Exclude warning.
6101a68 Merge branch 'interior_finish' of https://github.com/NREL/OpenStudio-HPXML into interior_finish
2d39a47 Simplify code. Use solar abs and emittance values from ASHRAE 140 for interior finish materials.
ef7e042 Latest results.
d58542b Update test values.
768ff3c Tweak sample files.
5d4e5f7 First pass.
2b92bbd Reference new docker tag.
48f870e Bump to OS 3.2.1.
6d27600 Merge pull request #770 from NREL/tweak_sample_files
32e2c72 Latest results.
70ec879 Try to generate measure xml multiple times.
524ca98 Fix test.
c84e98c Minor tweaks to sample files.
39eaf1b Merge pull request #769 from NREL/siding_none
f1b536c Latest results.
305ba2b Fix sample file and update EPvalidator.xml.
a0b65fd First pass.
fa8693e Merge pull request #762 from NREL/fan_system_model
ca2e781 Remove FIXMEs
d08b8e6 Re-enable asserts.
c6bc835 Merge branch 'fan_system_model' of https://github.com/NREL/OpenStudio-HPXML into fan_system_model
b917947 Update Changelog.md and add TODOs.
1daf1c7 Latest results.
6eb2a8e Latest results.
00801cf Ensure we never do integer division.
a71015e Merge branch 'fan_system_model' of https://github.com/NREL/OpenStudio-HPXML into fan_system_model
ff1dfaa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fan_system_model
9924018 Fix fan operate for fan coil.
5d318cd Merge pull request #767 from NREL/reporting_measure_register_values
01d6b1b Need to update outputs section too.
c058375 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reporting_measure_register_values
11e3127 Fix measures.xmls and add better error checking.
b240cac Update Changelog.md
e9444db Merge pull request #764 from NREL/allow_ceer
46c758c Latest results.
a04aab0 address comments
6429470 Update new HVAC test.
0d486dc Clarify docs.
7264998 Fix EMS sensor name.
a41eb40 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fan_system_model
642acf1 No longer using FanVariableVolume object.
aa622c4 Handle multi-speed systems.
09e04a3 Update Changelog.md
aea6428 Register all outputs from the annual CSV with the OS runner (for use in, e.g., PAT).
62ed038 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_ceer
5e7ab71 Merge pull request #707 from NREL/gshp-installation-quality
0ba6d72 Latest results.
5967f50 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
7023de2 Removes a few HVAC IQ sample files and renames hvac-install-quality-all-foo.xml files to hvac-install-quality-foo.xml
63ae696 doc updates and bugfix
40792de Simplify logic.
862d056 Minor docs update.
8601b10 fix changes caused by merging
de053f8 Cleanup comments
6698525 Simplified code similarly for other HVAC IQ inputs (blower fan, airflow).
fc8b4d3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
713e829 Removes IsPackagedSystem since split systems can still have pre-charged line sets. We'll just assume that if someone is providing a non-zero value, it makes sense for their system type. Added some documentation to clarify.
fc08a14 Merge pull request #765 from NREL/default_vent_fan_power
c0b0d06 Latest results.
7f04359 minor change and Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_ceer
8e56249 Allows defaulting of mechanical ventilation fan power (by type).
e6e5c15 Merge pull request #674 from NREL/hvac_dhw_default_efficiencies
08db7a7 Update Changelog.md
47c8de4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
7befb82 Update projects
3df7ce7 Latest results.
c422809 update the default efficiency of the electric type heating systems
a7813c5 Latest results.
ef6cdab allow ceer
18024d0 Latest results.
9c28089 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fan_system_model
17f6ebc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
8512de8 Temporarily disable asserts so all tests run.
1f8403e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
f53765e Merge pull request #763 from NREL/mech_vent_precond_energy_only
3ce2810 Latest results.
a2c4fb5 Code changes from #753, energy impact only.
87c2b51 Fix test.
5cac9db address comments
f315cd2 Try replacing evap cooler VariableVolume fan too.
aadfde3 First pass.
c8872d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
95409f5 address comments
f6f88ca Merge pull request #761 from NREL/seasons_followup
4e35921 Fix base-multiple-buildings.xml to be valid.
4c8870a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
ce42985 doc update
824d695 add invalid test
31901ae Update Changelog.md
87144ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
3cdc845 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
6e5f100 fix test_fireplaces
183acef update test_defaults
fe1e69a Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
ecae4c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
dd56e58 update fireplace/stove efficiency defaulting
19e7ad5 Latest results.
3a69e94 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
276f940 Latest results.
8601281 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
3911009 Latest results.
6d0c375 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
277d71c cleanup + fix
7a55ea4 Merge branch 'gshp-installation-quality' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
d50bdd1 cleanup
440f6ee cleanup for heating hvacsizing method
a274d8e Latest results.
7a20077 One more.
5f2a4b8 Manually fix code that was previously accidentally reverted.
cb9962e Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
7b8bb7c Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
4976c3d Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
544a15a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
beefde8 update documentation
4948ed5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
fc1faeb coarse efficiency defaulting for fireplace/stove Use energyplus.rb for fuel type mapping
a8f7a93 revert merging
814183b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
0e94275 Add configuration of packaged system with 0 charge defect for schematron test
ca2a92b Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
f7fb929 delete repeating rule
6f9f06d only gshp to use is_packaged_system
0ab14df fix validator.
53b1794 update test file multiple
5cb9bd1 Add packaged system element
c3a0676 Add test for gshp iq
a531df8 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
370299f Latest results.
09efbc4 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
05c5934 Latest results.
48da5c8 Merge branch 'hvac_dhw_default_efficiencies' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
b9d4fd4 code cleanup and add more tests
4ca0de4 Latest results.
bb4e923 fix test_furnaces
4e2f3ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
a25e720 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into gshp-installation-quality
72ed160 Added clarification to the docs about packaged vs split GSHPs systems. (Also updated it to remove the "zero only" limitation while I'm in there.)
cdc0bc8 add charge defect ratio to gshp
ee5afad fix base-misc-defaults.xml
631235b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
4bdbd77 pick up the rest of the initial comments
2255a1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
3ad035b pick up some of the initial comments
21d7ecb another documentation update
f6c4f7c update documentation
f0e0c56 revert assertions for tankless and heatpump water heaters
8a0d1ac remove Fixmes
072c0f2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
5955f3e update hpxml for water heaters and change the assertions for water heater efficiencies
0728f7a update EPvalidator for water heating systems
861ef8a Bugfix and update EPvalidator.xml and hpxml.rb
8bf095e update test_defaults
2b0fe12 run tasks.rb
fdc7aad Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
6a477f9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_dhw_default_efficiencies
2e50326 first pass

git-subtree-dir: hpxml-measures
git-subtree-split: f34a377

.github/workflows/config.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.2.0
+      image: docker://nrel/openstudio:3.2.1
     steps:
       - uses: actions/checkout@v2
         with:
@@ -75,7 +75,14 @@ jobs:
           cp -r base_results/results*.csv workflow/tests/base_results
           mkdir workflow/tests/results
           cp -r results/results* workflow/tests/results
-          ruby workflow/tests/compare.rb
+          
+          pip install numpy
+          pip install pandas
+          pip install plotly
+          pip install kaleido
+          
+          python workflow/tests/compare.py -a results
+          python workflow/tests/compare.py -a visualize
 
       - name: Store comparisons
         uses: actions/upload-artifact@v2

.rubocop.yml

@@ -1,16 +1,75 @@
 Layout/EndOfLine:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   AutoCorrect: false
   Enabled: false
 Layout/RescueEnsureAlignment:
   AutoCorrect: true
 Style/FrozenStringLiteralComment:
   AutoCorrect: true
-# Enable the cops below when rubocop is upgraded
-#Style/HashEachMethods:
-#  Enabled: true
-#Style/HashTransformKeys:
-#  Enabled: true
-#Style/HashTransformValues:
-#  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Gemspec/DateAssignment:
+  Enabled: true
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
+Lint/DeprecatedConstants:
+  Enabled: true
+Lint/DuplicateBranch:
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+Lint/EmptyBlock:
+  Enabled: true
+Lint/EmptyClass:
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+Lint/NumberedParameterAssignment:
+  Enabled: true
+Lint/OrAssignmentToConstant:
+  Enabled: true
+Lint/RedundantDirGlobSort:
+  Enabled: true
+Lint/SymbolConversion:
+  Enabled: true
+Lint/ToEnumArguments:
+  Enabled: true
+Lint/TripleQuotes:
+  Enabled: true
+Lint/UnexpectedBlockArity:
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+Style/ArgumentsForwarding:
+  Enabled: true
+Style/CollectionCompact:
+  Enabled: true
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+Style/EndlessMethod:
+  Enabled: true
+Style/HashConversion:
+  Enabled: true
+Style/HashExcept:
+  Enabled: true
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+Style/NegatedIfElseCondition:
+  Enabled: true
+Style/NilLambda:
+  Enabled: true
+Style/RedundantArgument:
+  Enabled: true
+Style/StringChars:
+  Enabled: true
+Style/SwapValues:
+  Enabled: true

Changelog.md

@@ -1,16 +1,35 @@
 ## OpenStudio-HPXML v1.3.0 (Pending)
 
 __New Features__
-- Updates to OpenStudio 3.2.0/EnergyPlus 9.5.0.
-- Introduces a small amount of infiltration for unvented spaces.
+- Updates to OpenStudio 3.2.1/EnergyPlus 9.5.0.
 - **Breaking change**: Replaces ClothesDryer `extension/IsVented` and `extension/VentedFlowRate` with `Vented` and `VentedFlowRate`.
-- Allows additional fuel types for generators.
 - Adds an `--ep-input-format` argument to run_simulation.rb to choose epJSON as the EnergyPlus input file format instead of IDF.
+- Allows non-zero refrigerant charge defect ratios for ground source heat pumps.
 - Allows `HeatingSeason` & `CoolingSeason` to be specified for defining heating and cooling equipment availability.
+- Revises shared mechanical ventilation preconditioning control logic to operate less often.
+- Allows `Ducts/FractionDuctArea` to be provided instead of `Ducts/DuctSurfaceArea`.
+- Allows CEER (Combined Energy Efficiency Ratio) efficiency unit for room AC.
+- Allows "none" for wall/rim joist siding.
+- Allows interior finish inputs (e.g., 0.5" drywall) for walls, ceilings, and roofs.
+- Allows `Orientation` to be provided instead of `Azimuth` for all applicable surfaces, PV systems, and solar thermal systems.
+- Allows `Length` to be provided instead of `Area` for foundation walls.
+- Allows additional fuel types for generators.
+- Allows more defaulting (optional inputs):
+  - HVAC/DHW system efficiency (by age).
+  - Mechanical ventilation fan power (by type).
+  - Color (solar absorptance) for walls, roofs, and rim joists.
+  - Foundation wall distance to top/bottom of insulation.
+  - Door azimuth.
+  - Radiant barrier grade.
+- For water heaters w/ UEF, allows `UsageBin` instead of `FirstHourRating` (or defaults if neither provided).
+- Switches to the EnergyPlus Fan:SystemModel object for all HVAC systems.
+- Introduces a small amount of infiltration for unvented spaces.
 - Removes error-check for number of bedrooms based on conditioned floor area, per RESNET guidance.
+- Updates the reporting measure to register all outputs from the annual CSV with the OS runner (for use in, e.g., PAT).
 
 __Bugfixes__
 - Improves ground reflectance when there is shading of windows/skylights.
+- Fixes heating fan power for single-stage systems that have different heating/cooling airflow rates.
 
 ## OpenStudio-HPXML v1.2.0
 

Gemfile.lock

@@ -4,16 +4,7 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     builder (3.2.4)
-    ci_reporter (2.0.0)
-      builder (>= 2.1.2)
-    ci_reporter_minitest (1.0.0)
-      ci_reporter (~> 2.0)
-      minitest (~> 5.0)
-    codecov (0.2.12)
-      json
-      simplecov
     docile (1.3.5)
-    json (2.5.1)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     minitest-reporters (1.4.3)
@@ -50,8 +41,6 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  ci_reporter_minitest (~> 1.0.0)
-  codecov (= 0.2.12)
   minitest (~> 5.9)
   minitest-reporters
   nokogiri (~> 1.10)
@@ -60,6 +49,7 @@ DEPENDENCIES
   rake
   schematron-nokogiri
   simplecov
+  simplecov-html
 
 BUNDLED WITH
    2.2.11