Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest OS-HPXML #597

Merged
merged 19 commits into from
Apr 8, 2022
Merged

Latest OS-HPXML #597

merged 19 commits into from
Apr 8, 2022

Conversation

shorowit
Copy link
Collaborator

@shorowit shorowit commented Apr 7, 2022

Pull Request Description

  • Output changes:
    • Adds "Energy Use: Total" and "Energy Use: Net" columns to the ERI____Home.csv output files; allows hourly outputs.
    • Breaking change: New "End Use: <Fuel>: Heating Heat Pump Backup" output, disaggregated from "End Use: <Fuel>: Heating".
  • Adds UsableCapacity as a required battery input.
  • Hourly output fixes: some outputs off by 1 hour; possible negative combi boiler values.

Checklist

Not all may apply:

  • OS-HPXML git subtree has been pulled
  • 301/ES rulesets and unit tests have been updated
  • 301validator.xml has been updated (reference EPvalidator.xml)
  • Workflow tests have been updated
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI

shorowit added 3 commits April 6, 2022 18:33
56b27af87d Latest results.
7b3511e9ab Merge branch 'end-use-heating-hp-backup' of https://github.com/NREL/OpenStudio-HPXML into end-use-heating-hp-backup
ec412111ec Bugfixes for GSHPs & DFHPs.
f002a270ea Latest results.
6dd88bdc4f Latest results.
87d0eef35e Merge branch 'end-use-heating-hp-backup' of https://github.com/NREL/OpenStudio-HPXML into end-use-heating-hp-backup
a79f9390aa Fix for heat pump with integrated backup. Minor code cleanup.
83aa5846fe Update the changelog.
c05656e5d0 Slightly different approach.
01541b4f89 Merge branch 'master' into end-use-heating-hp-backup
d3a3bd73ba Fix documentation of equations for LULs. [ci skip]
3c97699a14 Merge pull request #1032 from NREL/ventilation_fan_used_for
2597d49790 Add comments.
189a13c8c9 Refactor/simplify code.
13882bdb96 Clarify docs [ci skip]
bc717ccaa2 Need to retain range electricity use even if range is not in conditioned space.
5982a14cbe Narrower focus of bugfix.
b58e065cf4 Update measures
4f1fbf874f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ventilation_fan_used_for
9be6b48fb6 Merge pull request #1027 from NREL/foundation-floor-area
cf8ed1c474 Require one (and only one) `VentilationFan` UsedForFoo element. Fixes range/dryer ventilation interaction with infiltration to take into account the appliance's location (conditioned vs unconditioned space).
fcb76b8aa1 Use new method throughout test.
89ecff3bb5 Add test for various foundations.
689cf5ff20 Exclude garages from foundation floors.
62bf4d1d56 Foundation slab could be at grade.
d85026c649 Update the changelog.
d7494630ba Update docs.
c94657aa98 Update tests.
cc7aa49ba4 Add new multiplier to measure and constants.
b11fbdf61c Latest results.
af70848904 Merge branch 'master' into end-use-heating-hp-backup
5c0bd9b564 Merge pull request #1012 from NREL/additional-properties-updates
8fa43c9bb4 Update Changelog.md
2569aeb178 Minor cleanup. Reverts EPvalidator.xml and docs changes.
3903249256 Latest results.
5717b02e84 Merge branch 'master' into additional-properties-updates
eab2693294 Update description and docs.
a0176f01e5 Merge pull request #1010 from NREL/fix_timeseries_emissions
15dc8bc1f0 Latest results.
3961f4dfd7 Update Changelog.md [ci skip]
b3afe1c1fe Fix net energy calculation from merge.
3009106693 Fix merge.
42b46babe2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_timeseries_emissions
ce175b306e Merge pull request #1003 from NREL/output-variables
7c805d8ab5 Use timestep as the default. [ci skip]
f5f4b6e7f2 Latest results.
cc03c8f6b0 Fix bungled merge.
2ec5e44d6e Assume hourly timeseries when requesting output variables with no frequency specified.
cb16f5501b Respond to review.
6e981e11bc Latest results.
c8ea2273a9 Test more characters.
12b17e5775 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_timeseries_emissions
dea7fa60c4 Latest results.
ddc83ef99c Merge branch 'master' into additional-properties-updates
f3f16e8c42 Merge branch 'master' into output-variables
64ce5962b1 Merge branch 'master' into output-variables
1ade57cbde Merge pull request #998 from NREL/battery_usable_capacity
e012969e4b Latest results.
9aaec38798 Remove FIXME. [ci skip]
8658888bbe Simplify [ci skip]
b5e5177a0b Update Changelog.md [ci skip]
7f584b5716 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into battery_usable_capacity
6c5bd88fac Merge pull request #1016 from NREL/total_energy_use
6bfa97fe41 Latest results.
246580993e Change all arguments to optional. No point requiring a bunch of arguments if the user just wants annual output.
f2bf14b4d6 Adds "Energy Use: Total" and "Energy Use: Net" columns to the annual results output file; allows timeseries outputs.
45ded30983 Merge pull request #1014 from NREL/schedule-file-updates
b9e4392e81 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule-file-updates
6ccc38f239 Merge pull request #963 from NREL/storm_window
7d07e28efa Update tests.
fc3ab35b63 Bugfix.
9e95d21c1f Latest results.
b7d7130a37 Improve timeseries tests.
b102379f29 Fix measure.xml
ef24f49935 Use tmp file so we avoid overwriting.
7f6f44e719 Fix test name.
457b58deef Update Changelog.md
b922b4596c Fix calling build schedule file from cli.
9f6898bddb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
4040050910 Miscellaneous minor cleanup.
85f4eb942b Add cli tests for detailed schedules and extra time columns.
a575a8c596 Add sample file for subhourly stochastic schedules.
4accda1d44 Latest results.
5ae6123e7f Start updating docs.
88a1c2c544 Add hp backup to energy_htg.
1f4ca993e9 Clean up.
03fef77386 Support more backup types.
cd5d1f8668 Update expected test outputs.
8879e12348 Use bool as switch for new end use output.
e77d0f6b2e Store bool supplemental coil additional property.
b5d2f37c64 Fixes and updates to tear down method.
63df131dbb Add convenience method for retrieving additional properties.
7ceff7b7ea Clean up output variable reported names.
7b35be6d13 Merge branch 'master' into output-variables
69a9c0a21a Latest results.
37bc2e64d2 Latest results.
a3b399b31e Latest results.
f91651236a Replaces the final three instances of BeginTimestepBeforePredictor with BeginZoneTimestepAfterInitHeatBalance. Has a small impact for dehumidifiers, but no impact for the other two instances (HVAC grading and combi boilers).
a8866728ab Fixes the whole house fan electricity timeseries output so that it's no longer off by 1 hour. Same as previous fix.
159c3f4301 Merge branch 'fix_timeseries_emissions' of https://github.com/NREL/OpenStudio-HPXML into fix_timeseries_emissions
a8f007cc45 Changes infiltration program from BeginTimestepBeforePredictor calling point to BeginZoneTimestepAfterInitHeatBalance, which has almost no effect on heat transfer but fixes some timeseries outputs (like the mechanical ventilation component load).
26e1d8538c Latest results.
d73203966e Some refactoring to consolidate electricity produced/net use code.
ffecd8a461 Avoid need for shifting ec_adj timeseries output. Prevent combi boiler dhw_frac from being slightly greater than 1 for some hours. Prevent possible duplicate sql queries (faster performance).
8c2a8c6751 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_timeseries_emissions
dd0b8b92a9 Fixes possibility of "Timeseries outputs (...) do not sum to annual output (...) for Emissions" error when using timeseries reporting frequency with an hourly timestep. Adds test.
69bfdc701a Merge pull request #1009 from NREL/negative_peak_flow_rate2
6dc6c90a99 Merge branch 'master' into storm_window
728cd434b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
0f17eb2f4c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
10b34a63ed Merge branch 'storm_window' of https://github.com/NREL/OpenStudio-HPXML into storm_window
42df3168d8 run update_measures
3aeb7539c4 call the property storm_type
fab02601e0 cleanup geometry.rb
73e8275514 Latest results.
01bc9c38f1 Merge branch 'battery_usable_capacity' of https://github.com/NREL/OpenStudio-HPXML into battery_usable_capacity
fc41f3058e Simplify defaulting (and update documentation related to defaulting). Also adds a few more defaulting tests to increase code coverage and updates the pull_request_template.
cced36e3d8 Fix hpxml_translator_test
31f321c4f3 Update sample files for storm windows
377a3cbf0b Bugfix
1e970d49c4 Latest results.
588e464793 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into battery_usable_capacity
201abd5714 Update docs and changelog. Fix/improve defaulting calculations.
fda505a8d9 Update measure argument description.
5ea2342916 Update changelog and docs.
a63142a44f Add reporting test for advanced output variables.
4516ec9563 Merge branch 'storm_window' of https://github.com/NREL/OpenStudio-HPXML into storm_window
a5e8be6a70 update HVAC autosizing algorithm to incorporate the presence of storms
1115c63363 Latest results.
d0a01f3132 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
27a56cacc1 Merge branch 'storm_window' of https://github.com/NREL/OpenStudio-HPXML into storm_window
91905fe3e3 Expose inputs for storm windows in the BuildResidentialHPXML; update docs; update unit tests
f574c52e84 Add reporting test and update template osw.
18193edc88 Add new optional argument for output variables.
36c72901ae Latest results.
d2c0eaa532 Merge branch 'battery_usable_capacity' of https://github.com/NREL/OpenStudio-HPXML into battery_usable_capacity
830a1f9548 Update default usable capacity fraction to 90%.
7807673124 Latest results.
36b36f4560 Fix test.
ccac6c5785 Use HPXML's `Battery/UsableCapacity` when provided; defaults the same as before. Also updates the initial SOC from 0.5 to 0.
dbe13af71e Update HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
2b54079771 Update HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
86c7875edb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
75c2bcdac3 Update HPXMLtoOpenStudio/resources/constructions.rb
24e8530e83 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
07c371533e Merge branch 'storm_window' of https://github.com/NREL/OpenStudio-HPXML into storm_window
fb2f9d9145 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
93289fd247 Latest results.
19c1d61fcf Update translator test for storm windows
7b69a4427d forgot to commit the updated test files
296aa8ce98 bugfix
20dbe7b243 run tasks.rb update_measures
4255218a5f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into storm_window
a6f922f251 first pass

git-subtree-dir: hpxml-measures
git-subtree-split: 56b27af87dccb842a5e65e961ee9042f9f24646b
@shorowit shorowit self-assigned this Apr 7, 2022
shorowit and others added 16 commits April 6, 2022 19:11
41bd7f8db9 Merge branch 'end-use-heating-hp-backup' of https://github.com/NREL/OpenStudio-HPXML into end-use-heating-hp-backup
74456edfb5 Update Changelog.md; call out as a breaking change. [ci skip]

git-subtree-dir: hpxml-measures
git-subtree-split: 41bd7f8db99ca0bad04a89e5e165b387dd34af1f
7fd8911e7d Forgot to save.
c76b9ef8ca Expand workflow tests to separately check for backup heating energy use. And a little DFHP code simplification.

git-subtree-dir: hpxml-measures
git-subtree-split: 7fd8911e7dc82a69ef78d3bbe48e57852f86446c
…end-use-heating-hp-backup

# Conflicts:
#	workflow/design.rb
ffe500b410 DFHP bugfix.

git-subtree-dir: hpxml-measures
git-subtree-split: ffe500b410d21cf1426a744364f04eb12b053d8d
d1b9f2be37 DFHP bugfix, take 2.

git-subtree-dir: hpxml-measures
git-subtree-split: d1b9f2be37e713f01a8ce7dea5937e57011ac174
@shorowit shorowit marked this pull request as ready for review April 8, 2022 00:41
@shorowit shorowit merged commit c801d2f into master Apr 8, 2022
@shorowit shorowit deleted the end-use-heating-hp-backup branch April 8, 2022 00:41
gensc004 pushed a commit to houserater/OpenStudio-ERI that referenced this pull request Jul 8, 2022
d3ddf0762 Merge pull request NREL#760 from NREL/default_duct_fractions
5f4f7d500 When duct surface areas are defaulted, also populate the HPXML FractionDuctArea elements for informational purposes.
97cc4bb93 Merge pull request NREL#759 from NREL/comploads_fix
ca00dce53 Latest results.
b99420f7c Small bugfix to prevent remote possibility of component loads not being written.
03188d6b5 Prevent warnings in a few other situations (tasks and unit tests).
3b9580998 Merge pull request NREL#667 from NREL/os_v320
45b94e842 Latest results.
b5dac6a03 Bump docker to official 3.2.0 tag
57df9c148 temporary fix for "warning: Using the last argument as keyword parameters is deprecated"
19e3a7d3c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3f20cef89 Merge pull request NREL#751 from NREL/dryer_extension_elements
0d01af09d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
fede5c7f3 Merge pull request NREL#752 from NREL/min_assembly_rvalue
626db6c25 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
b92577e4c Sync w/ latest HPXML v3.1 proposed schema
86351b459 Merge pull request NREL#745 from NREL/config-changes
437d08870 Rename
4f11dc3b8 Typo
39d9bfb4b First pass.
a943470e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
4a57162e0 Latest results.
8346c526b Latest results.
13d95bbf3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
f29c07e72 Test commit.
f39561c99 Merge pull request NREL#748 from NREL/infiltration_unvented_spaces
01def24c5 Merge branch 'master' into config-changes
4880ad9af Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into infiltration_unvented_spaces
93c920a02 A little code cleanup; update changelog.
c9ba9cf4c Adds a small amount of infiltration to unvented spaces.
6b3cf929c Merge pull request NREL#746 from NREL/coverage
245264fe8 Re-specify head for build checkout.
8ccbc50dc Latest results.
e111893a6 Bump docker version
20b7845e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
a3f9c3a29 Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
b2d073b22 Remove ready for review event.
b8d62ae7b Latest results.
6eacc4986 Latest results.
449c8fb3b Remove temp code.
dddd146be Remove debugs.
71ac3e31c Revert compare job.
1e09096b1 Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
1a0b1b22e Skip results for which there is no comparison.
bfdd96605 Latest results.
5aafff855 Run tests that produce results.
9340e1429 Try 3.
4cfbfde11 Debug, try 2.
25a2b952c Debug, try 1.
8c437b0f6 Remove temp code.
6be5a6c0f Further clean up config.
fc402710b Remove temp code.
807a83a8b Update config and temp code.
a0271e172 Remove temp code.
58b23364f Temp change code.
34da9ad80 Move update-results job into build job.
a3b09ed62 Specify head sha at checkout, and update results for draft mode.
c9d240af1 Latest results.
5c6f3149f Merge branch 'master' into os_v320
61c0c0087 Filter out OS warning for now.
df50af996 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
e92813fc7 Default to idf.
ec3838c68 Latest results.
891e57f8e Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
970a833f0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
8cc70a561 Merge pull request NREL#679 from NREL/epjson
7ea1edd11 Revert to original state
fbe4c588b Adds argument to run_simulation.rb
8bd77e27a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
398657ad2 Merge pull request NREL#597 from NREL/ems_actuator_view_factor_to_ground
25fc01796 Latest results.
e15de3bcb Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
38c3b21bd Merge pull request NREL#552 from NREL/generators-additional-fuels
a71dcd300 Latest results.
792a1d78a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
9a578a74b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3ff7c6aee Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
2cbefb6e3 Exclude new warning
1cfee1f5d Switch back to official ep binary
0203b411f Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
78bbaac3e Update version.
4987cf999 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
3258f1e7f No longer skip test.
d1119ff0e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
dda19d1ab Remove workaround.
335445925 Saving state.
3ab824e45 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
43d244b35 change variable names in test_constructions.rb and create a new util.rb under \tests
0c341cc41 update actuator name and move get_ems_values to util.rb
9fa265d2a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
2441596e2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
88559efaf Update Changelog.md
d5d10c4c0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
fc1b5f0a0 Merge branch 'ems_actuator_view_factor_to_ground' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
a4632e559 update test_constructions and unexpected warnings for HPWHs
22c0386d5 Switches run_simulation.rb to use epJSON instead of IDF. Untested due to OS installer bug.
2be26288a Delete USA_OR_Baker.Muni.AP.726886_TMY3.epw
b59899ece Delete USA_OR_Baker.Muni.AP.726886_TMY3-cache.csv
c249d37a1 add weather files that were accidentally removed
8a817b1ac fix meta_measure.rb
3c40c3a53 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ba48c42f1 Update Changelog.md.
a06052491 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
60a1a22e8 Disable test files for now.
0c513141e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
35700a057 Update references to OS 3.1.0.
48f9b4632 Switch to new QuadLinear/QuintLinear curves for EquationFit coils.
a41266309 Fix use of ElectricLoadCenterDistribution per NREL/OpenStudio#4180
a3f071298 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
aaae90590 First pass.
573f572fb set the calling point to `BeginZoneTimestepAfterInitHeatBalance` as per NREL/EnergyPlus#8477 (comment)
8d43be818 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ae017578b create one ems sensor for shading coefficients and create ems program per subsurface type
e4bc0096f update EMS program to use the schedule value from the trans_sch
b4f99ac46 first pass
5a592f038 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
29d0aa394 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
ec9c1605f Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
cf7188d1f Bugfix.
7765f9fae Allows additional fuel types for generators. Requires changes to EnergyPlus first -- NREL/EnergyPlus#8413.

git-subtree-dir: hpxml-measures
git-subtree-split: d3ddf0762e7d82ace1cf0c7e699d070a3743e84c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant