ANL-CEEESA/UnitCommitment.jl
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/UnitCommitment.jl.git synced 2025-12-07 08:48:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename Unit to ThermalUnit

Browse Source
This commit is contained in:
Alinson S. Xavier
2023-04-04 15:40:44 -05:00
parent 51f6aa9a80
commit 19534a128f
30 changed files with 107 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/build.jl
View File

@@ -77,7 +77,7 @@ function build_model(;
end
model[:obj] = AffExpr()
model[:instance] = instance
for g in instance.scenarios[1].units
for g in instance.scenarios[1].thermal_units
_add_unit_commitment!(model, g, formulation)
end
for sc in instance.scenarios
@@ -93,7 +93,7 @@ function build_model(;
for ps in sc.price_sensitive_loads
_add_price_sensitive_load!(model, ps, sc)
end
for g in sc.units
for g in sc.thermal_units
_add_unit_dispatch!(model, g, formulation, sc)
end
for pu in sc.profiled_units

2
src/model/formulations/ArrCon2000/ramp.jl
View File

@@ -4,7 +4,7 @@
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_ramping::ArrCon2000.Ramping,
formulation_status_vars::Gar1962.StatusVars,

2
src/model/formulations/CarArr2006/pwlcosts.jl
View File

@@ -4,7 +4,7 @@
function _add_production_piecewise_linear_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_pwl_costs::CarArr2006.PwlCosts,
formulation_status_vars::StatusVarsFormulation,

2
src/model/formulations/DamKucRajAta2016/ramp.jl
View File

@@ -4,7 +4,7 @@
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_ramping::DamKucRajAta2016.Ramping,
formulation_status_vars::Gar1962.StatusVars,

4
src/model/formulations/Gar1962/prod.jl
View File

@@ -4,7 +4,7 @@
function _add_production_vars!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
sc::UnitCommitmentScenario,
)::Nothing
@@ -21,7 +21,7 @@ end
function _add_production_limit_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
sc::UnitCommitmentScenario,
)::Nothing

2
src/model/formulations/Gar1962/pwlcosts.jl
View File

@@ -4,7 +4,7 @@
function _add_production_piecewise_linear_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_pwl_costs::Gar1962.PwlCosts,
formulation_status_vars::Gar1962.StatusVars,

4
src/model/formulations/Gar1962/status.jl
View File

@@ -4,7 +4,7 @@
function _add_status_vars!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_status_vars::Gar1962.StatusVars,
)::Nothing
is_on = _init(model, :is_on)
@@ -27,7 +27,7 @@ end
function _add_status_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_status_vars::Gar1962.StatusVars,
)::Nothing
eq_binary_link = _init(model, :eq_binary_link)

2
src/model/formulations/KnuOstWat2018/pwlcosts.jl
View File

@@ -4,7 +4,7 @@
function _add_production_piecewise_linear_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_pwl_costs::KnuOstWat2018.PwlCosts,
formulation_status_vars::Gar1962.StatusVars,

2
src/model/formulations/MorLatRam2013/ramp.jl
View File

@@ -4,7 +4,7 @@
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_ramping::MorLatRam2013.Ramping,
formulation_status_vars::Gar1962.StatusVars,

2
src/model/formulations/MorLatRam2013/scosts.jl
View File

@@ -4,7 +4,7 @@
function _add_startup_cost_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation::MorLatRam2013.StartupCosts,
)::Nothing
eq_startup_choose = _init(model, :eq_startup_choose)

2
src/model/formulations/PanGua2016/ramp.jl
View File

@@ -4,7 +4,7 @@
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation_prod_vars::Gar1962.ProdVars,
formulation_ramping::PanGua2016.Ramping,
formulation_status_vars::Gar1962.StatusVars,

2
src/model/formulations/WanHob2016/ramp.jl
View File

@@ -4,7 +4,7 @@
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
::Gar1962.ProdVars,
::WanHob2016.Ramping,
::Gar1962.StatusVars,

6
src/model/formulations/base/system.jl
View File

@@ -53,7 +53,7 @@ function _add_spinning_reserve_eqs!(
model,
sum(
model[:reserve][sc.name, r.name, g.name, t] for
g in r.units
g in r.thermal_units
) + model[:reserve_shortfall][sc.name, r.name, t] >=
r.amount[t]
)
@@ -91,7 +91,7 @@ function _add_flexiramp_reserve_eqs!(
model,
sum(
model[:upflexiramp][sc.name, r.name, g.name, t] for
g in r.units
g in r.thermal_units
) + model[:upflexiramp_shortfall][sc.name, r.name, t] >=
r.amount[t]
)
@@ -100,7 +100,7 @@ function _add_flexiramp_reserve_eqs!(
model,
sum(
model[:dwflexiramp][sc.name, r.name, g.name, t] for
g in r.units
g in r.thermal_units
) + model[:dwflexiramp_shortfall][sc.name, r.name, t] >=
r.amount[t]
)

23
src/model/formulations/base/unit.jl
View File

@@ -6,7 +6,7 @@
# related to the binary commitment, startup and shutdown decisions of units
function _add_unit_commitment!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation::Formulation,
)
if !all(g.must_run) && any(g.must_run)
@@ -31,7 +31,7 @@ end
# related to the continuous dispatch decisions of units
function _add_unit_dispatch!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation::Formulation,
sc::UnitCommitmentScenario,
)
@@ -64,11 +64,11 @@ function _add_unit_dispatch!(
return
end
_is_initially_on(g::Unit)::Float64 = (g.initial_status > 0 ? 1.0 : 0.0)
_is_initially_on(g::ThermalUnit)::Float64 = (g.initial_status > 0 ? 1.0 : 0.0)
function _add_spinning_reserve_vars!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
sc::UnitCommitmentScenario,
)::Nothing
reserve = _init(model, :reserve)
@@ -92,7 +92,7 @@ end
function _add_flexiramp_reserve_vars!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
sc::UnitCommitmentScenario,
)::Nothing
upflexiramp = _init(model, :upflexiramp)
@@ -128,7 +128,7 @@ function _add_flexiramp_reserve_vars!(
return
end
function _add_startup_shutdown_vars!(model::JuMP.Model, g::Unit)::Nothing
function _add_startup_shutdown_vars!(model::JuMP.Model, g::ThermalUnit)::Nothing
startup = _init(model, :startup)
for t in 1:model[:instance].time
for s in 1:length(g.startup_categories)
@@ -140,7 +140,7 @@ end
function _add_startup_shutdown_limit_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
sc::UnitCommitmentScenario,
)::Nothing
eq_shutdown_limit = _init(model, :eq_shutdown_limit)
@@ -179,7 +179,7 @@ end
function _add_ramp_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
formulation::RampingFormulation,
sc::UnitCommitmentScenario,
)::Nothing
@@ -224,7 +224,10 @@ function _add_ramp_eqs!(
end
end
function _add_min_uptime_downtime_eqs!(model::JuMP.Model, g::Unit)::Nothing
function _add_min_uptime_downtime_eqs!(
model::JuMP.Model,
g::ThermalUnit,
)::Nothing
is_on = model[:is_on]
switch_off = model[:switch_off]
switch_on = model[:switch_on]
@@ -269,7 +272,7 @@ end
function _add_net_injection_eqs!(
model::JuMP.Model,
g::Unit,
g::ThermalUnit,
sc::UnitCommitmentScenario,
)::Nothing
expr_net_injection = model[:expr_net_injection]