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

Additional fuel types for Generator:*Turbine objects #8413

Merged
merged 2 commits into from
Dec 15, 2020

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Dec 8, 2020

Pull request overview

Allows additional fuel types for Generator:CombustionTurbine and Generator:MicroTurbine.

Tested locally that the additional fuels correctly show up in End Uses output table as well as the appropriate meter/variable outputs in eplusmtr.csv and eplusout.csv. Here is an example test file I used (minor changes from ExampleFiles/Generators.idf):
Generators-FuelOilNo2.idf.txt

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  • Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  • Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
  • Author should provide a "walkthrough" of relevant code changes using a GitHub code review comment process
  • If any diffs are expected, author must demonstrate they are justified using plots and descriptions
  • If changes fix a defect, the fix should be demonstrated in plots and descriptions
  • If any defect files are updated to a more recent version, upload new versions here or on DevSupport
  • If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  • If structural output changes, add to output rules file and add OutputChange label
  • If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies

Reviewer

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • If branch is behind develop, merge develop and build locally to check for side effects of the merge
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified
  • Check that performance is not impacted (CI Linux results include performance check)
  • Run Unit Test(s) locally
  • Check any new function arguments for performance impacts
  • Verify IDF naming conventions and styles, memos and notes and defaults
  • If new idf included, locally check the err file and other outputs

@shorowit shorowit added IDDChange Code changes impact the IDD file (cannot be merged after IO freeze) NewFeature Includes code to add a new feature to EnergyPlus labels Dec 8, 2020
@shorowit shorowit self-assigned this Dec 8, 2020
shorowit added a commit to NREL/OpenStudio-HPXML that referenced this pull request Dec 8, 2020
@mitchute
Copy link
Collaborator

This looks straightforward. I'm not seeing anything that should cause problems with recent merges, but I merged in develop one more time just to get the CI instances off of dead center. I'll run some tests, but I think this could go in shortly. IDD-BDFL (@mjwitte), do you want to take a quick look at the IDD changes here before this goes in?

@mitchute mitchute merged commit 9d6116a into develop Dec 15, 2020
@mitchute mitchute deleted the combustion-generators-fuel-types branch December 15, 2020 11:58
@shorowit shorowit added this to the EnergyPlus 9.5.0 milestone Jan 12, 2021
jmarrec added a commit to NREL/OpenStudio that referenced this pull request Feb 24, 2021
…orts

Generator:CombustionTurbine isn't wrapped in OS
Additional fuel types for Generator:*Turbine objects NREL/EnergyPlus#8413
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Apr 22, 2021
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
bb4dda748 Merge pull request #714 from NREL/energystar
0c78520e3 Latest results.
2eed79322 Remove a couple sample files.
e554f406f Minor change.
26779da97 Merge branch 'energystar' of https://github.com/NREL/OpenStudio-HPXML into energystar
5da30c8c0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into energystar
869339ced Merge pull request #698 from NREL/room-ac-curve
38e43778c Update Changelog.md
bbcd3c8df Latest results.
67037b43e Update test values.
1bcee2ae6 Fix some sample files.
c906fd89e Latest results.
6d19aec5e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-ac-curve
45090254d Set number of return registers for ducted evap cooler sample file.
9e4d116d0 Update reporting measure test.
3fd709f4a Misc changes for ENERGY STAR.
e7a24f13a use constant 1 fFF curves, Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into room-ac-curve
8cc70a561 Merge pull request #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 #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 #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
e86f5efc0 replace room-ac curve by cutler curves
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: ec3838c684b84a6f0bd093741aa810011be6f924
joseph-robertson added a commit to urbanopt/urbanopt-example-geojson-project that referenced this pull request Apr 27, 2021
…fdd87dde..badd365a884

