Skip to content

Split out propane and fuel oil no 2 energy results #300

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

mdahlhausen
Copy link
Contributor

Pull request overview

  • Split out propane and fuel oil no 2 in the simulation output report measure.

  • Update measure to OS 2.0+ ReportingMeasure.

  • Add tests to confirm new variables.

  • Add variables to postprocessing column definitions.

  • Fixes Split out propane and fuel oil in annual results #87

Pull Request Author

This pull request makes changes to (select all the apply):

  • Reporting Measures
  • Postprocessing

Author pull request checklist:

  • Tagged the pull request with the appropriate label (documentation, infrastructure, sampling, workflow measure, upgrade measure, reporting measure, postprocessing) to help categorize changes in the release notes.
  • Added tests for new measures
  • Updated measure .xml(s)
  • Register values added to comstock_column_definitions.csv
  • Added 'See ComStock License' language to first two lines of each code file
  • Implements corresponding measure tests and indexing path in test/reporting_measure_tests.txt, test/workflow_measure_tests.txt, or test/upgrade_measure_tests.txt
  • All new and existing tests pass the CI

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a code review on GitHub
  • All related changes have been implemented: data and method additions, changes, tests
  • If fixing a defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • Reviewed change documentation
  • Ensured code files contain License reference
  • Results differences are reasonable
  • Make sure the newly added measures has been added with tests and indexed properly
  • CI status: all tests pass

Split out propane and fuel oil no 2 in the simulation output report measure. Update measure to OS 2.0+ ReportingMeasure. Add tests to confirm new variables. Add variables to postprocessing column definitions.
@mdahlhausen mdahlhausen added reporting measure PR improves or adds reporting measures Pull Request - Ready for CI labels Mar 13, 2025
@mdahlhausen mdahlhausen changed the title Split out propane and fuel oil no 2 in simulation output report measure Split out propane and fuel oil no 2 energy results Mar 13, 2025
@mdahlhausen
Copy link
Contributor Author

Had to make some postprocessing changes. Doing a new run with the change and will check postprocessing before merging.

- change from fuel_oil_no2 to fuel_oil
- move buildstock.rb functions into measure.rb instead of requiring buildstock.rb. This allows the measure to run both in buildstock and in the measure tests.
asparke2
asparke2 previously approved these changes Mar 20, 2025
Copy link
Member

@asparke2 asparke2 left a comment

Choose a reason for hiding this comment

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

Code looks good, merge after confirming with test run.

asparke2
asparke2 previously approved these changes Apr 2, 2025
Copy link
Member

@asparke2 asparke2 left a comment

Choose a reason for hiding this comment

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

@mdahlhausen Code looks good, merge assuming that the postprocessing works on a 10k run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request - Ready for CI reporting measure PR improves or adds reporting measures
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Split out propane and fuel oil in annual results
2 participants