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

Add CircleCI tests #1

Merged
merged 4 commits into from
Nov 7, 2018
Merged

Add CircleCI tests #1

merged 4 commits into from
Nov 7, 2018

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Nov 7, 2018

No description provided.

@shorowit shorowit merged commit eca744e into master Nov 7, 2018
@shorowit shorowit deleted the circleci branch November 9, 2018 00:13
jmaguire1 added a commit that referenced this pull request Oct 13, 2020
…fied instead of EF are now passing! There still seems to be some merge related issues affecting tankless and a couple of shared system tests.
nmerket pushed a commit that referenced this pull request Dec 29, 2023
nmerket pushed a commit that referenced this pull request Dec 29, 2023
d49630a Fix fuel type in tankless HPXML file. Update SimulationOutputReport measure for ERI calculation.
ae012df Add comments. [ci skip]
e70c071 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into WH_UEF
a663e67 Merge pull request #517 from NREL/schematron_improvement
40bedb7 change `not(Foo) or ...` to `... or not(Foo)`
5e47c00 Bugfix.
6d0e709 change contain("_foo_"...) to element_name[text()="foo"...]
daf452c Update docs. [ci skip]
5ce7777 HPWH warnings are fine.
de76e55 FHR now only required if tank/HPWH w/ UEF. Updated tankless/HPWH UEF models and minor code cleanup. Updated tests. Uncommented tankless HPXML files.
f723255 Fix HPWH test file.
0176180 Merge branch 'WH_UEF' of https://github.com/NREL/OpenStudio-HPXML into WH_UEF
4c3c970 Bugfixes, cleanup, etc.
0b89bd4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into WH_UEF
0733d6c Addressing #1 from last night: Tests for water heaters with UEF specified instead of EF are now passing! There still seems to be some merge related issues affecting tankless and a couple of shared system tests.
2afcb87 Committing for the night. Remaining TODOs for tomorrow: - UEF test results for UA are slightly off across FHRs (just outside the tolerance). Need to triple check calculations - Need to add tankless/HPWH tests - UEF tankless xml generation needs to be uncommented (likely a formatting issue in tasks.rb)
5b02b7e Whoops
ac77602 Several syntax fixes
ac961f1 Latest update (commit before merging in master)
08f6bb5 Initial commit of WH UEF work. Adding methods for calculating UA and eta_c when the UEF is specified instead of the EF. Need to add: - UEF test cases - Update test_water_heater - Make sure FHR is specified for every case with a UEF

git-subtree-dir: hpxml-measures
git-subtree-split: d49630a
@jmaguire1 jmaguire1 mentioned this pull request Feb 21, 2024
7 tasks
jmaguire1 added a commit that referenced this pull request Apr 10, 2024
…o unmet_wh_loads.

Attempt #1 at fixing all the conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant