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.

Sign up for GitHub

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

Jump to bottom

Add Boiler:HotWater parasitic fuel field #9925

Merged
merged 15 commits into from
Aug 16, 2023
Merged

Add Boiler:HotWater parasitic fuel field #9925

merged 15 commits into from
Aug 16, 2023

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Mar 30, 2023 •
edited
Loading

Pull request overview

NOTE: ENHANCEMENTS MUST FOLLOW A SUBMISSION PROCESS INCLUDING A FEATURE PROPOSAL AND DESIGN DOCUMENT PRIOR TO SUBMITTING CODE

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 NewFeature Includes code to add a new feature to EnergyPlus IDDChange Code changes impact the IDD file (cannot be merged after IO freeze) labels Mar 30, 2023
@shorowit shorowit self-assigned this Mar 30, 2023
shorowit
shorowit commented Mar 31, 2023
View reviewed changes
Copy link
Contributor Author

@shorowit shorowit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this compared to an IDF where we are resorting to EMS to model a boiler pilot light, and the results are essentially identical.

doc/input-output-reference/src/overview/group-plant-equipment.tex Show resolved Hide resolved
idd/Energy+.idd.in Outdated Show resolved Hide resolved
src/EnergyPlus/Boilers.cc Outdated Show resolved Hide resolved
src/EnergyPlus/Boilers.cc Outdated Show resolved Hide resolved
src/EnergyPlus/OutputReportTabular.cc Outdated Show resolved Hide resolved
src/EnergyPlus/Boilers.cc Outdated Show resolved Hide resolved
@shorowit shorowit mentioned this pull request Mar 31, 2023
Closed
4 tasks
@shorowit shorowit added the OutputChange Code changes output in such a way that it cannot be merged after IO freeze label Apr 12, 2023
@nrel-bot-2c
Copy link

@shorowit it has been 16 days since this pull request was last updated.

@nrel-bot-2
Copy link

@shorowit it has been 7 days since this pull request was last updated.

7 similar comments
@nrel-bot-2b
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2c
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2b
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2c
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2b
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@nrel-bot-2
Copy link

@shorowit it has been 9 days since this pull request was last updated.

@nrel-bot-2c
Copy link

@shorowit it has been 7 days since this pull request was last updated.

1 similar comment
@nrel-bot-2b
Copy link

@shorowit it has been 7 days since this pull request was last updated.

@mjwitte
Copy link
Contributor

mjwitte commented Jul 17, 2023

@shorowit Is this ready for review? There are some conflicts with develop, and it's still marked draft.

shorowit added 2 commits July 20, 2023 09:26
@shorowit
Merge branch 'develop' of https://github.com/NREL/EnergyPlus into boi…
e948362 
…ler_parasitic_fuel

# Conflicts:
#	src/EnergyPlus/Boilers.cc
#	src/EnergyPlus/OutputReportTabular.cc
#	src/Transition/InputRulesFiles/Rules23-1-0-to-23-2-0.md
@shorowit
Address conflicts.
a3301bd
@shorowit shorowit mentioned this pull request Jul 20, 2023
Open
3 tasks
@shorowit
Copy link
Contributor Author

I ran these two files using the Denver TMY3:

Annual results are close enough:

  Orig New
Heating 20.59 25.82
Interior Equipment 5.26 0
Sum 25.85 25.82

Timeseries results look good too:
image

@shorowit shorowit marked this pull request as ready for review July 20, 2023 18:35
@shorowit shorowit requested a review from mjwitte July 20, 2023 18:35
@shorowit
Copy link
Contributor Author

@mjwitte This is now ready for review.

@shorowit shorowit mentioned this pull request Aug 1, 2023
Closed
3 tasks
@nrel-bot-2
Copy link

@shorowit it has been 8 days since this pull request was last updated.

rraustad
rraustad approved these changes Aug 16, 2023
View reviewed changes
Copy link
Contributor

@rraustad rraustad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minimal comments on these changes. This could be merged as is or a few small corrections added. I am OK either way.

