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

Commercial water heaters #1150

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Commercial water heaters #1150

wants to merge 15 commits into from

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Aug 5, 2022

Pull Request Description

Closes #654. Adds ability to model commercial water heaters w/ thermal efficiency and standby loss (or COP for HPWHs).

TODO:

  • What are the thermal efficiency cutoffs for power vent and condensing?
  • For tankless, what do we do about performance adjustment?
  • Double-check DOE test conditions relative to RESNET spreadsheet.
  • How do we calculate tank UA from %/hr?
  • Why does AHRI have non-zero standby losses for instantaneous tankless water heaters?

Checklist

PR Author: Check these when they're done. Not all may apply. strikethrough and check any that do not apply.

PR Reviewer: Verify each has been completed.

  • Schematron validator (EPvalidator.xml) has been updated
  • Sample files have been added/updated (via tasks.rb)
  • Unit tests have been added/updated (e.g., HPXMLtoOpenStudio/tests)
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • Checked the code coverage report on CI
  • No unexpected changes to simulation results of sample files

@shorowit shorowit added the enhancement New feature or request label Aug 5, 2022
@shorowit shorowit self-assigned this Aug 5, 2022
@jmaguire1
Copy link
Collaborator

Some answers to the TODO questions:

What are the thermal efficiency cutoffs for power vent and condensing?
We only really care about this for capturing how much of the losses go to the space. Even minimum efficiency commercial gas WHs have a flue damper (likely required by law, although I haven't confirmed that), which in terms of space conditioning impacts is more like a power vent. There's a really clear cutoff in the AHRI data between TEs of 0.82 and 0.91 between condensing and noncondensing equipment, so I'd propose treat anything with a TE > 0.9 as "condensing" and everything with a TE < 0.9 as "power vent".
For tankless, what do we do about performance adjustment?
The performance adjustment we apply now (an 8% derate) is a function of the draw profile more than anything else. Since we're going to be subjecting these to the same draw profile regardless of whether it's a residential or commercial project, I'd suggest consistency and keeping the 8% derate. Of course someday we could implement an explicit tankless model and not have to worry about this, but I think in terms of annual gas consumption we're talking +/- a few %.
Double-check DOE test conditions relative to RESNET spreadsheet.
Residential and commercial products are tested under different conditions, and what's in the spreadsheet right now looks like the residential conditions, not commercial. In the commercial test procedure the mains temperature is 70 F (not 58) and ambient air temperature is 75 F (not 67.5). WH setpoint temperature is also 140 F (not 125).
How do we calculate tank UA from %/hr?
The CFR actually has equations for this specified. Interestingly, even when testing a gas product the equations in the CFR first calculate the losses as %/hr and then convert to btu/hr using this equation: SL (Btu per hour) = S (% per hour) × 8.25 (Btu/gal- °F) × Measured Volume (gal) × 70 ( °F). This equation came from section 7.2.6.2 of Appendix A if anyone is curious.
Why does AHRI have non-zero standby losses for instantaneous tankless water heaters?
Definitely wasn't expecting this! It turns out the standard for commercial WHs does actually require this to be measured (along with the heat exchanger volume). It seems like they do this test by running some steady state draws at the specified outlet temperature (140 F), and then let the system sit idle until the measured water temperature is 35 F lower than it started at. In terms of what this means for our models: not much. Any losses when the tankless is operating are subsumed into our 8% derate, so I don't think we need to do anything special here. If we had a more explicit tankless model then this would likely be an input to our model, but as it stands now nothing special needs to be done about this.

@shorowit : I think that's the current list, but if any more questions come up let me know!

@shorowit shorowit added this to the 1.5.0 milestone Sep 9, 2022
shorowit and others added 2 commits September 13, 2022 13:44
…o commercial_water_heaters

# Conflicts:
#	BuildResidentialHPXML/measure.xml
#	Changelog.md
#	HPXMLtoOpenStudio/measure.xml
#	HPXMLtoOpenStudio/tests/test_validation.rb
#	docs/source/workflow_inputs.rst
#	workflow/tests/base_results/results.csv
#	workflow/tests/base_results/results_bills.csv
@shorowit shorowit removed this from the 1.5.0 milestone Sep 19, 2022
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Sep 29, 2022
02f3cf405 Update to latest HPXML schema for standby losses. Code backported from NREL/OpenStudio-HPXML#1150.
f62df2c38 Merge pull request #1183 from NREL/ground_conductivity
a7fffdf29 Latest results.
f0ab7cfb2 Use for GSHP model too.
813d36712 Latest results.
77f053032 Merge branch 'ground_conductivity' of https://github.com/NREL/OpenStudio-HPXML into ground_conductivity
bee3915af Bugfix.
98821f1b0 Latest results.
36beee646 Finish docs [ci skip]
4dc30f7ab First pass.
513bfaaa6 Merge pull request #1180 from NREL/surface_type_bugfix
a766a4a6e Fixes possible "Could not identify surface type for surface" error.
fddd2df60 Merge pull request #1179 from NREL/attached_dhw_dist
2da3ebec0 Latest results.

git-subtree-dir: hpxml-measures
git-subtree-split: 02f3cf405b229495fed6d8c9820ff375d576dc3f
…o commercial_water_heaters

# Conflicts:
#	BuildResidentialHPXML/measure.rb
#	BuildResidentialHPXML/measure.xml
#	HPXMLtoOpenStudio/measure.xml
#	HPXMLtoOpenStudio/resources/waterheater.rb
joseph-robertson added a commit to NREL/resstock that referenced this pull request Oct 5, 2022
…141e8

b53481141e8 Catch unmet hours for outage sample files.
ad390f482aa Include limits for unmet hours schedule files.
d0a2d9a31dc Fix utility bill test file.
04460a71576 Updates to workflow inputs docs.
903d442a890 Add sample files for heating, cooling season only.
c0ffa282937 Fix up schedules tests.
e540d48ef28 Fix unmet hours program for simple seasons.
591e0e270a8 Clean up defaults resource.
988cac834eb Default natvent, seasons only if detailed schedules not provided.
877efe2396a Update unmet hours program for detailed seasons.
7bfb66fbf91 Generalize methods so we can support subhourly seasons.
c57c8b6edcc Start filling out seasons from schedule file measure.
0bb1ebd2913 Merge branch 'power-outage' of github.com:NREL/OpenStudio-HPXML into power-outage
726f4292434 Update sample and schedule files.
6a18e956c54 Add object names for sequential fraction schedules.
d78f9e2084a Stub new hourly season methods in schedules resource.
f29085da796 Support hourly sequential fractions and seasons in hvac resource.
75b6ac6ca0f Stub creating season columns from schedule file measure.
f4eb97f27c5 Change from daily seasons to hourly seasons in translator measure.
4a03d5f39be Latest results.
8fe9f64a6cb Typo.
d41be38287f Skip detailed seasons sample file for now.
deb52470c0c Merge branch 'master' into power-outage
2b0108453e5 Fix new schedule test and assign schedule type limits to natvent schedule.
230925090f6 Merge pull request #1191 from NREL/design_temperatures
c4093b93db2 Latest results.
c46885cb6db Add a bunch of tests.
c60665c74c9 Fix switch in airflow resource file.
41a0ad8369f Create natvent column when requested.
28220134852 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into design_temperatures
07b5e5f024b Add design temperatures to output files; update docs.
88a61e3aab7 Merge branch 'master' into power-outage
762a1fcc27d Merge pull request #1190 from NREL/requires
c57d9c88952 Simplify/clean up requires.
b9437c605d8 Update docs and tasks for natvent.
4adb8d34f62 Update resource files and add new schedule file csvs.
e13356ce630 Add natvent arg to schedule file measure.
d34db690c0b Merge pull request #1189 from NREL/standbyloss
02f3cf405b2 Update to latest HPXML schema for standby losses. Code backported from NREL/OpenStudio-HPXML#1150.
bf6eac452b6 Latest results.
99fdbbb5da1 Set outage from translator schedules resource.
843bb11b79b Match outage dates to vacancy dates.
61a00344c1d Latest results.
972ab04dee3 Update docs similar to vacancy.
7c37f7a1a30 Add sample file for specifying outage period.
dab965c449d Add support for outage in translator schedules resource.
ff8b8da7224 Update schedule file measure for new outage argument.
f62df2c38c2 Merge pull request #1183 from NREL/ground_conductivity
a7fffdf298c Latest results.
f0ab7cfb2df Use for GSHP model too.
813d3671255 Latest results.
77f053032c2 Merge branch 'ground_conductivity' of https://github.com/NREL/OpenStudio-HPXML into ground_conductivity
bee3915af49 Bugfix.
98821f1b039 Latest results.
36beee646e1 Finish docs [ci skip]
4dc30f7ab47 First pass.
513bfaaa605 Merge pull request #1180 from NREL/surface_type_bugfix
a766a4a6e19 Fixes possible "Could not identify surface type for surface" error.
fddd2df6059 Merge pull request #1179 from NREL/attached_dhw_dist
2da3ebec07c Latest results.
92aa5db8368 Revert temporary change.
74887c5393a Fix validation tests.
fbf953329c4 Allows shared dishwasher/clothes washer to be attached to a hot water distribution system instead of a single water heater.
1a129484770 Merge pull request #1177 from NREL/multiple_climate_zones
3a4cc9e7e9d Clarify end use in docs [ci skip]
acd6980a289 FIx test.
b13b89f2708 Updates the HPXML class to support multiple IECC climate zones. OS-HPXML still only allows a single climate zone to be provided (to prevent confusion as to which will be used).

git-subtree-dir: resources/hpxml-measures
git-subtree-split: b53481141e8ab3b84ecf0d61e3d386cc42888319
joseph-robertson added a commit to NREL/resstock that referenced this pull request Oct 10, 2022
…6ebf1

5a94d26ebf1 Remove results_hvac_sizing.csv, now captured as part of results.csv.
47c14dfda30 Latest results.
9e90bfc75d5 Bugfix.
7b1726c021d Minor cleanup.
3dee61034d0 First pass.
4e6d1a66a77 Merge pull request #1193 from NREL/kiva_initial_temp
fcd1cc6bee1 Latest results.
993bc8ae58f Merge branch 'kiva_initial_temp' of https://github.com/NREL/OpenStudio-HPXML into kiva_initial_temp
0350656ee69 Refinements and some unit tests.
43e2bd4099c Latest results.
6fe9c6c6b8b Handle buildings w/o HVAC. Update base-hvac-none.xml to be in a mild climate.
7b5685541b1 s
b6e3af677b1 Some cleanup and better comments.
535b31c084c Update Changelog.md.
01270816cf3 Initial pass at setting a Kiva:Foundation initial temperature better than E+ does.
230925090f6 Merge pull request #1191 from NREL/design_temperatures
c4093b93db2 Latest results.
28220134852 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into design_temperatures
07b5e5f024b Add design temperatures to output files; update docs.
762a1fcc27d Merge pull request #1190 from NREL/requires
c57d9c88952 Simplify/clean up requires.
d34db690c0b Merge pull request #1189 from NREL/standbyloss
02f3cf405b2 Update to latest HPXML schema for standby losses. Code backported from NREL/OpenStudio-HPXML#1150.
f62df2c38c2 Merge pull request #1183 from NREL/ground_conductivity
a7fffdf298c Latest results.
f0ab7cfb2df Use for GSHP model too.
813d3671255 Latest results.
77f053032c2 Merge branch 'ground_conductivity' of https://github.com/NREL/OpenStudio-HPXML into ground_conductivity
bee3915af49 Bugfix.
98821f1b039 Latest results.
36beee646e1 Finish docs [ci skip]
4dc30f7ab47 First pass.
513bfaaa605 Merge pull request #1180 from NREL/surface_type_bugfix
a766a4a6e19 Fixes possible "Could not identify surface type for surface" error.
fddd2df6059 Merge pull request #1179 from NREL/attached_dhw_dist
2da3ebec07c Latest results.
92aa5db8368 Revert temporary change.
74887c5393a Fix validation tests.
fbf953329c4 Allows shared dishwasher/clothes washer to be attached to a hot water distribution system instead of a single water heater.
1a129484770 Merge pull request #1177 from NREL/multiple_climate_zones
3a4cc9e7e9d Clarify end use in docs [ci skip]
acd6980a289 FIx test.
b13b89f2708 Updates the HPXML class to support multiple IECC climate zones. OS-HPXML still only allows a single climate zone to be provided (to prevent confusion as to which will be used).

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 5a94d26ebf140a336fe5c1e1dbecc2bf2abce615
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Oct 24, 2022
df2b9e477 Merge pull request #1184 from NREL/os350
cccb637e2 Update to 3.5.0-rc1
e94640a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
08bf340cf Update README.md [ci skip]
df0fdbbcc Merge pull request #1200 from NREL/wh_location_defaulting_bugfix
06a7b0bf1 Fixes possible ruby error when defaulting water heater location.
4c519231e Merge pull request #1198 from NREL/timestamp_convention
656680f85 Latest results.
fc9fce103 First pass.
a5e00de5a Merge pull request #1197 from NREL/sip_rename
d242f552e Latest results.
cfc0422dc Replaces `WallType/StructurallyInsulatedPanel` with `WallType/StructuralInsulatedPanel` per HPXML schema change.
a86acdd41 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
06530d541 Remove old file.
253c6b2ad Merge pull request #1185 from NREL/cfis_supplemental_fan
9071be55a Update docs
f66159aa7 Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
0e9507816 Adds error-checking around HoursInOperation specified for a CFIS supplemental fan.
1138d1062 Latest results.
bd30d3ec2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d0cf4f78e Merge pull request #1196 from NREL/sync_hpxml
1ba612241 Sync w/ latest HPXML schema.
12fadf0be Merge pull request #1194 from NREL/deprecate_report_hpxml_output
bb4e326e7 Latest results.
9c61140da Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d1bea4e67 Add CFIS definition/description. [ci skip]
5a94d26eb Remove results_hvac_sizing.csv, now captured as part of results.csv.
47c14dfda Latest results.
9e90bfc75 Bugfix.
7b1726c02 Minor cleanup.
3dee61034 First pass.
4e6d1a66a Merge pull request #1193 from NREL/kiva_initial_temp
9a37f9eee Minor code simplification.
d55139bc2 Update defaulting and tests.
fcd1cc6be Latest results.
993bc8ae5 Merge branch 'kiva_initial_temp' of https://github.com/NREL/OpenStudio-HPXML into kiva_initial_temp
0350656ee Refinements and some unit tests.
9005fe10a Update Changelog.md and docs. [ci skip]
43e2bd409 Latest results.
6fe9c6c6b Handle buildings w/o HVAC. Update base-hvac-none.xml to be in a mild climate.
7b5685541 s
b6e3af677 Some cleanup and better comments.
535b31c08 Update Changelog.md.
01270816c Initial pass at setting a Kiva:Foundation initial temperature better than E+ does.
e71eb1a21 Update test.
b4fbf9672 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
45afda16e Latest results.
96f08d39d Update docs [ci skip]
bee170643 Bugfix.
5a8aabdea Latest results.
481bd2f76 Fix tests.
b1b5ec3d8 Update docs. [ci skip]
d87137a1c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
00181ede4 Update tests.
423ec798c Bugfixes. If CFIS supplemental fan is undersized, provide warning and ensure supplemental fan RTF does not exceed 1.
59bdd4bec Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
3a8fab085 Allow supply/exhaust systems only.
230925090 Merge pull request #1191 from NREL/design_temperatures
07309550b Latest results.
c4093b93d Latest results.
8f50ae7b0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
282201348 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into design_temperatures
77f7bce74 Bugfix.
7bef24e6e First pass on applying sensible/latent effectiveness when the CFIS supplemental fan is an ERV/HRV.
07b5e5f02 Add design temperatures to output files; update docs.
762a1fcc2 Merge pull request #1190 from NREL/requires
c57d9c889 Simplify/clean up requires.
978f93f37 Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
7953bbe94 Fix tests.
74b7cf005 Latest results.
cee898a64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d34db690c Merge pull request #1189 from NREL/standbyloss
02f3cf405 Update to latest HPXML schema for standby losses. Code backported from NREL/OpenStudio-HPXML#1150.
87ac9dbb2 Handle outdoor air impact of supplemental fan. (Still need to handle HRV/ERV effectiveness.)
731386c05 Revert PTACHeating change.
c98080595 Latest results.
b2848b45a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
bbaf9b28c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
b2b1ae1f2 Switch to OS:develop
7f8adbf5a Initial model updates and sample file.
f62df2c38 Merge pull request #1183 from NREL/ground_conductivity
a7fffdf29 Latest results.
f0ab7cfb2 Use for GSHP model too.
34f3ff967 Saving progress.
813d36712 Latest results.
77f053032 Merge branch 'ground_conductivity' of https://github.com/NREL/OpenStudio-HPXML into ground_conductivity
bee3915af Bugfix.
98821f1b0 Latest results.
36beee646 Finish docs [ci skip]
4dc30f7ab First pass.

git-subtree-dir: hpxml-measures
git-subtree-split: df2b9e4779f7342ca0e45b87262453c8fab9cf3f
kflemin added a commit to urbanopt/urbanopt-example-geojson-project that referenced this pull request Dec 5, 2022
…502129..5aed387ba

5aed387ba Simplify release process and only create 1 release zip. Link to all EPWs will be in the release notes.
85d5ba707 Bump to 1.5
3b80ccab1 Merge pull request #1228 from NREL/waterheater_rb_cleanup
7848439cf Latest results.
78150fecc Fix use of detailed setpoints w/ hot water recirculation. Switch schedule methods to snake case.
2c3fc1f12 Bugfix.
f25090e04 Disallow desuperheater when detailed water heater setpoints are used.
b59fcb24e Merge branch 'waterheater_rb_cleanup' of https://github.com/NREL/OpenStudio-HPXML into waterheater_rb_cleanup
1d34ad86f Fix use of detailed setpoints w/ combi boiler.
ab2686d8e Latest results.
c0230d538 Some code cleanup. No diffs expected.
4cffb9d69 Merge pull request #1142 from NREL/batteries2
22ba6e76e Merge branch 'master' into batteries2
32c782b6b Merge pull request #1223 from NREL/batteries2-losses2
24f371d0f Update documentation for end use outputs. Minor cleanup.
07f449d68 Merge branch 'batteries2' into batteries2-losses2
60c612d5e Merge branch 'master' into batteries2
a2410dcd7 HPXML XSD limits value to 5. [ci skip]
37af32f1a Merge branch 'master' into batteries2-losses2
501191531 Latest results.
8bb67e530 Merge pull request #1225 from NREL/kiva_initial_temp_8760_setpoints
f1d01cec5 Latest results.
6b689b3a9 Set lifetime model to always None.
0a31d7790 Revert inclusion of Thermal Loss output variable.
fe2a752a4 Disable more lifetime model stuff.
de4780b07 Temporarily disable lifetime model.
b83af419e Latest results.
28af9fe18 Fixes #1224.
aadb0e8ef Merge branch 'batteries2-losses2' of github.com:NREL/OpenStudio-HPXML into batteries2-losses2
09cf3837b Include storage thermal loss output variable.
57ab41a16 Apply cell voltage even when kandlersmith.
a8820932f Minor change. [ci skip]
f337b67e2 Make it easier to know which simulation failed when running simulations in parallel.
fd11e342c Merge branch 'batteries2-losses2' of github.com:NREL/OpenStudio-HPXML into batteries2-losses2
a1ab04b79 Sign change for losses.
7a72a7eec Minor change to EMS program for battery losses
d1451fd58 Try a slightly different approach.
a6cfba004 Update battery tests.
a96e38310 Request and report charge ems output var.
8deb0bf68 Set up charge ems program in battery resource file.
39259b8b6 Merge branch 'batteries2' of github.com:NREL/OpenStudio-HPXML into batteries2
d94e07432 Mention fixing round trip efficiency change for batteries in changelog (as a bug fix)
f8e753d9f Update battery documentation to include mention of how round trip efficiency affects results.
bddd894ed Merge branch 'master' into batteries2
8a01111b5 Bump OS version [ci skip]
b89b7f020 Merge branch 'batteries2' of github.com:NREL/OpenStudio-HPXML into batteries2
b4af9d516 Update epvalidator for round trip efficiency field.
d888b09e0 A bit more. [ci skip]
79e452a85 Reorg Changelog.md a bit [ci skip]
7aeddb1d4 Latest results.
4b4d4f422 Merge branch 'master' into batteries2
335cc1e86 Update new hpxmls after merge.
4602fb355 Test round trip efficiency defaulting.
a55312910 Merge pull request #1221 from NREL/speed_up_has_fuel
1407c27a1 Merge branch 'master' into batteries2
dc4aeec36 Update changelog and docs for new round trip efficiency argument.
95009e21b Add new round trip efficiency sample file.
2803b96a7 Update translator resources for round trip efficiency argument.
7a3e1e4b2 Add battery round trip efficiency argument to build measure.
2e69f46cf Update ReportUtilityBills tests.
1e97e6792 Improve runtime performance around use HPXML::has_fuel.
2ffd554d9 Merge pull request #1163 from NREL/allow_additional_floor_type
c543072db Latest results.
48b1e7a64 Update test.
8ce103f36 Make methods more consistent. Update tests.
351801a67 Hopefully the last change: set DC to DC charging efficiency to match real products (Tesla Powerwall,92.5%), instead of default value (95%)
db1d2ee39 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2fa56eb66 Rename previous FloorTypeFoo constants to FloorOrCeilingFoo.
1ccda9f86 Latest results.
b13eb2df9 Add base-enclosure-floortypes.xml and tests for full coverage. Fix double-counting of interior finish/floor covering material for SIP/concrete floors.
25aa32b72 Only assume osb for floors, not ceilings. Some code cleanup/simplification.
b1f2ccc8f Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
49a07e71d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
50158fa9b Merge pull request #1220 from NREL/seer2_hspf2
d9b08f8b2 Latest results.
b5f8fc48a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into seer2_hspf2
eeded6214 Merge branch 'master' into batteries2
be46c200e Merge pull request #1218 from NREL/address_fuel_warnings
fcbb0afbe Merge branch 'batteries2' of https://github.com/NREL/OpenStudio-HPXML into batteries2
a0cf326b0 Update schedule for batteries. Still includes fractional values, but gives more reasonable maximum charge/discharge rates while still fully cycling the battery daily.
aaba4c68f Latest results.
0669947f2 Fix typo [ci skip]
b6b59d32a Updated SEER2 & HSPF2 conversion factors.
abb21a6d5 Revert tol changes altogether.
c4ba01716 Relax tolerance even more.
a265b7768 Latest results.
172518c47 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into address_fuel_warnings
5d6a3db0f Fix test.
ad202b7ae Merge branch 'master' into batteries2
fbbe19f8b Update battery tests and relax error checking tol.
196e35624 Merge pull request #1219 from NREL/os350final
d49fb9121 Updating tasks.
fd3b1aeba Fix CI error.
91fd2f509 Add tests for floors and ceilings
5123f80cf Merge branch 'batteries2' of https://github.com/NREL/OpenStudio-HPXML into batteries2
8d0634f80 Battery charge/discharge rate should be 6 kW (3 hours to full charge/discharge), not 15 kW.
009ae7588 Revert timeseries tol change.
a5428d7c7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into address_fuel_warnings
3344a3cf8 Add more info to error messages.
bc211d554 Replace FloorTypeSteelStud with FloorTypeSteelFrame
78b42549e Update config.yml
03e2e4a78 Tighten the tolerance in check_for_errors method.
49d027273 Update changelog.
ca7278c66 Merge pull request #1217 from NREL/battery_lifetime_docs
c84f24568 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
fe6f9e786 Closes #1210.
90c4c3eb0 Merge pull request #1216 from NREL/changes_for_eri
afe7e5c42 Run update_measures
a3f70a239 Run update_hpxmls
7b9982516 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
af8a149eb Use a single floor_ceiling method for all floor types
741a85f2f Update base-enclosure-floortypes.xml
09e0bae4d Latest results.
c93afa77b Better document the battery lifetime model input. [ci skip]
8cfe34f5d Merge branch 'master' into batteries2
ee74c0d7b Whoops, resistance should be 2 mOhm, not 0.2!
bbce42c25 Backport.
69dba2891 Revert "Separate "apply" methods for sip or concrete floors and ceilings"
179effe43 Merge pull request #983 from NREL/window-hp
6faea5b4c Latest results.
823555a99 Fix heating capacity reported as zero.
631988519 A little docs cleanup. Issue an error if IntegratedHeatingSystem elements are used for other cooling system types (rather than silently ignoring them).
19f782dc3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
52850cc17 Merge pull request #1214 from NREL/remove_efficiency_defaulting
15e3865d7 Merge branch 'remove_efficiency_defaulting' of https://github.com/NREL/OpenStudio-HPXML into remove_efficiency_defaulting
6be32d6b1 Update Changelog.md [ci skip]
7157dbba2 Latest results.
2a2f6e907 Update HPXML.
c04a13475 Separate "apply" methods for sip or concrete floors and ceilings
8be91be37 Replace wood_stud with wood_frame and steel_stud with steel_frame for floors
317a834a1 Remove deprecated constants
f0253e950 Update BuildResidentialHPXML/measure.rb
6d5c9efd6 First pass.
eee7754d9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
684fec984 Remove old file. [ci skip]
7238f865e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
e68308ce6 Merge pull request #1213 from NREL/latest-hpxml-xsd
ffb742342 Merge branch 'master' into batteries2
15d7c072f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into latest-hpxml-xsd
5b4769a4e Align w/ HPXML master branch. Clean up proposed stuff that didn't make the cut.
86c1f515b Merge pull request #1209 from NREL/os350rc2
3a7438069 Request production even if no pv.
ab87551ab Subtract storage from production for error checking.
cb69febc2 More cleanup.
c0d94e8c9 Bump.
ec850ee91 Bit of cleanup.
6fae85ec6 Update various error messages and tests.
445a39364 Latest results.
566714080 Latest results.
2f3dd7203 Fix tests.
237fd4db1 Use a single battery schedule.
712982793 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
a2f80836f ci fix
dac99023d Include integrated heating system fuel check.
739226ddf Address a bunch of comments.
d9dc49479 minor changes
85cfba4b2 Latest results.
4a6da303f Update to internal resistance, based on values derived from lab data and used in OCHRE.
515cdc377 Latest results.
abf7e54dd Clean up battery resource file.
975b919b3 Update battery test.
074581bbf run update hpxmls
afdabb9ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2039bca5f fix doc
a10c96cbb Fix real home hpxmls
63871de52 fix unit tests
2e1ebb833 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
b12303cc7 Latest results.
ad0ea7b67 Merge branch 'master' into batteries2
d6e982045 Merge pull request #1092 from NREL/bills2
125277de5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
35a6175ae Address final comments.
4016edcb8 Update min/annual charges to be more reasonable. Remove redundant tests.
62924e41d A little bit of reorganization/renaming.
f47c9f91c Latest results.
ff6f294c0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into batteries2
2b35ba358 Latest results.
b5e01636c Simplify docs a bit [ci skip]
fb29b673d Renames "Marginal" to "Energy". Min charges are now captured in Fixed, not Marginal/Energy.
933d3e480 Update docs a bit. Move Sample JSONs so they are available in the release package.
5c91a8572 Remove voltage curve unless detailed battery lifetime model is requested.
772a60384 Update changelog. [ci skip]
f3224d943 Minor cleanup.
176fd79c4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
193bd70b5 bugfix
e889fe4cd Add more tests and a bugfix.
ad607c8e3 Merge branch 'bills2' of https://github.com/NREL/OpenStudio-HPXML into bills2
3a1b30217 Shift min charges from reducing PV credit to increasing energy charges. Now consistent with how min charges are handled when there is no PV.
b0c694d41 Latest results.
5d9dca99e Update HPXMLs
efadd8f32 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
ed3e31f97 Some more code cleanup.
55cac39e7 Fixes calculations for: 1. Detailed rates w/ user-specified excess sellback rate. 2. Detailed rates w/ Tiered & TOU and retail excess sellback rate.
b2b96fe21 Merge pull request #1205 from NREL/measure_code_cleanup
a1b01b323 Latest results.
40010d163 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into measure_code_cleanup
955a554c8 Merge branch 'measure_code_cleanup' of https://github.com/NREL/OpenStudio-HPXML into measure_code_cleanup
6e687b9c1 Bugfixes.
d62f01929 Latest results.
97bf38d36 Merge pull request #1203 from NREL/latest_hpxml_xsd
f468d6f3f A little more cleanup.
d831944fe Various code cleanup.
45cda3b14 Update WA link [ci skip]
5b446cbd7 Merge branch 'latest_hpxml_xsd' of https://github.com/NREL/OpenStudio-HPXML into latest_hpxml_xsd
6844a46d4 Disallow FloorOrCeiling from being nil; most of our code assumes that every HPXML::Floor is a floor or ceiling.
6e7ec2fd8 Latest results.
8fca70718 Simplify language. [ci skip]
ebfc71c89 Bugfix.
6cc1c6b14 This is a little better.
df9002648 Latest results.
c48d3a492 More updates.
58e8e6863 Bugfix 2.
8dca4ae7b Bugfix.
0cdf347e7 First pass.
1f448c510 Latest results.
8ace507c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
5713606a5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
ddd85a825 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8f5661f23 address comments
83ba25f1a Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
1abd65ea2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
0c5d98e3a Update the changelog
a6a8d52f5 Merge pull request #1201 from NREL/vent_fan_inconsistent_inputs
35b5771ab Update HPXML test file.
aec969816 Prevent recovery inputs from being used with a system type that suggests there is no heat/energy recovery.
638e36577 Update docs/source/workflow_inputs.rst
2b50432b1 Update docs/source/workflow_inputs.rst
e1d878b03 Update Changelog.md
999630df2 fix test file name changes
a8a225ddc remove files no longer exist
98b6faaa4 Latest results.
ffd1b1cbd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8821be37f address EPvalidator.xml with room heat pump name change
df2b9e477 Merge pull request #1184 from NREL/os350
cccb637e2 Update to 3.5.0-rc1
e94640a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
6324e8d2a Eliminate redundant code and some clean up. (Produces identical results for all unit tests.)
cb3e5cef6 Bugfix for negative PV credit. Unskip tests. Simplify some loops.
4740d45d9 Consolidate data files, simplify unit test code.
b2e91a68c update with latest schema
a3edf6279 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8ab6a56b3 Merge branch 'bills2' of https://github.com/NREL/OpenStudio-HPXML into bills2
6ae1e5e33 Fixed test_downloaded_utility_rates so that it correctly performs hourly calculations. Added error-checking if monthly data is accidentally provided to detailed electricity calcs.
67d0f5fd1 Latest results.
df639ee95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
08bf340cf Update README.md [ci skip]
1450fc617 Latest results.
ba7165576 update real homes hpxmls
f79fb55ef update BuildResidentialHPXML/measure.xml
6dea45218 replace 'FloorType/WoodStud' with 'FloorType/WoodFrame'
d06c2aa45 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
bfd9a70eb replaces 'FloorType/StructurallyInsulatedPanel' with 'FloorType/StructuralInsulatedPanel'
d8c77f935 change FloorType StructurallyInsulatedPanel to StructuralInsulatedPanel
2bdabc125 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
9ff9a16f0 run update_measures
7e0bd9c81 run update_hpxmls
df0fdbbcc Merge pull request #1200 from NREL/wh_location_defaulting_bugfix
06a7b0bf1 Fixes possible ruby error when defaulting water heater location.
da2e97deb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
cca404a37 Latest results.
89bca0df3 Merge branch 'master' into batteries2
196b36f85 update hpxmls
5c4873615 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
4c519231e Merge pull request #1198 from NREL/timestamp_convention
656680f85 Latest results.
fc9fce103 First pass.
8714ca44d Latest results.
0547950ae Merge branch 'master' into batteries2
6a75137ce Latest results.
dc8bbe65c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
a5e00de5a Merge pull request #1197 from NREL/sip_rename
d242f552e Latest results.
cfc0422dc Replaces `WallType/StructurallyInsulatedPanel` with `WallType/StructuralInsulatedPanel` per HPXML schema change.
a86acdd41 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
06530d541 Remove old file.
253c6b2ad Merge pull request #1185 from NREL/cfis_supplemental_fan
9071be55a Update docs
f66159aa7 Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
0e9507816 Adds error-checking around HoursInOperation specified for a CFIS supplemental fan.
1138d1062 Latest results.
bd30d3ec2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d0cf4f78e Merge pull request #1196 from NREL/sync_hpxml
1ba612241 Sync w/ latest HPXML schema.
12fadf0be Merge pull request #1194 from NREL/deprecate_report_hpxml_output
bb4e326e7 Latest results.
9c61140da Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d1bea4e67 Add CFIS definition/description. [ci skip]
5a94d26eb Remove results_hvac_sizing.csv, now captured as part of results.csv.
47c14dfda Latest results.
9e90bfc75 Bugfix.
7b1726c02 Minor cleanup.
3dee61034 First pass.
4e6d1a66a Merge pull request #1193 from NREL/kiva_initial_temp
4e219138e Latest results.
9a37f9eee Minor code simplification.
bb9e6707f Latest results.
5bdca9b10 Merge branch 'master' into bills2
8d8edc30c Merge branch 'master' into batteries2
d55139bc2 Update defaulting and tests.
fcd1cc6be Latest results.
993bc8ae5 Merge branch 'kiva_initial_temp' of https://github.com/NREL/OpenStudio-HPXML into kiva_initial_temp
0350656ee Refinements and some unit tests.
9005fe10a Update Changelog.md and docs. [ci skip]
43e2bd409 Latest results.
6fe9c6c6b Handle buildings w/o HVAC. Update base-hvac-none.xml to be in a mild climate.
7b5685541 s
b6e3af677 Some cleanup and better comments.
535b31c08 Update Changelog.md.
01270816c Initial pass at setting a Kiva:Foundation initial temperature better than E+ does.
e71eb1a21 Update test.
b4fbf9672 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
45afda16e Latest results.
96f08d39d Update docs [ci skip]
bee170643 Bugfix.
5a8aabdea Latest results.
481bd2f76 Fix tests.
b1b5ec3d8 Update docs. [ci skip]
d87137a1c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
00181ede4 Update tests.
423ec798c Bugfixes. If CFIS supplemental fan is undersized, provide warning and ensure supplemental fan RTF does not exceed 1.
59bdd4bec Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
3a8fab085 Allow supply/exhaust systems only.
230925090 Merge pull request #1191 from NREL/design_temperatures
07309550b Latest results.
c4093b93d Latest results.
8f50ae7b0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
282201348 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into design_temperatures
77f7bce74 Bugfix.
7bef24e6e First pass on applying sensible/latent effectiveness when the CFIS supplemental fan is an ERV/HRV.
07b5e5f02 Add design temperatures to output files; update docs.
762a1fcc2 Merge pull request #1190 from NREL/requires
c57d9c889 Simplify/clean up requires.
978f93f37 Merge branch 'cfis_supplemental_fan' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
7953bbe94 Fix tests.
74b7cf005 Latest results.
cee898a64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
d34db690c Merge pull request #1189 from NREL/standbyloss
02f3cf405 Update to latest HPXML schema for standby losses. Code backported from https://github.com/NREL/OpenStudio-HPXML/pull/1150.
87ac9dbb2 Handle outdoor air impact of supplemental fan. (Still need to handle HRV/ERV effectiveness.)
731386c05 Revert PTACHeating change.
c98080595 Latest results.
b2848b45a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_supplemental_fan
bbaf9b28c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
b2b1ae1f2 Switch to OS:develop
7f8adbf5a Initial model updates and sample file.
7e4625205 Remove stray reference to nokogiri. [ci skip]
cd967ee41 run update measures
91f082421 update hpxmls
1c673351b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
45aacfa87 Merge branch 'master' into allow_additional_floor_type
eacf608fd Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
ed62358cd run update_measures
548e18f62 Latest results.
f62df2c38 Merge pull request #1183 from NREL/ground_conductivity
a7fffdf29 Latest results.
07c838a17 Update Changelog.md [ci skip]
82da02088 Merge pull request #1127 from NREL/xml_validation
48544b480 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
937a0c316 Merge pull request #1186 from NREL/revert_kiva_workaround
b55133f38 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
92ff8600d update hpxmls
f0ab7cfb2 Use for GSHP model too.
388ee4539 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
6a583922b Latest results.
d72d6e94a Fix
98f5fec16 Revert Kiva workaround.
fe909250a Merge branch 'xml_validation' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
05a295399 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
d1fac6dce Re-enable tests
22a0085a8 Latest results.
e15e3604e Fix CI test.
e8e415b3c Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
65baba24c Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into os350
d34a51e2d Fixed CI tests?
6a474bf9c Latest results.
1a97875ac Try to fix tzdata on CI, take 2
7b1173856 Skip failing OSW tests for now. Attempt to fix tzdata issue on CI.
cb231358d Bugfix.
4bfaf8730 Try docker run
34f3ff967 Saving progress.
813d36712 Latest results.
77f053032 Merge branch 'ground_conductivity' of https://github.com/NREL/OpenStudio-HPXML into ground_conductivity
bee3915af Bugfix.
c2884d5ed Updates. [ci skip]
98821f1b0 Latest results.
fe4ec3ceb Updates to OpenStudio 3.5.0/EnergyPlus 22.2. [ci skip]
334c1c6f0 Merge branch 'master' into allow_additional_floor_type
36beee646 Finish docs [ci skip]
4dc30f7ab First pass.
df1f5c91d Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2d7121216 Revert apply_sip_wall and apply_generic_layered_wall; Add apply_sip_floor_ceiling and apply_generic_layered_floor_ceiling; Code cleanup
4c27eddb6 Merge pull request #1181 from NREL/bills2-rates-zip
0111eed94 Update test.
3cb8c812b Replace the file.
ec3b8c843 Create rates zip instead of tar gz.
513bfaaa6 Merge pull request #1180 from NREL/surface_type_bugfix
a766a4a6e Fixes possible "Could not identify surface type for surface" error.
68350150c Latest results.
044d848d6 Remove debug line.
1e9d9178c Apply min charges for rtp; min charges with PV still does not work.
647b536f2 Merge branch 'master' into bills2
ee63c8871 Latest results.
cf6f33b13 Update tasks file.
d9e5e55e9 Merge branch 'master' into batteries2
fddd2df60 Merge pull request #1179 from NREL/attached_dhw_dist
502df7165 Merge branch 'batteries2' of https://github.com/NREL/OpenStudio-HPXML into batteries2
e847b332b Updated schedule for test file to better showcase capabilities
2da3ebec0 Latest results.
92aa5db83 Revert temporary change.
74887c539 Fix validation tests.
fbf953329 Allows shared dishwasher/clothes washer to be attached to a hot water distribution system instead of a single water heater.
1a1294847 Merge pull request #1177 from NREL/multiple_climate_zones
3a4cc9e7e Clarify end use in docs [ci skip]
acd6980a2 FIx test.
b13b89f27 Updates the HPXML class to support multiple IECC climate zones. OS-HPXML still only allows a single climate zone to be provided (to prevent confusion as to which will be used).
711339f3f Latest results.
8075429c7 Merge branch 'master' into bills2
d0460dbb3 Merge pull request #1174 from NREL/kiva-error-bugfix
0cbb5d903 Update Changelog.md.
64525e75b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into kiva-error-bugfix
db86b475d Merge pull request #1171 from NREL/bill-scenario-total-fix
11dae0a98 Prevent a wall w/ a very small (exposed) length.
3de62d592 Latest results.
cbaec14ed Small bugfixes/improvements.
34afa09ee Pass in correct hash.
7a50e10fa Clean up test files.
941fdcafb Latest results.
189fd3f82 Consolidate report methods in output measure and update test file.
a28854a66 Bit of reorganization in hpxml and utility bill test files.
ca7b50122 Merge branch 'master' into bills2
2432cf89d Merge branch 'master' into batteries2
5bd1d5dfa Try to fix results json path.
21cad45a6 Assert written multipliers are also registered.
a19ffe22e Assert written bills are also registered.
882069f9c Skip line breaks when registering output.
4348a03d9 Reference correct method from bills test file.
d15e84b92 Better consolidation.
03df3d7ef Consolidate write vs report for hpxmloutput and utilitybills.
6cf8dc9d1 Report total for each bill scenario.
2e465e2c1 Latest results.
8e23398e0 Add FloorType to a new sample file
cabf3e687 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
63621c5e2 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
95e3acabf Add apply_floor_ceiling_construction method
9d6a99499 Merge pull request #1168 from NREL/code_cleanup
aa4a1bccc Minor code cleanup.
9c9263122 Latest results.
afbed9ca1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
047d45b76 Merge pull request #1167 from NREL/duct_surface_area_multipliers
346ca6a64 Merge branch 'duct_surface_area_multipliers' of https://github.com/NREL/OpenStudio-HPXML into duct_surface_area_multipliers
3ae9bda2f Bugfix.
d8d736858 Latest results.
893429644 Update PR template [ci skip]
aa2a18a22 Fix documentation [ci skip]
389b107df Allows duct surface area multipliers. Can be used with either user-specified duct areas or defaulted duct areas.
4f4761281 Merge pull request #1164 from NREL/dst-with-dview
5be79d708 Update Year choices in docs. [ci skip]
ca97c330a Fix code for when run period ends before dst ends.
6d65266fc Update csv_dview test to compare values.
ee4fe2286 Remove link to beopt code.
878677ba9 Switch to add_utc_column for consistency.
23fb39d6d Merge branch 'master' into dst-with-dview
5c04855b6 Merge pull request #1165 from NREL/dst_observed
ff36c55bc Switch to using new DSTObserved field in HPXML v3.1
ca8f8aeb8 Add output test for dview with dst disabled.
fb82a297d Pull dst ix into method.
b9b347c72 Latest results.
7804d2809 Update some sample files
090e68386 Shift for dst only if enabled.
da22fbfb2 Shift dst timestamps for csv_dview.
3af5437f6 Get dst timestamps if csv_dview.
f836f338f Latest results.
6fef1efb4 Changes to battery resource.
599717041 Latest results.
e95377e5b Bad variable names.
32c263360 Add FloorType
e2b273c81 Add more error checking for battery schedules.
2f2cd4a3b Merge branch 'master' into batteries2
217c6b8ff Latest results.
884a979f0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
c222a1a31 Merge pull request #1161 from NREL/nat_vent_availability
a308f7164 Minor change: move down element.
f27ff4ff7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into nat_vent_availability
98925d84a Add/update unit tests.
2c904355c Merge pull request #1162 from NREL/relative-path-followup
cabe0d11d Minor docs improvement [ci skip]
5144bbab0 Latest results.
6842535ff Clean up paths in template osw files.
c037d7aef Change output_csv_path back to relative hpxml_output_path.
5fcdc2596 Relax tolerance.
547375fca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into nat_vent_availability
3f6f2179d Fixes test?
70234389f Merge pull request #1156 from NREL/relative-path-options-2
04047053e Allows setting the natural ventilation availability (days/week that operable windows can be opened); default changed from 7 to 3 (M/W/F).
4010f3954 Update output_csv_path arg desc.
77f5002ba Fix some paths.
7144adaf1 Latest results.
738ab4ca2 Update relative path for output_csv_path.
a9ec30849 Merge branch 'master' into batteries2
3c2a12c76 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into relative-path-options-2
b1d3e6220 Merge pull request #1154 from NREL/aspect-ratio-fix
db5378842 Update Changelog.md [ci skip]
7aa2222e4 Merge branch 'master' into batteries2
9d1f08e5d Update Changelog.md [ci skip]
0006af01a Update buildreshpxml test file.
5de8e3169 More test updates.
1b5af40e4 Merge pull request #1158 from NREL/fix_rso_measure_xml
f40dc83eb Fix ReportSimulationOutput/measure.xml
dc6217835 Update tests output_dir in hpxmltoos test files.
190d3a572 Merge branch 'master' into relative-path-options-2
c7c7032ef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into aspect-ratio-fix
2da6e26fb Merge pull request #1148 from NREL/temperature_capacitance_multiplier
6451d2cbe Update Changelog.md [ci skip]
a2c37f6da Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into temperature_capacitance_multiplier
82859d6c8 Merge pull request #1153 from NREL/foundation_insulation_gap_bugfix
d45dfe6cb Clarify water heater storage tank volume as nominal volume, not measured volume.
dbf316f1f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into foundation_insulation_gap_bugfix
397ce6732 Merge pull request #1152 from NREL/building-america-seasons
fe7fa7722 Latest results.
1bb9fe846 Latest results.
6fd3b79d4 Revert some test changes.
061422bde More decimal places.
6e6936dee Merge branch 'temperature_capacitance_multiplier' of https://github.com/NREL/OpenStudio-HPXML into temperature_capacitance_multiplier
43f49f65f Oops, missed these.
f5f60bc93 Change aspect ratio for sfa and apartment.
f3a00795b Make suggested optional simplification.
d97df0b49 Update measure xmls.
9657140da Update output_dir path as well.
7f8b0ddb6 Latest results.
df488402d Default to 1.0 for now.
0ddfbe2ac Clean up after tests.
5c41b6443 Merge branch 'aspect-ratio-fix' of github.com:NREL/OpenStudio-HPXML into aspect-ratio-fix
f79845e95 Update some test expected values.
886e27cad Latest results.
ddc518eb7 Update sample files.
09b8be7d9 Write new test for checking expected aspect ratios.
66846829d Fix aspect ratio calc for sfa and apartment.
41117e145 Add comment.
c52084d43 Latest results.
66e23c4fd Latest results.
46b7628d1 Small fix in schedule file measure.
1a060cdeb Need to include all generators files.
555c5636f Fix new defaulting changes.
d3d916cab Latest results.
ca25b7a16 Reorganize the new sample files a bit.
77aeccb3c Update battery tests.
afeadf72b Merge branch 'master' into batteries2
d69e75c5f Consolidate sim calendar year code and write seasons test.
bbde7a89a Remove extra sample file.
29e19b9ea Latest results.
a4f27c657 Merge branch 'batteries2' of https://github.com/NREL/OpenStudio-HPXML into batteries2
71a183116 Change BusType from DC to AC.
201c8152b Latest results.
97f60a61b Latest results.
24a2a0b6b Latest results.
facce93fb Merge branch 'batteries2' of github.com:NREL/OpenStudio-HPXML into batteries2
fd60b9057 Updates to support generators with pv and battery.
e68d2d135 Implement workaround.
2f612066f New file.
bbea7c842 Remove old file name.
6c36e413e Update test file to trigger Kiva issue.
ee5cd7c3b Latest results.
495d9e998 Add a sample file for auto seasons.
1abffd953 Optionally populate BA season.
8c6011c7d Add BA enum and new schedules method.
bd50992f9 Update docs.
6cc82a197 Latest results.
c12b627fd Minor updates.
c92ab6054 Check bill total for downloaded rates.
b74dd8c18 Updates to new test.
871652d54 Small fix.
27f1dfb71 More criteria for valid tariff files.
788a92c3c Add test for checking all downloaded tariffs.
e87ba42ff Merge branch 'batteries2' of github.com:NREL/OpenStudio-HPXML into batteries2
ff42f0e96 Update the changelog.
0fa90b5f2 Update workflow outputs docs.
3100766f5 Add remaining stubbed tests and test files.
6b45be10f Update measure and tests to use verion 7.
ba2a55910 Update rates to version 7.
f379e3f26 Specify version 7 in measure and docs.
9777b3130 Start adding tests for min annual charges.
44bd7fe30 Support for min annual charges.
447652eb5 Latest results.
a9db5d407 Update output reporting for new meters.
999678288 Update schedules resource for vacancy.
ee200195d Excuse unused converter meter.
7cdb7c68c Update workflow inputs docs.
74ec1b430 Update epvalidator schematron.
0feddc0ba Test for valid battery schedules.
6e7b3e6e1 Update catching battery schedule issues.
9709a49d3 Merge branch 'master' into batteries2
a5f996a70 Debug notes.
9ff8f596f Remove unused method.
b742b6790 Start adding tests for min monthly charges.
f8381b93b Merge branch 'bills2' of github.com:NREL/OpenStudio-HPXML into bills2
17616fde2 Better filters and warnings.
63d495d8b Latest results.
be881189a Update file containing all rates.
e6061a729 Update bill measure and resource.
2eab8ecdf Remove unused fields from sample test jsons.
ddf574bab Merge branch 'master' into bills2
96b432ebd Latest results.
cc602c424 Tiny docs update
6d599d353 Closes #1043.
b9515c3c6 Merge pull request #1147 from NREL/seer2_hspf2
9595b26cb Latest results.
ccd0516c5 Fix ASHP test.
7614fe468 Allow SEER2/HSPF2 efficiency types for central air conditioners and heat pumps. Also speeds up tasks.rb update_hpxmls.
b76e21a4a Merge pull request #1146 from NREL/weather_tests
4d76f22f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into weather_tests
80739f5d5 Add unit test for https://github.com/NREL/OpenStudio-HPXML/pull/1144.
c9c88488d Merge pull request #1145 from NREL/sch-warn-bugfix
cadf93c6c Check for more schedule file and multiplier warnings.
131a3b60f Merge branch 'master' into sch-warn-bugfix
9ef3399e2 Update README.md [ci skip]
ed626f5a3 Update battery tests.
de87649b3 Meter inverter and converter separately.
3354e1c03 Trying out new meters.
2e1e57541 Merge branch 'master' into batteries2
8a38889ad Missing runner.
e1d7ca83c Add rates tar gz.
0003ec75d Update gitignore.
39a2f14ac Latest results.
9d7868c49 Update paths in tasks.
870e9583c Merge branch 'master' into bills2
2bfd5a2ff Move more test rates over.
b6b4e0f8e Reorg and update utility rates download.
d06272bbc Merge pull request #1144 from NREL/weather_dump_bugfix
c645fb200 Merge branch 'master' into bills2
4d9914f57 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into weather_dump_bugfix
f7692501f Fix ResStock error for dual-fuel heat pumps in hvac_sizing.rb. Removes any OS objects from being attached to the weather object.
fda7c98da Merge pull request #1143 from NREL/multi-building-idref
d81bc6169 Update CI test.
16e808e74 updating xml files
38f0451c7 Merge remote-tracking branch 'origin/master' into multi-building-idref
bab56ba84 fixing tests
f18de3dc5 Docs bugfix [ci skip]
05d6d87b2 Merge pull request #1139 from NREL/mass_floor
8654f135e Very minor cleanup.
793bd1434 Update Changelog [ci skip]
31b774276 Merge branch 'mass_floor' of https://github.com/NREL/OpenStudio-HPXML into mass_floor
b3f637f84 Update the changelog [ci skip]
d7560c135 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mass_floor
fcf92e558 Remove obsolete test.
b59b154bb Merge branch 'mass_floor' of https://github.com/NREL/OpenStudio-HPXML into mass_floor
d37e5431e Update docs once again
fdabd9e57 Merge branch 'master' into mass_floor
e2e9d2a7d Handle IECC & ZERH for OS-ERI. Move utility_bills.rb code to BEopt repo.
6a4529411 Revert "Update docs"
6baaa1b7d Latest results.
e6ae7dfb1 More tests and notes.
ab8f9eef1 Move battery loses onto total.
e56284e34 Stub new sample file point to battery schedules.
d01c580e3 Update an example file
533e25192 Merge branch 'master' into mass_floor
cb9a50350 Merge branch 'batteries2' of github.com:NREL/OpenStudio-HPXML into batteries2
6dad40262 Update more tests.
664115d6a Latest results.
dbe4d5c10 Merge branch 'master' into batteries2
a6873d4a5 Bit of rearranging.
4472f7702 Merge pull request #1141 from NREL/hp_backup_autosizing
2e00473fb Latest results.
e890171f6 Add new annual battery row to test file.
3122caee1 Get alignment for timeseries.
c7ed80f2d Add unit test. Remove superfluous GSHP code.
cae4b9263 Update Changelog.md and remove debug statements
091fa977e Fixes #1140.
1d8c53ecc Move annual battery energy losses over to its own field.
c754802d4 Forgot to push these
e4e856dc4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
969e8879f No longer need separate XSD/Schematron validation on the CI; now performed in test_validation.rb.
df52ba526 Run tasks.rb update_measures
81cb6ef82 Change frame_floor to floor
a8bc2dad2 Merge branch 'mass_floor' of https://github.com/NREL/OpenStudio-HPXML into mass_floor
dee1378b3 Change base hpxml timeseries output column name
16ff833af Merge branch 'master' into mass_floor
a04ec8522 Update sample files
efd06b2b2 Update HPXMLvalidator
11e4ed6cf Remove unintended puts
7e5624097 Revert PackagedTerminalAirConditionerHeating
3a825d5ce Merge branch 'master' into bills2
21cdd6079 Merge pull request #1138 from NREL/eri_refactor
64251f25a Update measures and tests.
9ec746ace Update epvalidator and docs.
070f6d700 Latest results.
79df2112c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
a416216b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mass_floor
c62d8f89a Cleanup
c221ded2c Update docs
631a76820 Update hpxml.rb
78e7c1230 Update ruby files
4eec8ec88 Update schemas
5a76ace5f Update hpxml files
be63721ca Latest results.
fd866dcdf Use correct parent path for tariff files.
aef448b6d Fix tariff filepaths.
9f658c0c8 Some code refactor for ERI.
916651570 Clean up some more.
762bb77d6 Clean up unused vars.
b6c1e1f67 Get detailed test working and stub the rest.
9b4b788e4 Get simple bill tests working.
d1e3b05f3 Merge branch 'master' into bills2
8a15d6501 Merge pull request #1137 from NREL/utility_bills_for_beopt
5847d152f Increase precision.
4543af494 Bugfix.
3218bd0c6 Allow fuel oil and propane too.
d3f001265 Allow 'US' as a state_code for BEopt and allow electricity and gas to use different state codes (e.g., if the user selected state average for electricity and national average for gas).
c07a94954 Allow utility_bills.rb to be called from the commandline for BEopt
898849920 Merge pull request #1124 from NREL/bill-scenarios
55768547a Minor fix for PVAnnualExcessSellbackRateType constant being used for electricity_utility_rate_type. [ci skip]
61019b865 Merge branch 'bill-scenarios' of https://github.com/NREL/OpenStudio-HPXML into bill-scenarios
d1ffa893e Fix comment [ci skip]
0451d822c Latest results.
48ea577cd ... even better, only generate the doc if there are utility bill scenarios.
cf6d20fd7 Only create hpxml_doc once for performance reasons.
d5ba843b3 A little cleanup.
8d44e115d Increase PV size in base-misc-bills-pv.xml so that there is annual excess PV production and we see a difference between net-metering w/ retail rate and net-metering w/ wholesale rate.
92e9ca42f Changes PV compensation type from a string enumeration to an element for clearer organization.
041701448 Merge branch 'bill-scenarios' of github.com:NREL/OpenStudio-HPXML into bill-scenarios
2dede5494 Test for checking bill argument lengths.
466b364c3 Latest results.
7606b31f4 Add fixed charges for all fuels.
0359cc6c2 Latest results.
2fb430404 Merge branch 'bill-scenarios' of github.com:NREL/OpenStudio-HPXML into bill-scenarios
d82c6f002 Rename tests and add a third scenario.
7a5cf3779 Latest results.
785e227dd Merge branch 'bill-scenarios' of github.com:NREL/OpenStudio-HPXML into bill-scenarios
23f7895c8 Place runner warnings back in.
4386bc4f8 Consolidate _write_foo methods in hpxml_translator_test.rb.
2bb268e82 Typo.
4911f3512 Update sample files and remove debugs and skips.
0fac01ecf Update format of monthly grid connection fee.
3f415d161 Yep, it's needed.
6bc633e80 Check if this is still needed
e40df4011 Install sphinx rtd theme via apt?
ac80088b2 Try again.
c08d07793 Try again.
526a9d12f Merge branch 'xml_validation' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
927335315 Attempt to fix tzdata install
970632de3 Latest results.
e4a2e2e24 Remove old validation code.
e2c42b9d6 Bugfix. Also fixes tests when running in a dir with spaces.
34ff34815 Try dev-3.4.1
a11c1e02d Latest results.
27dd22da9 Fix up utility bill tests.
766557d1b Typo in epvalidator.
b53341ca1 Update docs.
3fded7587 Latest results.
b0e244b2f Clean up grid connection constant.
376f4aa22 Fix wood constant.
1772b8b25 Smart defaulting based on fuel type presence.
ad8ef9c1f Fix defaults test.
39bfcd768 Create and use hpxml constants.
f4e17e215 Update sample files.
a3ee9864f Update build measure arg names and descriptions.
37b1f4f74 More changelog.
88856bda1 Update changelog.
a818388d4 Update epvalidator xml.
f02149cba Add utility bill scenarios section to docs.
c221db96e Suppress warnings during validation tests.
7b28c73d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
35d9de969 Merge branch 'master' into bill-scenarios
8c018a7fc Merge pull request #1135 from NREL/vent_fan_bugfix
505ec7644 Merge branch 'vent_fan_bugfix' of https://github.com/NREL/OpenStudio-HPXML into vent_fan_bugfix
f5fee2b27 Update test.
652271339 Latest results.
814f250bb Latest results.
d0d0b8856 Fixes zero energy use for a ventilation fan w/ non-zero fan power and zero airflow rate. Should be pretty rare for real homes but it can occur for the ERI Reference Home.
9b751a264 Merge branch 'master' into bill-scenarios
382dca31e Fix write_bill_results method.
f1308149a Latest results.
4c5a6f8a2 Merge pull request #1133 from mdahlhausen/doc/default_emissions_factors
d472ca2b9 Merge pull request #1132 from NREL/prevent_comparepy_error
5d3fc2782 Syntax.
18816a243 Bunch of updates after feedback.
134e72ac8 Clean up displayed xsd errors; update expected validation test error messages. [ci skip]
36d023ab1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
19e482f52 Latest results.
8bd51da2e Fix code and test when no rates found.
d8567e892 Merge branch 'master' into bill-scenarios
2e4c700e6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into prevent_comparepy_error
482608a1d Need to make some change another place.
553ec49af Merge pull request #1134 from NREL/reporting_measure_registered_values
ff02e2149 Better debug.
2f3db8fd8 Debug statement.
726544fa7 Merge branch 'master' into bill-scenarios
6c3e6bebf Remove line breaks.
37d7a7ba0 Adds tests to ensure that runner registered value names are perfectly consistent with the results_annual.csv row names. Fixes a couple emission registered value names.
12035645d clarify emissions factor table in ANSI/RESNET/ICCC 301
71b0dd28d Prevents an error if base/feature have different files.
32d8d9225 Tests for multiple bill scenarios.
72ef20a10 Get most tests passing.
8b13fd204 Hotfix for bungled method rename.
ac7bdf993 Make the switch to hpxml bill inputs.
6af7955fb Move auto rates into resource file.
36417ab67 Update docs for bill scenarios.
0f17d0d9c Merge branch 'master' into bill-scenarios
0b6a37114 Merge pull request #1131 from NREL/docs_warnings
cd833a30a Fix warning?
8acebb37f Fix table, add Annual Energy Consumption section.
f58853147 CI test. Convert docs warnings to errors?
cc20ffe6a Update epvalidator for pv elements.
d31f8733a Update epvalidator.
68d8a8454 Add defaulting test.
281a98176 Stub out defaulting.
5bc976007 Add fixed charges arguments.
c3bc89d96 Minor updates.
7b09e7f0f Merge branch 'master' into bill-scenarios
833d4d62e Merge pull request #1129 from NREL/cleanup_reporting_measure
08ae7cfd7 Rename variables.
17675b93b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup_reporting_measure
0600acd5a Cleanup the ReportHPXMLOutput measure in advance of adding some new outputs to it.
6082ad529 Merge pull request #1128 from NREL/error_on_infinity
98f9f6ac5 Update Changelog.md
449df7a9c Use more specific error message.
dc597d5a2 Update Changelog.md
480000647 Throw an error in the reporting measure if we find that the simulation results are Infinity.
43f7784b8 Bugfix. [ci skip]
bd8d44ed7 First pass at using new OS SDK XML validation capabilities. [ci skip]
b8457ea8b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
c6badf886 Merge pull request #1125 from NREL/fix_random_test_failures
2e8bdbe03 Merge pull request #1126 from NREL/debug-schedule-failures
a02189425 Revert minitest version.
359061f8b Merge branch 'fix_random_test_failures' into debug-schedule-failures
da2544929 Remove debug and unused lines.
b4f226c75 Fix schedules test class name.
c79c06216 More debug.
eeec9234b More debug.
55149105c More debug lines.
00a871c7b Debug external file.
afa24248f Latest results.
71b091821 Typo.
c97b41048 Fixes random test failures due to the working directory changing.
7b1389563 Latest results.
4b9d4c0e6 Add bills sample file.
fa04c643f Stub bills args in build measure.
f7bdd9d85 Stub bills scenarios in hpxml resource.
4f79fcca0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
9061b0ba3 Merge pull request #1123 from NREL/end_use_emissions
0812fbe58 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
814838ae5 Latest results.
3e17b32ec Minor update to docs [ci skip]
862ee4101 Update Changelog.md
13c3caa3f Add include_timeseries_emission_fuels and include_timeseries_emission_end_uses reporting measure arguments.
2d8cae2b2 First step: calculate emissions for each end use and roll them up to fuel totals.
be311474b Include skip keywords.
f749d44f6 Update worklow outputs docs.
6ec3b7a23 Add missing demand json.
f663a1f92 Remove demand init vars.
9adc5ba8c Catch demand fields and write test.
adee52da7 Merge branch 'master' into bills2
ccc3f7bd2 Merge pull request #1122 from NREL/timeseries_setpoints
73e7612b4 Adds heating/cooling setpoints to timeseries outputs when requesting zone temperatures.
6e1d95091 Merge branch 'master' into bills2
0cf7ffbc4 Update detailed tests expected values.
fe27f81a7 Update test file and resources.
744483396 Merge pull request #1116 from NREL/shared_pump_bugfix
4736b34ad Latest results.
c98c5d36e Merge branch 'shared_pump_bugfix' of https://github.com/NREL/OpenStudio-HPXML into shared_pump_bugfix
128588db1 Bugfix.
87392ad89 Latest results.
3944bee59 Merge branch 'shared_pump_bugfix' of https://github.com/NREL/OpenStudio-HPXML into shared_pump_bugfix
4c175f451 Update comment.
a0492d29e Switch to performing disaggregation during post-processing.
b750d7f0a Latest results.
1e838e1cf Update comment.
babbdf1f5 Try htg vs clg season instead.
048a2579a Revert approach... will disaggregate during post-processing instead.
f01191327 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into shared_pump_bugfix
7efabd467 Merge pull request #1120 from NREL/autosize_hp_separate_backup
630cb6926 Latest results.
4092e3aaf Add unit tests and update changelog.
35a23316d First pass on fixing HVAC autosizing of heat pump separate backup systems.
88bdbc78b Relocate annual true up method.
3a8448c78 Get real time pricing tests working.
7bf0176d8 Stub tiered time-of-use with pv test.
751bccf69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into shared_pump_bugfix
fc67b95c2 Get all time-of-use tests working.
b6686d1df Merge branch 'shared_pump_bugfix' of https://github.com/NREL/OpenStudio-HPXML into shared_pump_bugfix
3713a8597 Use predicted load as backup only when htg/clg objects aren't operating.
e00830180 Get all tiered tests working.
9dce18fc7 Merge branch 'master' into bills2
d6aff49da Merge pull request #1117 from NREL/ashrae140cleanup
9edd89b94 Latest results.
9aafc8e69 Remove newly introduced element in ASHRAE 140 HPXMLs.
d2f42d1e7 Update Changelog.md
a04534c5a Fix sign.
216508518 Fixes disaggregation of heating vs cooling for GSHP shared loop pump.
c36df72c8 Get pv with detailed bills working.
b9a30d0df Merge branch 'master' into bills2
7a2e189ac Merge pull request #1110 from NREL/example-files-detailed-csvs
0f57be670 Minor update to docs. [ci skip]
2fc4ce25a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
071dcc1f5 Add skip_simulation capability to meta_measure.rb for BEopt.
504b0c73e Merge branch 'master' into example-files-detailed-csvs
ff700ea4b Update docs.
34b17701c Merge pull request #1114 from NREL/peak_load_units
8fbf9cfa3 Latest results.
880e1a652 Update test xmls so we can compare.
cc457ed9f Merge branch 'peak_load_units' of https://github.com/NREL/OpenStudio-HPXML into peak_load_units
689e93b21 Update test expected values.
4dacb9572 Merge branch 'master' into example-files-detailed-csvs
8e8e357ad Latest results.
ed4fd9586 Fixes units for Peak Loads (kBtu/hr, not kBtu) in annual results file.
932cf93b6 Merge pull request #1091 from NREL/kiva_timestep
7c4b1cdb6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into kiva_timestep
30f28014c Merge pull request #1112 from NREL/timeseries_csv_dview2
722e53e22 Fixes timeseries output for DView when the timeseries frequency is not hourly (subhourly/daily/monthly).
dc168a5db Merge conflicts.
f224ef6ad Merge branch 'master' into example-files-detailed-csvs
c175e2320 Merge pull request #1109 from NREL/hvac-system-args-desc
8d0557288 Latest results.
da08619e3 Add tests for different timestep vs detailed schedules resolution.
9757fda67 Update heating and cooling system type argument descriptions.
01babbde5 Introduce detailed tests with pv.
bbc2988aa Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
51e97de79 docs and minor epvalidator chagnes
c0611f992 Updates to get tiered tou working.
37242d35f Update tiered tests expected values.
1c0178b1b Update tiers in sample jsons so we can actually test.
99201c100 Convert remaining sample rates and create tests.
a7f5397d6 Update test framework.
115954eb5 More refactoring issues.
fac015a0f Latest results.
e721b662b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
9dc1a2615 Resolve merge conflicts.
c11a8532b Merge branch 'master' into bills2
9408d4e0a Support real time pricing and add test.
601f69a80 Add sample jsons and convert tiered tou.
479cfbb63 Merge pull request #1098 from NREL/more_linting
1c607304f Progress on detailed bill method.
cb5cf0731 Process test timeseries for monthly or hourly.
a03af2f44 Reorganize.
64b3ca335 Remove unnecessary variable. [ci skip]
4dd9c423e Start stubbing detailed electric method.
c49280808 Fix CI tests.
faafc1474 Merge branch 'more_linting' of https://github.com/NREL/OpenStudio-HPXML into more_linting
5ad9ac648 Revert num processors change and more cleanup.
5076035ea Latest results.
7a93805f8 Merge branch 'master' into bills2
629985f90 Bugfix and more cleanup.
a5235da48 Fix this measure.xml too.
16950a0ad Fix handling of multi-line errors in measure.xml.
c78648a23 More cops.
d9899f77c Fix some typos.
2b5d562a4 More cops.
1ed558f3c Add more lint cops.
978dd2ecb Another pass.
898f9b8f8 Another pass.
41f323930 First pass.
84220c279 Fix issues with file paths.
65011326a Download and test updates.
cd237bff7 Create jsons from csv bulk download.
89b7993fe Clarify mini-splits are variable speed in docs [ci skip]
8aa350ae6 Enable remaining args and update tests.
4bb92cd04 Merge pull request #1095 from NREL/=non_integer_occupants
0bff5d909 Introduce bill type argument without breaking existing tests.
cb49fd734 Introduce electricity_bill_type argument into measure.
8dc8bb337 Fixes handling non-integer number of occupants when using the stochastic occupancy schedule generator.
9f84e1293 Update gitignore for downloaded rates.
91e6d80c8 Get download of all tariffs working.
89c8bbc47 Merge branch 'master' into bills2
2ec46dbb4 Merge pull request #1094 from NREL/fix_version_stdout
b8e872593 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_version_stdout
c7e8e9748 Allow --version stdout to be captured.
e571dcb21 Merge pull request #1090 from NREL/purge_constants_auto
a3ddce505 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into purge_constants_auto
ac525ddca Docs bugfix. [ci skip]
cdaa4925e Merge pull request #1086 from NREL/sleep-schedule
7ef60a444 Support schedule file debug for run_simulation, and test.
246a314e1 Stub method for processing large downloaded json.
3324c97d9 Add new task for downloading utility rates.
62ac1e4aa Clean up Changelog.md [ci skip]
1d687f536 Bugfix.
094b1a69e Remove a measure error test.
0afc3ef69 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into purge_constants_auto
fb89c3a43 Regenerate schedule files.
c651ae275 Update new location method.
10f330015 Remove col names check.
94b063772 Add optional debug argument.
01bd1df77 Add boilerplate language for optional arguments that can use OS-HPXML defaults.
c56c3d15c Latest results.
e8c13a091 Switch Kiva timestep.
09b057066 Add another path check for get_epw_path method.
d2098ff43 Better fix for edge case (ceiling fan present but lighting not present).
76e5857c6 Bugfix.
86fffa115 Merge branch 'master' into sleep-schedule
9c6a1ec42 Merge pull request #1083 from NREL/seasons_improvements
cb8b2ba74 Use a common method for getting epw path.
2c0769db7 Merge branch 'master' into sleep-schedule
0f44a8412 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into seasons_improvements
095895606 Remove use of Constants.Auto in measures.
47e176eb6 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
1a885df8a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
d286001d7 oops
76e3ff534 Merge pull request #1087 from NREL/timeseries_csv_dview
d08989db0 Update schedule file resources.
253bfa049 Sleep unaffected by vacancy.
7e1a2c711 First pass.
15f2a270f Latest results.
be36b2821 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
255f1ed3a fixes
534efd3cd Latest results.
c1183a71f Export stochastic sleep schedule.
eca5125d5 change changelog to be next release
f4a3941ea fix unit test
d2a5988e6 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
c43365223 fix crankcase
c96ddcc25 Latest results.
4e81e36c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
da3a42a24 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
1a861ba65 heating sizing results for ptac/roomac with heating
b182213be fix cfm_per_ton for room hp
9ee476ef4 Merge pull request #1084 from NREL/expand_version
976d48063 Add EnergyPlus and OpenStudio versions to the `--version` command.
7175511a5 Latest results.
edd732362 Fix CI tests. Add workflow test asserts for zero unmet hours when there is no heating/cooling system.
d32578207 Avoid unmet hours from being reported when there's no heating and/or cooling system.
1c2013611 Bugfix if run period is a single day.
aec298eaa Use EMS to avoid unmet hours from being reported outside the heating/cooling seasons. Also allows timeseries unmet hours to be requested.
38f55ef2e Latest results.
f4d27c50a Remove ideal air system for seasons implementation. This allows temperatures to properly float (with the small disadvantage that the simulation will now report unmet hours).
e6327e501 Latest results.
c22379cee Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
decef7c46 fix test
0d0f587de Latest results.
4e220c6a2 only allow COP as efficiency unit for room heat pump
5c2aca714 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
86e0cde64 fix test and example files
607727883 Latest results.
f90a41898 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
c5b4cc5d7 another bugfix
95b6763e2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
83af841ef bugfix
35641322f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8c3b4867f run generate_hpxmls again
a311c9fb5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
2a4b73fb7 update hpxmls and bugfix
c239e1085 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
f9c917961 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
ce7fb53c7 first cut for alternative
ca062e2a0 Try defaulting the relative path change.
9dc3ffba8 Merge branch 'master' into relative-path-options
79cebac1b Latest results.
552c241ae Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
36e1393d1 tests
6c0672f36 Latest results.
29a5edc24 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
86836699f Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
0de851b66 update measures
4039e7425 add room ac with heating
927d1b0e6 Latest results.
15b53e791 update measures
846a9e16c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
75762d72a Latest results.
bb4598eaa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
88ea8a0c1 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
810f49d36 validator and schema change
5e008ae99 Added EER CEER warning for PTAC to be consistent with room ac
1314eac1f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
0d8a7d5b4 Latest results.
202ab1217 one more name change
597aab804 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
73fcae779 renaming
14d8c5bab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
92017cd48 Latest results.
e234cfe31 fix tests
63417ba90 add backup system
636230d13 fix test
727e565ce first cut
fcaefcedc Update translator args.
222a6a4e0 Add optional argument for path relative to run directory.

git-subtree-dir: example_project/resources/hpxml-measures
git-subtree-split: 5aed387ba3ca1f3169f738c3f1955ad04cef66a1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commercial water heater
2 participants