diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index b0930d9ab..ad678af5d 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -948,9 +948,11 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "00bb39c8f932a3320960f01adc139229c24e12b7" +git-tree-sha1 = "dad8d89841fe74d3027414359a883b991258d934" +repo-rev = "chp-expand" +repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.56.2" +version = "0.56.4" [[deps.Random]] deps = ["SHA"] diff --git a/julia_src/http.jl b/julia_src/http.jl index 10228ea09..9a5458996 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -126,7 +126,7 @@ function reopt(req::HTTP.Request) :size_class, :electric_efficiency_half_load, :thermal_efficiency_half_load, :macrs_option_years, :macrs_bonus_fraction, :federal_itc_fraction ] - chp_dict = Dict(key=>getfield(model_inputs.s.chp, key) for key in inputs_with_defaults_from_julia_chp) + chp_dict = Dict(key=>getfield(model_inputs.s.chps[1], key) for key in inputs_with_defaults_from_julia_chp) else chp_dict = Dict() end diff --git a/reoptjl/migrations/0114_chpoutputs_electric_curtailed_series_kw.py b/reoptjl/migrations/0114_chpoutputs_electric_curtailed_series_kw.py new file mode 100644 index 000000000..3269fcd6e --- /dev/null +++ b/reoptjl/migrations/0114_chpoutputs_electric_curtailed_series_kw.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.26 on 2026-02-03 16:40 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0113_merge_20251209_2338'), + ] + + operations = [ + migrations.AddField( + model_name='chpoutputs', + name='electric_curtailed_series_kw', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Electric power curtailed time-series array [kW]', size=None), + ), + ] diff --git a/reoptjl/models.py b/reoptjl/models.py index 17a9560b3..498b8459f 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -4939,6 +4939,13 @@ class CHPOutputs(BaseModel, models.Model): default=list, blank=True, help_text="Electric power serving the electric load time-series array [kW]" ) + electric_curtailed_series_kw = ArrayField( + models.FloatField( + null=True, blank=True + ), + default=list, blank=True, + help_text="Electric power curtailed time-series array [kW]" + ) thermal_to_storage_series_mmbtu_per_hour = ArrayField( models.FloatField( null=True, blank=True