badd365a884 Merge branch 'os_v320' into build-res-hpxml-v3-os-v320
5c6f3149fcd Merge branch 'master' into os_v320
23bb2fc0b9e Merge branch 'master' into build-res-hpxml-v3
27d91cb6c8a Merge pull request #726 from NREL/energystar2
c6c4601a4c1 Latest results.
0e765d73deb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into energystar2
9fc9ebd963c Handle -1 HVAC capacities.
0f852e509d1 Merge pull request #727 from NREL/cli_spec_reporter
24607bde690 Allows the spec reporter when running tests via the OS CLI.
24fde0b8861 Fix WLHP fan energy.
862ca4b892f No longer need this.
61c0c008770 Filter out OS warning for now.
df50af99630 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
e92813fc7d2 Default to idf.
ec3838c684b Latest results.
891e57f8e8d Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
970a833f04d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
8cc70a561d2 Merge pull request #679 from NREL/epjson
7ea1edd11d2 Revert to original state
fbe4c588b0e Adds argument to run_simulation.rb
8bd77e27ad9 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
398657ad238 Merge pull request #597 from NREL/ems_actuator_view_factor_to_ground
25fc0179617 Latest results.
e15de3bcb44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
38c3b21bd34 Merge pull request #552 from NREL/generators-additional-fuels
a71dcd300cc Latest results.
792a1d78a7c Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
9a578a74b36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3ff7c6aee74 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
2cbefb6e311 Exclude new warning
1cfee1f5dcd Switch back to official ep binary
0203b411f94 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
78bbaac3ee0 Update version.
4987cf99908 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
3258f1e7f2a No longer skip test.
d1119ff0ece Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
dda19d1ab18 Remove workaround.
3354459252a Saving state.
3ab824e458a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
43d244b35eb change variable names in test_constructions.rb and create a new util.rb under \tests
0c341cc414d update actuator name and move get_ems_values to util.rb
9fa265d2a44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
2441596e2d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
88559efafd9 Update Changelog.md
d5d10c4c0a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
fc1b5f0a0d1 Merge branch 'ems_actuator_view_factor_to_ground' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
a4632e55975 update test_constructions and unexpected warnings for HPWHs
22c0386d5e6 Switches run_simulation.rb to use epJSON instead of IDF. Untested due to OS installer bug.
2be26288ae8 Delete USA_OR_Baker.Muni.AP.726886_TMY3.epw
b59899ece4c Delete USA_OR_Baker.Muni.AP.726886_TMY3-cache.csv
c249d37a17f add weather files that were accidentally removed
8a817b1ac2d fix meta_measure.rb
3c40c3a53a3 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ba48c42f1c9 Update Changelog.md.
a0605249129 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
60a1a22e8fc Disable test files for now.
0c513141e4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
35700a0570e Update references to OS 3.1.0.
48f9b4632c0 Switch to new QuadLinear/QuintLinear curves for EquationFit coils.
a412663099f Fix use of ElectricLoadCenterDistribution per NREL/OpenStudio#4180
a3f071298ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
aaae9059014 First pass.
573f572fb0b set the calling point to `BeginZoneTimestepAfterInitHeatBalance` as per NREL/EnergyPlus#8477 (comment)
8d43be8188c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ae017578ba4 create one ems sensor for shading coefficients and create ems program per subsurface type
e4bc0096fc1 update EMS program to use the schedule value from the trans_sch
b4f99ac46cf first pass
5a592f03808 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
29d0aa394ae Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
ec9c1605fd0 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
cf7188d1fd4 Bugfix.
7765f9fae93 Allows additional fuel types for generators. Requires changes to EnergyPlus first -- NREL/EnergyPlus#8413.

git-subtree-dir: example_project/resources/hpxml-measures
git-subtree-split: badd365a884991f889909ce45045ac8028790ed0
joseph-robertson added a commit to NREL/resstock that referenced this pull request May 5, 2021
…f0800

