Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions scripts/units_dispatch_profile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ function make_container(devices)
end

# Build N components, evenly distributed across the 3 unit systems. The cost
# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/DU}) but
# *curves* are concretely typed (CostCurve{LinearCurve, NaturalUnit/SU/CU}) but
# the abstractly-typed `MockThermalGen` storage means upstream callers see a
# UnionAll. This is the realistic shape of consuming code.
function make_workload()
devices = MockThermalGen[]
curves = Any[] # heterogeneous on U, simulates abstract field upstream
units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.DeviceBaseUnit())
units = (IS.NaturalUnit(), IS.SystemBaseUnit(), IS.ComponentBaseUnit())
for i in 1:N_COMPONENTS
u = units[mod1(i, 3)]
push!(devices, make_mock_thermal("g$i"; base_power = 50.0 + i))
Expand Down
4 changes: 2 additions & 2 deletions test/test_linear_curve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ end
# Cost: 30 $/p.u.h in device base units
cost_curve = IS.CostCurve(
IS.LinearCurve(30.0),
IS.DeviceBaseUnit(),
IS.ComponentBaseUnit(),
)

InfrastructureOptimizationModels.add_variable_cost_to_objective!(
Expand Down Expand Up @@ -312,7 +312,7 @@ end
),
DEVICE_BASE = IS.CostCurve(
IS.LinearCurve(rate * device_base),
IS.DeviceBaseUnit(),
IS.ComponentBaseUnit(),
),
)

Expand Down
4 changes: 2 additions & 2 deletions test/test_quadratic_curve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ end

cost_curve = IS.CostCurve(
IS.QuadraticCurve(1.0, 20.0, 0.0),
IS.DeviceBaseUnit(),
IS.ComponentBaseUnit(),
)

InfrastructureOptimizationModels.add_variable_cost_to_objective!(
Expand Down Expand Up @@ -404,7 +404,7 @@ end
),
DEVICE_BASE = IS.CostCurve(
IS.QuadraticCurve(a * device_base^2, b * device_base, 0.0),
IS.DeviceBaseUnit(),
IS.ComponentBaseUnit(),
),
)

Expand Down
2 changes: 1 addition & 1 deletion test/test_ts_value_curve_objective.jl
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ end
for (unit_system, expected_slope_factor, expected_bp_factor) in [
(IS.NaturalUnit(), system_base, 1.0 / system_base),
(
IS.DeviceBaseUnit(),
IS.ComponentBaseUnit(),
1.0 / (device_base / system_base),
device_base / system_base,
),
Expand Down
Loading