Skip to content

Commit bf3f14a

Browse files
samirromdhanisamirromdhani
committed
improve SVC validation rules wip
Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>
1 parent d6dbb8a commit bf3f14a

File tree

3 files changed

+70
-37
lines changed

3 files changed

+70
-37
lines changed

‎loadflow/loadflow-validation/src/main/java/com/powsybl/loadflow/validation/StaticVarCompensatorsValidation.java‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
import com.powsybl.iidm.network.StaticVarCompensator.RegulationMode;
2626
import com.powsybl.loadflow.validation.io.ValidationWriter;
2727

28-
import static com.powsybl.loadflow.validation.ValidationUtils.isOutsideTolerance;
29-
import static com.powsybl.loadflow.validation.ValidationUtils.isUndefinedOrZero;
28+
import static com.powsybl.loadflow.validation.ValidationUtils.*;
3029

3130
/**
3231
*
@@ -150,7 +149,7 @@ public boolean checkSVCs(String id, double p, double q, double vControlled, doub
150149

151150
if (connected && ValidationUtils.isMainComponent(config, mainComponent)) {
152151
if (Double.isNaN(p) || Double.isNaN(q)) {
153-
// Rule2 : TODO
152+
// Rule2: **reactivePowerSetpoint** must be 0 if p or q is missing (NaN)
154153
validated = checkSVCsNaNValues(id, p, q, reactivePowerSetpoint);
155154
} else {
156155
// Rule1, Rule3, Rule4, Rule5
@@ -167,7 +166,6 @@ public boolean checkSVCs(String id, double p, double q, double vControlled, doub
167166

168167
private static boolean checkSVCsNaNValues(String id, double p, double q, double reactivePowerSetpoint) {
169168
// a validation error should be detected if there is a setpoint but no p or q
170-
// Rule2: reactivePowerSetpoint must be undefined or equal to 0 when no p or q
171169
if (!isUndefinedOrZero(reactivePowerSetpoint, 0.0)) {
172170
LOGGER.warn("{} {}: {}: P={} Q={} reactivePowerSetpoint={}", ValidationType.SVCS, ValidationUtils.VALIDATION_ERROR, id, p, q, reactivePowerSetpoint);
173171
return false;
@@ -185,11 +183,9 @@ private static boolean checkSVCsValues(String id, double p, double q, double vCo
185183
LOGGER.warn("{} {}: {}: P={}", ValidationType.SVCS, ValidationUtils.VALIDATION_ERROR, id, p);
186184
validated = false;
187185
}
188-
189-
double vAux = vController; // voltage in bus
190-
if (vAux == 0 || Double.isNaN(vAux)) {
191-
vAux = nominalVcontroller; // voltage in VoltageLevel
192-
}
186+
// vController: voltage in bus
187+
// nominalVcontroller: voltage in VoltageLevel
188+
double vAux = voltageFrom(vController, nominalVcontroller);
193189
double qMin = -bMax * vAux * vAux;
194190
double qMax = -bMin * vAux * vAux;
195191

@@ -223,14 +219,13 @@ private static boolean checkSVCsValues(String id, double p, double q, double vCo
223219
private static boolean reactivePowerRegulationModeKo(RegulationMode regulationMode, double q, double qMin,
224220
double qMax, double reactivePowerSetpoint, ValidationConfig config) {
225221
// if regulationMode = REACTIVE_POWER, the reactive power must be equal to setpoint
226-
227222
if (regulationMode != RegulationMode.REACTIVE_POWER) {
228223
return false;
229224
}
230225
if (ValidationUtils.areNaN(config, reactivePowerSetpoint, qMin, qMax)) {
231226
return true;
232227
}
233-
return Math.abs(q - reactivePowerSetpoint) > config.getThreshold();
228+
return isOutsideTolerance(q, reactivePowerSetpoint, config.getThreshold());
234229
}
235230

236231
private static boolean voltageRegulationModeKo(RegulationMode regulationMode, double q, double qMin,
@@ -240,20 +235,21 @@ private static boolean voltageRegulationModeKo(RegulationMode regulationMode, do
240235
// or q is equal to Qmin = -bMax * V * V and V is higher than voltageSetpoint
241236
// or V at the controlled bus is equal to voltageSetpoint and q is bounded
242237
// within [Qmin=-bMax*V*V, Qmax=-bMin*V*V]
243-
238+
double threshold = config.getThreshold();
244239
if (regulationMode != RegulationMode.VOLTAGE) {
245240
return false;
246241
}
247242
if (ValidationUtils.areNaN(config, qMin, qMax, vControlled, voltageSetpoint)) {
248243
return true;
249244
}
250-
if (vControlled < voltageSetpoint - config.getThreshold() && Math.abs(q - qMax) > config.getThreshold()) {
245+
if (vControlled < voltageSetpoint - threshold && isOutsideTolerance(q, qMax, threshold)) {
251246
return true;
252247
}
253-
if (vControlled > voltageSetpoint + config.getThreshold() && Math.abs(q - qMin) > config.getThreshold()) {
248+
if (vControlled > voltageSetpoint + threshold && isOutsideTolerance(q, qMin, threshold)) {
254249
return true;
255250
}
256-
return Math.abs(vControlled - voltageSetpoint) < config.getThreshold() && !ValidationUtils.boundedWithin(qMin, qMax, q, config.getThreshold());
251+
boolean voltageAtSetpoint = Math.abs(vControlled - voltageSetpoint) < threshold;
252+
return voltageAtSetpoint && !boundedWithin(qMin, qMax, q, threshold);
257253
}
258254

259255
private static boolean notRegulatingKo(boolean regulating, double q, ValidationConfig config) {

‎loadflow/loadflow-validation/src/main/java/com/powsybl/loadflow/validation/ValidationUtils.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,13 @@ public static double computeShuntExpectedQ(double bPerSection, int sectionCount,
122122
return -bPerSection * sectionCount * v * v;
123123
}
124124

125+
public record QBounds(double qMin, double qMax) { }
126+
127+
public static double voltageFrom(double vBus, double nominalV) {
128+
return (Double.isNaN(vBus) || vBus == 0.0) ? nominalV : vBus;
129+
}
130+
131+
public static boolean isWithinInclusive(double value, double min, double max, double epsilon) {
132+
return boundedWithin(min, max, value, epsilon);
133+
}
125134
}

‎loadflow/loadflow-validation/src/test/java/com/powsybl/loadflow/validation/StaticVarCompensatorsValidationTest.java‎

Lines changed: 50 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import static org.junit.jupiter.api.Assertions.assertFalse;
1111
import static org.junit.jupiter.api.Assertions.assertTrue;
12+
import static org.mockito.Mockito.when;
1213

1314
import java.io.IOException;
1415
import java.util.stream.Stream;
@@ -55,35 +56,35 @@ void setUp() throws IOException {
5556
super.setUp();
5657

5758
Bus svcBus = Mockito.mock(Bus.class);
58-
Mockito.when(svcBus.getV()).thenReturn(v);
59-
Mockito.when(svcBus.isInMainConnectedComponent()).thenReturn(mainComponent);
59+
when(svcBus.getV()).thenReturn(v);
60+
when(svcBus.isInMainConnectedComponent()).thenReturn(mainComponent);
6061

6162
svcBusView = Mockito.mock(BusView.class);
62-
Mockito.when(svcBusView.getBus()).thenReturn(svcBus);
63-
Mockito.when(svcBusView.getConnectableBus()).thenReturn(svcBus);
63+
when(svcBusView.getBus()).thenReturn(svcBus);
64+
when(svcBusView.getConnectableBus()).thenReturn(svcBus);
6465

6566
VoltageLevel voltageLevel = Mockito.mock(VoltageLevel.class);
66-
Mockito.when(voltageLevel.getNominalV()).thenReturn(nominalV);
67+
when(voltageLevel.getNominalV()).thenReturn(nominalV);
6768

6869
svcTerminal = Mockito.mock(Terminal.class);
69-
Mockito.when(svcTerminal.getP()).thenReturn(p);
70-
Mockito.when(svcTerminal.getQ()).thenReturn(q);
71-
Mockito.when(svcTerminal.getBusView()).thenReturn(svcBusView);
72-
Mockito.when(svcTerminal.getVoltageLevel()).thenReturn(voltageLevel);
70+
when(svcTerminal.getP()).thenReturn(p);
71+
when(svcTerminal.getQ()).thenReturn(q);
72+
when(svcTerminal.getBusView()).thenReturn(svcBusView);
73+
when(svcTerminal.getVoltageLevel()).thenReturn(voltageLevel);
7374

7475
svc = Mockito.mock(StaticVarCompensator.class);
75-
Mockito.when(svc.getId()).thenReturn("svc");
76-
Mockito.when(svc.getTerminal()).thenReturn(svcTerminal);
77-
Mockito.when(svc.getReactivePowerSetpoint()).thenReturn(reactivePowerSetpoint);
78-
Mockito.when(svc.getVoltageSetpoint()).thenReturn(voltageSetpoint);
79-
Mockito.when(svc.getRegulationMode()).thenReturn(regulationMode);
80-
Mockito.when(svc.isRegulating()).thenReturn(regulating);
81-
Mockito.when(svc.getBmin()).thenReturn(bMin);
82-
Mockito.when(svc.getBmax()).thenReturn(bMax);
76+
when(svc.getId()).thenReturn("svc");
77+
when(svc.getTerminal()).thenReturn(svcTerminal);
78+
when(svc.getReactivePowerSetpoint()).thenReturn(reactivePowerSetpoint);
79+
when(svc.getVoltageSetpoint()).thenReturn(voltageSetpoint);
80+
when(svc.getRegulationMode()).thenReturn(regulationMode);
81+
when(svc.isRegulating()).thenReturn(regulating);
82+
when(svc.getBmin()).thenReturn(bMin);
83+
when(svc.getBmax()).thenReturn(bMax);
8384
}
8485

8586
@Test
86-
void checkSvcsValues() {
87+
void checkSvcsValuess() {
8788
// active power should be equal to 0
8889
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs("test", p, q, v, v, nominalV, reactivePowerSetpoint, voltageSetpoint, regulationMode, regulating, bMin, bMax, connected, mainComponent, strictConfig, NullWriter.INSTANCE));
8990
p = -39.8;
@@ -168,19 +169,19 @@ void checkSvcsValues() {
168169
void checkSvcs() {
169170
// active power should be equal to 0
170171
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
171-
Mockito.when(svcTerminal.getP()).thenReturn(-39.8);
172+
when(svcTerminal.getP()).thenReturn(-39.8);
172173
assertFalse(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
173174

174175
// the unit is disconnected
175-
Mockito.when(svcBusView.getBus()).thenReturn(null);
176+
when(svcBusView.getBus()).thenReturn(null);
176177
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
177178
}
178179

179180
@Test
180181
void checkNetworkSvcs() throws IOException {
181182
Network network = Mockito.mock(Network.class);
182-
Mockito.when(network.getId()).thenReturn("network");
183-
Mockito.when(network.getStaticVarCompensatorStream()).thenAnswer(dummy -> Stream.of(svc));
183+
when(network.getId()).thenReturn("network");
184+
when(network.getStaticVarCompensatorStream()).thenAnswer(dummy -> Stream.of(svc));
184185

185186
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(network, looseConfig, data));
186187

@@ -189,4 +190,31 @@ void checkNetworkSvcs() throws IOException {
189190
ValidationWriter validationWriter = ValidationUtils.createValidationWriter(network.getId(), looseConfig, NullWriter.INSTANCE, ValidationType.SVCS);
190191
assertTrue(ValidationType.SVCS.check(network, looseConfig, validationWriter));
191192
}
193+
194+
// Rule1: active power should be equal to 0
195+
@Test
196+
void checkSVCActivePowerShouldBeZeroWithinThreshold() {
197+
// Given (p = 0)
198+
when(svcTerminal.getP()).thenReturn(0.0);
199+
//When Then
200+
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
201+
//Given (p > 0.01)
202+
when(svcTerminal.getP()).thenReturn(0.02);
203+
//When Then
204+
assertFalse(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
205+
}
206+
207+
// Rule2: **reactivePowerSetpoint** must be 0 if p or q is missing (NaN)
208+
@Test
209+
void checkSVCReactivePowerSetpointWhenPOrQMissing() {
210+
// non-zero setpoint with missing p/q => KO
211+
when(svcTerminal.getP()).thenReturn(Double.NaN);
212+
when(svcTerminal.getQ()).thenReturn(Double.NaN);
213+
when(svc.getReactivePowerSetpoint()).thenReturn(5.0);
214+
assertFalse(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
215+
// zero setpoint with missing p/q => OK
216+
when(svc.getReactivePowerSetpoint()).thenReturn(0.0);
217+
assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
218+
}
219+
192220
}

0 commit comments

Comments
 (0)