6cb188f0800 Merge pull request #728 from NREL/build-res-hpxml-v3-os-v320
3f459c426bc Merge branch 'build-res-hpxml-v3' into build-res-hpxml-v3-os-v320
30334074fce Merge branch 'master' into build-res-hpxml-v3
03188d6b53f Prevent warnings in a few other situations (tasks and unit tests).
3b958099844 Merge pull request #667 from NREL/os_v320
45b94e8425e Latest results.
b5dac6a031b Bump docker to official 3.2.0 tag
57df9c14876 temporary fix for "warning: Using the last argument as keyword parameters is deprecated"
19e3a7d3ccf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
6acfd16da1b Latest results.
0802d7ce0a6 Merge branch 'master' into build-res-hpxml-v3
3f20cef8996 Merge pull request #751 from NREL/dryer_extension_elements
0d01af09dcd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
fede5c7f388 Merge pull request #752 from NREL/min_assembly_rvalue
626db6c254d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
b92577e4c0c Sync w/ latest HPXML v3.1 proposed schema
86351b459e2 Merge pull request #745 from NREL/config-changes
437d0887002 Rename
4f11dc3b82b Typo
39d9bfb4b51 First pass.
a943470e89b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
4a57162e0f2 Latest results.
8346c526b18 Latest results.
13d95bbf336 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
f29c07e72b8 Test commit.
f39561c992d Merge pull request #748 from NREL/infiltration_unvented_spaces
01def24c565 Merge branch 'master' into config-changes
4880ad9af64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into infiltration_unvented_spaces
93c920a0225 A little code cleanup; update changelog.
c9ba9cf4c46 Adds a small amount of infiltration to unvented spaces.
6b3cf929c0b Merge pull request #746 from NREL/coverage
245264fe8a9 Re-specify head for build checkout.
8ccbc50dca2 Latest results.
3e9e72d15b9 Merge branch 'master' into build-res-hpxml-v3
e111893a64f Bump docker version
20b7845e0f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
ac8f3cb3b63 The OS CLI does not work nicely with simplecov, so restrict to CI + non-CLI usage.
a3f9c3a293b Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
b2d073b2220 Remove ready for review event.
b8d62ae7b34 Latest results.
6eacc4986af Latest results.
449c8fb3b33 Remove temp code.
dddd146beca Remove debugs.
71ac3e31c21 Revert compare job.
1e09096b1fc Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
1a0b1b22e2c Skip results for which there is no comparison.
bfdd9660501 Latest results.
5aafff85574 Run tests that produce results.
9340e142967 Try 3.
4cfbfde11d7 Debug, try 2.
25a2b952c4f Debug, try 1.
8c437b0f639 Remove temp code.
6be5a6c0f88 Further clean up config.
fc402710b93 Remove temp code.
807a83a8b56 Update config and temp code.
a0271e1726a Remove temp code.
58b23364f01 Temp change code.
34da9ad805e Move update-results job into build job.
5be6bc7c799 Re-enable code coverage (posted as CI artifacts).
a3b09ed62e3 Specify head sha at checkout, and update results for draft mode.
fdeaba88013 Refine files included in release zips. Update copyright dates.
a1e2ac43979 Merge pull request #743 from NREL/schematron_ids
5a8d4157fc5 Update Changelog.md
74dd78c6956 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schematron_ids
a2c985f4ab5 Adds IDs where possible into the schematron error messages.
0572b3622d3 Update set min per item arg type.
c9d240af14c Latest results.
badd365a884 Merge branch 'os_v320' into build-res-hpxml-v3-os-v320
5c6f3149fcd Merge branch 'master' into os_v320
61c0c008770 Filter out OS warning for now.
df50af99630 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
e92813fc7d2 Default to idf.
ec3838c684b Latest results.
891e57f8e8d Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
970a833f04d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
8cc70a561d2 Merge pull request #679 from NREL/epjson
7ea1edd11d2 Revert to original state
fbe4c588b0e Adds argument to run_simulation.rb
8bd77e27ad9 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
398657ad238 Merge pull request #597 from NREL/ems_actuator_view_factor_to_ground
25fc0179617 Latest results.
e15de3bcb44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
38c3b21bd34 Merge pull request #552 from NREL/generators-additional-fuels
a71dcd300cc Latest results.
792a1d78a7c Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
9a578a74b36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3ff7c6aee74 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
2cbefb6e311 Exclude new warning
1cfee1f5dcd Switch back to official ep binary
0203b411f94 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
78bbaac3ee0 Update version.
4987cf99908 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
3258f1e7f2a No longer skip test.
d1119ff0ece Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
dda19d1ab18 Remove workaround.
3354459252a Saving state.
3ab824e458a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
43d244b35eb change variable names in test_constructions.rb and create a new util.rb under \tests
0c341cc414d update actuator name and move get_ems_values to util.rb
9fa265d2a44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
2441596e2d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
88559efafd9 Update Changelog.md
d5d10c4c0a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
fc1b5f0a0d1 Merge branch 'ems_actuator_view_factor_to_ground' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
a4632e55975 update test_constructions and unexpected warnings for HPWHs
22c0386d5e6 Switches run_simulation.rb to use epJSON instead of IDF. Untested due to OS installer bug.
2be26288ae8 Delete USA_OR_Baker.Muni.AP.726886_TMY3.epw
b59899ece4c Delete USA_OR_Baker.Muni.AP.726886_TMY3-cache.csv
c249d37a17f add weather files that were accidentally removed
8a817b1ac2d fix meta_measure.rb
3c40c3a53a3 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ba48c42f1c9 Update Changelog.md.
a0605249129 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
60a1a22e8fc Disable test files for now.
0c513141e4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
35700a0570e Update references to OS 3.1.0.
48f9b4632c0 Switch to new QuadLinear/QuintLinear curves for EquationFit coils.
a412663099f Fix use of ElectricLoadCenterDistribution per NREL/OpenStudio#4180
a3f071298ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
aaae9059014 First pass.
573f572fb0b set the calling point to `BeginZoneTimestepAfterInitHeatBalance` as per NREL/EnergyPlus#8477 (comment)
8d43be8188c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ae017578ba4 create one ems sensor for shading coefficients and create ems program per subsurface type
e4bc0096fc1 update EMS program to use the schedule value from the trans_sch
b4f99ac46cf first pass
5a592f03808 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
29d0aa394ae Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
ec9c1605fd0 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
cf7188d1fd4 Bugfix.
7765f9fae93 Allows additional fuel types for generators. Requires changes to EnergyPlus first -- NREL/EnergyPlus#8413.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 6cb188f0800b0027f9e62a681e66bebe31266587
joseph-robertson added a commit to NREL/resstock that referenced this pull request May 5, 2021
…b9a8c

