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 the NIST Life Cycle Cost Escalations for 2023 and 2024 #10881

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

JasonGlazer
Copy link
Contributor

Pull request overview

  • Fixes Update LCC to use 2023 and 2024 NIST supplement  #10873
  • Add the data set files for life cycle cost price escalations by fuel based on NIST 135 annual updates
  • Covers 2023 and 2024
  • The 2024 data includes some additional regional breakdowns not previously available
  • Small modifications to the update_nist_escalation.py so that I can run it on my Windows machine

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

@JasonGlazer JasonGlazer added the Defect Includes code to repair a defect in EnergyPlus label Dec 26, 2024
@JasonGlazer JasonGlazer added this to the EnergyPlus 25.1 milestone Dec 26, 2024
@JasonGlazer JasonGlazer self-assigned this Dec 26, 2024
@JasonGlazer JasonGlazer marked this pull request as ready for review December 26, 2024 19:57
@@ -137,12 +137,12 @@ def parse_encost(fpath: Path) -> Tuple[List[dict], int]:
continue

if region is None:
region = line
region = line.expandtabs(1)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you clarify why this is needed? what is line when you reach here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The encost file is not separate anymore and is part of a spreadsheet. For 2023 it is an ODS, and for 2024, it is an xlsx file. Both were using tabs instead of the space delimited format of previous years when the encost.txt file was available separately.

# print(f"{region=}")
continue

if years is None:
years = [int(x) for x in line.split(" ")]
years = [int(x) for x in line.split()]
Copy link
Contributor

Choose a reason for hiding this comment

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

same question really. What other types of whitespaces other than " " do you have? tabs again?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, tabs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The other changes were just because I was running on a Windows machine and had the files in a different place.

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 is fine as is. @JasonGlazer is generally the only one who runs the Python update file, so I won't worry about the tweaks to that file. I appreciate that you at least provided the Python file so we could use it if we needed in the future, even with our own tweaks. This is going in.

@Myoldmopar Myoldmopar merged commit e3c2d2a into develop Jan 10, 2025
10 checks passed
@Myoldmopar Myoldmopar deleted the 10873_AddLCC_2023_2024 branch January 10, 2025 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update LCC to use 2023 and 2024 NIST supplement
5 participants