From e04f71d632c0623ee956dc76bf4c65cdbd84b19b Mon Sep 17 00:00:00 2001 From: adfarth Date: Thu, 12 Dec 2024 10:22:28 -0700 Subject: [PATCH] align with emissions updates --- julia_src/http.jl | 3 ++- reoptjl/models.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/julia_src/http.jl b/julia_src/http.jl index 2aea79099..ae576c59d 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -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 = [ diff --git a/reoptjl/models.py b/reoptjl/models.py index c1eac63ae..2aac3beef 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -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,