Skip to content

Commit

Permalink
align with emissions updates
Browse files Browse the repository at this point in the history
  • Loading branch information
adfarth committed Dec 12, 2024
1 parent a478813 commit e04f71d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion julia_src/http.jl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ function reopt(req::HTTP.Request)
]
inputs_with_defaults_from_avert_or_cambium = [
:emissions_factor_series_lb_CO2_per_kwh, :emissions_factor_series_lb_NOx_per_kwh,
:emissions_factor_series_lb_SO2_per_kwh, :emissions_factor_series_lb_PM25_per_kwh
:emissions_factor_series_lb_SO2_per_kwh, :emissions_factor_series_lb_PM25_per_kwh,
:renewable_energy_fraction_series
]
if haskey(d, "CHP")
inputs_with_defaults_from_chp = [
Expand Down
2 changes: 1 addition & 1 deletion reoptjl/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,7 @@ class ElectricUtilityInputs(BaseModel, models.Model):
blank=True,
default = "Mid-case",
help_text=("Cambium Scenario for evolution of electricity sector (see Cambium documentation for descriptions)."
"Options: ['Mid-case', 'Mid-case with tax credit expiration', 'Low renewable energy cost', 'Low renewable energy cost with tax credit expiration', 'High renewable energy cost', 'High electrification', 'Low natural gas prices', 'High natural gas prices', 'Mid-case with 95% decarbonization by 2050', 'Mid-case with 100% decarbonization by 2035']")
"Options: ['Mid-case', 'Low renewable energy cost', 'High renewable energy cost', 'High demand growth', 'Low natural gas prices', 'High natural gas prices', 'Mid-case with 95% decarbonization by 2050', 'Mid-case with 100% decarbonization by 2035']")
)
cambium_location_type = models.TextField(
blank=True,
Expand Down

0 comments on commit e04f71d

Please sign in to comment.