diff --git a/Project.toml b/Project.toml index 425c000e..e1f4f50b 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "PowerModelsACDC" uuid = "ff45984e-d068-5f4c-9e32-c4133509d236" autors = ["Hakan Ergun", "Frederik Geth", "Jay Dave"] repo = "https://github.com/Electa-Git/PowerModelsACDC.jl" -version = "0.7.3" +version = "0.7.4" [deps] InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0" diff --git a/src/core/constraint_template.jl b/src/core/constraint_template.jl index ca3d81f0..0e08fd6f 100644 --- a/src/core/constraint_template.jl +++ b/src/core/constraint_template.jl @@ -146,7 +146,7 @@ function constraint_dc_droop_control(pm::_PM.AbstractPowerModel, i::Int; nw::Int if type == 3 constraint_dc_droop_control(pm, nw, i, conv["busdc_i"], conv["Vdcset"], conv["Pdcset"], conv["droop"]; dc_power = true) elseif type == 4 - constraint_dc_droop_control(pm, nw, i, conv["busdc_i"], conv["Vdcset"], conv["P_g"], conv["droop"]; dc_power = false) + constraint_dc_droop_control(pm, nw, i, conv["busdc_i"], conv["Vdcset"], conv["Pacset"], conv["droop"]; dc_power = false) else Memento.warn(_PM._LOGGER, "Invalid setting for DC converter control type, droop constraint will be ignored") end diff --git a/src/core/data.jl b/src/core/data.jl index d3e481c2..265ddb45 100644 --- a/src/core/data.jl +++ b/src/core/data.jl @@ -383,6 +383,9 @@ function set_conv_pu_power(conv, MVAbase) _PM._apply_func!(conv, "P_g", rescale_power) _PM._apply_func!(conv, "Q_g", rescale_power) _PM._apply_func!(conv, "Pdcset", rescale_power) + if haskey(conv, "Pacset") + _PM._apply_func!(conv, "Pacset", rescale_power) + end _PM._apply_func!(conv, "LossA", rescale_power) _PM._apply_func!(conv, "Pacmax", rescale_power) _PM._apply_func!(conv, "Pacmin", rescale_power) diff --git a/test/data/case5_acdc_droop_acside.m b/test/data/case5_acdc_droop_acside.m index 10b3abc8..7733ea39 100644 --- a/test/data/case5_acdc_droop_acside.m +++ b/test/data/case5_acdc_droop_acside.m @@ -59,11 +59,11 @@ ]; %% converters -%column_names% busdc_i busac_i type_dc type_ac P_g Q_g islcc Vtar rtf xtf transformer tm bf filter rc xc reactor basekVac Vmmax Vmmin Imax status LossA LossB LossCrec LossCinv droop Pdcset Vdcset dVdcset Pacmax Pacmin Qacmax Qacmin +%column_names% busdc_i busac_i type_dc type_ac P_g Q_g islcc Vtar rtf xtf transformer tm bf filter rc xc reactor basekVac Vmmax Vmmin Imax status LossA LossB LossCrec LossCinv droop Pdcset Vdcset dVdcset Pacset Pacmax Pacmin Qacmax Qacmin mpc.convdc = [ -1 2 4 1 -60 -40 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0050 -58.6274 1.0079 0 100 -100 50 -50; -2 3 4 2 0 0 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0070 21.9013 1.0000 0 100 -100 50 -50; -3 5 4 2 35 5 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0050 36.1856 0.9978 0 100 -100 50 -50; +1 2 4 1 -60 -40 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0050 -58.6274 1.0079 0 -60 100 -100 50 -50; +2 3 4 2 0 0 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0070 21.9013 1.0000 0 0 100 -100 50 -50; +3 5 4 2 35 5 0 1 0.01 0.01 1 1 0.01 1 0.01 0.01 1 345 1.1 0.9 1.1 1 1.103 0.887 2.885 2.885 0.0050 36.1856 0.9978 0 35 100 -100 50 -50; ]; %% branches