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

Cambium #475

Merged
merged 62 commits into from
Mar 8, 2024
Merged

Cambium #475

merged 62 commits into from
Mar 8, 2024

Conversation

adfarth
Copy link
Collaborator

@adfarth adfarth commented Jul 25, 2023

Please check if the PR fulfills these requirements

  • CHANGELOG.md is updated
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Changed

  • Updated default fuel emissions factors from CO2 to CO2-equivalent (CO2e) values. In reoptjl/models.py, updated GeneratorInputs : emissions_factor_lb_CO2_per_gal from 22.51 to 22.58. And FUEL_DEFAULTS: emissions_factor_lb_CO2_per_mmbtu => Dict(
    "natural_gas"=>116.9 to 117.03,
    "landfill_bio_gas"=>114,8 to 115.38,
    "propane"=>138.6 to 139.16,
    "diesel_oil"=>163.1 to 163.61
    )

  • Changed default source for CO2 grid emissions values to NREL's Cambium 2022 Database (by default: CO2e, long-run marginal emissions rates levelized (averaged) over the analysis period, assuming start year 2024). Added new emissions inputs in ElectricUtilityInputs. Include option for user to use AVERT data for CO2 using co2_from_avert boolian.

  • Update electric_utility emissions_region to avert_emissions_region and distance_to_emissions_region_meters to distance_to_avert_emissions_region_meters.

Added

  • Added endpoint v3/cambium_emissions_profile to urls.py, views.py, http.jl to obtain Cambium emissions profile. Mainly for use in web tool.
  • Added fuel_renewable_energy_fraction input to ExistingBoilerInputs

@adfarth adfarth requested a review from zolanaj February 7, 2024 19:23
Copy link
Collaborator

@zolanaj zolanaj left a comment

Choose a reason for hiding this comment

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

@adfarth Thanks a bunch for this! My main comments are related to misplaced files or deleted files and there are a few minor other questions. Merge develop into cambium broke some things as well, and I'm still waiting to get Docker on my new laptop so I can test this thoroughly and maybe see if there's a fix, but my guess is merging migrations might fix the break. (Feel free to revert the merge as you see fit.)

julia_src/highs/http.jl Outdated Show resolved Hide resolved
julia_src/xpress/Manifest.toml Outdated Show resolved Hide resolved
reoptjl/models.py Outdated Show resolved Hide resolved
reoptjl/models.py Outdated Show resolved Hide resolved
reoptjl/test/test_http_endpoints.py Show resolved Hide resolved
@zolanaj zolanaj self-requested a review March 8, 2024 03:04
Copy link
Collaborator

@zolanaj zolanaj left a comment

Choose a reason for hiding this comment

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

@adfarth Looks great! Thanks for incorporating the changes. In addition to the added tests, I confirmed that you can get AVERT or Cambium results out of the job endpoint by altering the test post accordingly. I think this is good to merge.

@adfarth
Copy link
Collaborator Author

adfarth commented Mar 8, 2024

@adfarth Looks great! Thanks for incorporating the changes. In addition to the added tests, I confirmed that you can get AVERT or Cambium results out of the job endpoint by altering the test post accordingly. I think this is good to merge.

@zolanaj Thank you for your review and for adding additional tests!

@adfarth adfarth merged commit d971dc6 into develop Mar 8, 2024
2 checks passed
@adfarth adfarth deleted the cambium branch March 8, 2024 23:20
@adfarth adfarth restored the cambium branch March 13, 2024 13:02
adfarth added a commit that referenced this pull request Mar 13, 2024
This reverts commit d971dc6, reversing
changes made to 7a029f3.
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

2 participants