Skip to content

CHP Expansion #701

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.

Sign up for GitHub

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

Draft
Bill-Becker wants to merge 7 commits into
base: develop
Choose a base branch
from
+31 −3
Draft

CHP Expansion #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0dafbe
Update REopt.jl to multiple-chps
Bill-Becker Jan 31, 2026
2153761
Update REopt.jl to chp-expand
Bill-Becker Jan 31, 2026
f26e8ac
Update s.chp to s.chps[1] for the multiple CHPs update
Bill-Becker Jan 31, 2026
bb22d6a
Update REopt.jl#chp-expand after merging offgrid-chp
Bill-Becker Feb 2, 2026
6a5e329
Update REopt.jl#chp-expand after prodfactor update
Bill-Becker Feb 3, 2026
ae06f30
Update REopt.jl#chp-expand after merging develop
Bill-Becker Feb 3, 2026
b2f0fa7
Add output CHP.electric_load_curtailed_series_kw to model db that was…
Bill-Becker Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions julia_src/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion julia_src/http.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions reoptjl/migrations/0114_chpoutputs_electric_curtailed_series_kw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
),
]
7 changes: 7 additions & 0 deletions reoptjl/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down