src/EnergyPlus/Boilers.cc Outdated Show resolved Hide resolved
src/EnergyPlus/Boilers.hh Outdated Show resolved Hide resolved
idd/Energy+.idd.in Outdated Show resolved Hide resolved
@shorowit
Merge branch 'develop' of https://github.com/NREL/EnergyPlus into boi…
ccfea6c 
…ler_parasitic_fuel

# Conflicts:
#	doc/input-output-reference/src/overview/group-plant-equipment.tex
#	src/Transition/InputRulesFiles/Rules23-1-0-to-23-2-0.md
Myoldmopar
Myoldmopar reviewed Aug 16, 2023
View reviewed changes
Copy link
Member

@Myoldmopar Myoldmopar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great. I'm going to hold off from marking it approved until I get a reply about the warning message. In the meantime I'll do local testing to get it ready for merge.

doc/readthedocs/sphinx/quick_start/quick_start.rst Show resolved Hide resolved
idd/Energy+.idd.in Outdated Show resolved Hide resolved
idd/Energy+.idd.in Outdated Show resolved Hide resolved
src/EnergyPlus/Boilers.cc Outdated Show resolved Hide resolved
src/ExpandObjects/epfilter.f90 Show resolved Hide resolved
@shorowit
Copy link
Contributor Author

@rraustad @Myoldmopar All of your comments have been addressed in the last two commits.

Myoldmopar
Myoldmopar reviewed Aug 16, 2023
View reviewed changes
src/EnergyPlus/Boilers.cc
@@ -299,6 +299,15 @@ void GetBoilerInput(EnergyPlusData &state)
}

thisBoiler.ParasiticElecLoad = state.dataIPShortCut->rNumericArgs(8);
thisBoiler.ParasiticFuelCapacity = state.dataIPShortCut->rNumericArgs(10);
if (thisBoiler.FuelType == Constant::eFuel::Electricity && thisBoiler.ParasiticFuelCapacity > 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that looks better now, thanks!

@Myoldmopar
Copy link
Member

Alright, a quick build test of the latest commit with develop pulled in looks good. Unit/integration is fully happy. There is one regression in VAVSingleDuctConstFlowBoiler; the meter file but not time series output. At first glance it seems like big diffs, but they are in monthly Joules, and actually only a tiny part of a percent difference. I'm happy with this and ready to merge. Thanks @shorowit !

@Myoldmopar Myoldmopar merged commit b1c3091 into develop Aug 16, 2023
@Myoldmopar Myoldmopar deleted the boiler_parasitic_fuel branch August 16, 2023 15:33
jmarrec added a commit that referenced this pull request Oct 30, 2023
@jmarrec
Naive try at fixing incorrect ExpandObjects warning
9dee65f 
An extra field was added for Boiler:HotWater in #9925

```shell
$ /Applications/EnergyPlus-23-2-0/energyplus -D -d out -x /Applications/EnergyPlus-23-2-0/ExampleFiles/VAVSingleDuctConstFlowBoiler.idf

$ cat out/eplusout.experr
ExpandObjects: SEVERE: Too many fields were found for the object: Boiler:HotWater, Number expected=[17], Number found=[18]
`
``
@jmarrec jmarrec mentioned this pull request Oct 30, 2023
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aaron-boranian aaron-boranian aaron-boranian left review comments

@Myoldmopar Myoldmopar Myoldmopar left review comments

@rraustad rraustad rraustad approved these changes

@mjwitte mjwitte Awaiting requested review from mjwitte

Assignees

@shorowit shorowit

Labels
IDDChange Code changes impact the IDD file (cannot be merged after IO freeze) NewFeature Includes code to add a new feature to EnergyPlus OutputChange Code changes output in such a way that it cannot be merged after IO freeze
Projects
None yet
Milestone
EnergyPlus 23.2 IOFreeze
Development

Successfully merging this pull request may close these issues.

error in the quickstart web page Missing off-cycle parasitic inputs for boilers (pilot lights)
8 participants
@shorowit @nrel-bot-2c @nrel-bot-2 @nrel-bot-2b @mjwitte @Myoldmopar @rraustad @aaron-boranian