93239cb9a8c Merge branch 'build-res-hpxml-v3' into build-res-hpxml-v3-flex
6cb188f0800 Merge pull request #728 from NREL/build-res-hpxml-v3-os-v320
3f459c426bc Merge branch 'build-res-hpxml-v3' into build-res-hpxml-v3-os-v320
30334074fce Merge branch 'master' into build-res-hpxml-v3
03188d6b53f Prevent warnings in a few other situations (tasks and unit tests).
3b958099844 Merge pull request #667 from NREL/os_v320
45b94e8425e Latest results.
b5dac6a031b Bump docker to official 3.2.0 tag
57df9c14876 temporary fix for "warning: Using the last argument as keyword parameters is deprecated"
19e3a7d3ccf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
6acfd16da1b Latest results.
0802d7ce0a6 Merge branch 'master' into build-res-hpxml-v3
3f20cef8996 Merge pull request #751 from NREL/dryer_extension_elements
0d01af09dcd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
fede5c7f388 Merge pull request #752 from NREL/min_assembly_rvalue
626db6c254d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dryer_extension_elements
b92577e4c0c Sync w/ latest HPXML v3.1 proposed schema
86351b459e2 Merge pull request #745 from NREL/config-changes
437d0887002 Rename
4f11dc3b82b Typo
39d9bfb4b51 First pass.
a943470e89b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
4a57162e0f2 Latest results.
8346c526b18 Latest results.
13d95bbf336 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into config-changes
f29c07e72b8 Test commit.
f39561c992d Merge pull request #748 from NREL/infiltration_unvented_spaces
01def24c565 Merge branch 'master' into config-changes
4880ad9af64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into infiltration_unvented_spaces
93c920a0225 A little code cleanup; update changelog.
c9ba9cf4c46 Adds a small amount of infiltration to unvented spaces.
6b3cf929c0b Merge pull request #746 from NREL/coverage
245264fe8a9 Re-specify head for build checkout.
8ccbc50dca2 Latest results.
e111893a64f Bump docker version
20b7845e0f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
ac8f3cb3b63 The OS CLI does not work nicely with simplecov, so restrict to CI + non-CLI usage.
a3f9c3a293b Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
b2d073b2220 Remove ready for review event.
b8d62ae7b34 Latest results.
6eacc4986af Latest results.
449c8fb3b33 Remove temp code.
dddd146beca Remove debugs.
71ac3e31c21 Revert compare job.
1e09096b1fc Merge branch 'config-changes' of github.com:NREL/OpenStudio-HPXML into config-changes
1a0b1b22e2c Skip results for which there is no comparison.
bfdd9660501 Latest results.
5aafff85574 Run tests that produce results.
9340e142967 Try 3.
4cfbfde11d7 Debug, try 2.
25a2b952c4f Debug, try 1.
8c437b0f639 Remove temp code.
6be5a6c0f88 Further clean up config.
fc402710b93 Remove temp code.
807a83a8b56 Update config and temp code.
a0271e1726a Remove temp code.
58b23364f01 Temp change code.
34da9ad805e Move update-results job into build job.
5be6bc7c799 Re-enable code coverage (posted as CI artifacts).
a3b09ed62e3 Specify head sha at checkout, and update results for draft mode.
0572b3622d3 Update set min per item arg type.
c9d240af14c Latest results.
badd365a884 Merge branch 'os_v320' into build-res-hpxml-v3-os-v320
5c6f3149fcd Merge branch 'master' into os_v320
61c0c008770 Filter out OS warning for now.
df50af99630 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
e92813fc7d2 Default to idf.
ec3838c684b Latest results.
891e57f8e8d Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into os_v320
970a833f04d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
8cc70a561d2 Merge pull request #679 from NREL/epjson
7ea1edd11d2 Revert to original state
fbe4c588b0e Adds argument to run_simulation.rb
8bd77e27ad9 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
398657ad238 Merge pull request #597 from NREL/ems_actuator_view_factor_to_ground
25fc0179617 Latest results.
e15de3bcb44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
38c3b21bd34 Merge pull request #552 from NREL/generators-additional-fuels
a71dcd300cc Latest results.
792a1d78a7c Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
9a578a74b36 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
3ff7c6aee74 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
2cbefb6e311 Exclude new warning
1cfee1f5dcd Switch back to official ep binary
0203b411f94 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
78bbaac3ee0 Update version.
4987cf99908 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
3258f1e7f2a No longer skip test.
d1119ff0ece Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
dda19d1ab18 Remove workaround.
3354459252a Saving state.
3ab824e458a Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into epjson
43d244b35eb change variable names in test_constructions.rb and create a new util.rb under \tests
0c341cc414d update actuator name and move get_ems_values to util.rb
9fa265d2a44 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
2441596e2d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
88559efafd9 Update Changelog.md
d5d10c4c0a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
fc1b5f0a0d1 Merge branch 'ems_actuator_view_factor_to_ground' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
a4632e55975 update test_constructions and unexpected warnings for HPWHs
22c0386d5e6 Switches run_simulation.rb to use epJSON instead of IDF. Untested due to OS installer bug.
2be26288ae8 Delete USA_OR_Baker.Muni.AP.726886_TMY3.epw
b59899ece4c Delete USA_OR_Baker.Muni.AP.726886_TMY3-cache.csv
c249d37a17f add weather files that were accidentally removed
8a817b1ac2d fix meta_measure.rb
3c40c3a53a3 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ba48c42f1c9 Update Changelog.md.
a0605249129 Merge branch 'os_v320' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
60a1a22e8fc Disable test files for now.
0c513141e4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
35700a0570e Update references to OS 3.1.0.
48f9b4632c0 Switch to new QuadLinear/QuintLinear curves for EquationFit coils.
a412663099f Fix use of ElectricLoadCenterDistribution per NREL/OpenStudio#4180
a3f071298ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os_v320
aaae9059014 First pass.
573f572fb0b set the calling point to `BeginZoneTimestepAfterInitHeatBalance` as per NREL/EnergyPlus#8477 (comment)
8d43be8188c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ems_actuator_view_factor_to_ground
ae017578ba4 create one ems sensor for shading coefficients and create ems program per subsurface type
e4bc0096fc1 update EMS program to use the schedule value from the trans_sch
b4f99ac46cf first pass
5a592f03808 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
29d0aa394ae Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
ec9c1605fd0 Merge branch 'generators' of https://github.com/NREL/OpenStudio-HPXML into generators-additional-fuels
cf7188d1fd4 Bugfix.
7765f9fae93 Allows additional fuel types for generators. Requires changes to EnergyPlus first -- NREL/EnergyPlus#8413.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 93239cb9a8c40bbf9c5bde382c5a80e89b12380f
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request May 12, 2021
d3ddf0762 Merge pull request #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 #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 #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 #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 #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 #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 #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 #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 #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 #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 #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
IDDChange Code changes impact the IDD file (cannot be merged after IO freeze) NewFeature Includes code to add a new feature to EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants