File tree Expand file tree Collapse file tree 3 files changed +2
-5
lines changed
iidm-impl/src/main/java/com/powsybl/iidm/network/impl
java/com/powsybl/iidm/serde Expand file tree Collapse file tree 3 files changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -177,18 +177,16 @@ private VoltageRegulation createVoltageRegulation() {
177177 .setNetwork (getNetworkRef ())
178178 .setTerminal (this .regulatingTerminal );
179179 // VOLTAGE case
180- if (Boolean .TRUE .equals (this .voltageRegulatorOn ) && ! Double . isNaN ( this . targetV ) ) {
180+ if (Boolean .TRUE .equals (this .voltageRegulatorOn )) {
181181 builder .setRegulating (true )
182182 .setMode (RegulationMode .VOLTAGE )
183183 .setTargetValue (this .targetV );
184- // this.targetV = Double.NaN;
185184 return builder .build ();
186185 // REACTIVE Power case
187186 } else if (!Double .isNaN (this .targetQ )) {
188187 builder .setRegulating (true )
189188 .setMode (RegulationMode .REACTIVE_POWER )
190189 .setTargetValue (this .targetQ );
191- // this.targetQ = Double.NaN;
192190 return builder .build ();
193191 }
194192 return null ;
Original file line number Diff line number Diff line change 2222import com .powsybl .iidm .network .test .*;
2323import com .powsybl .iidm .serde .extensions .util .NetworkSourceExtension ;
2424import com .powsybl .iidm .serde .extensions .util .NetworkSourceExtensionImpl ;
25- import org .junit .jupiter .api .Disabled ;
2625import org .junit .jupiter .api .Test ;
2726import org .junit .jupiter .params .ParameterizedTest ;
2827import org .junit .jupiter .params .provider .EnumSource ;
@@ -228,7 +227,6 @@ void busBreakerExtensions() throws IOException {
228227 }
229228
230229 @ Test
231- @ Disabled ("TODO MSA inconsistency between targetV/Q null and VoltageRegulatorOn = true" )
232230 void testScada () throws IOException {
233231 Network network = ScadaNetworkFactory .create ();
234232 assertEquals (ValidationLevel .EQUIPMENT , network .runValidationChecks (false ));
Original file line number Diff line number Diff line change 1010 <iidm : point p =" 0.0" minQ =" 0.0" maxQ =" 0.0" />
1111 <iidm : point p =" 10.0" minQ =" 5.0" maxQ =" 15.0" />
1212 </iidm : reactiveCapabilityCurve >
13+ <iidm : voltageRegulation regulating =" true" mode =" VOLTAGE" />
1314 </iidm : generator >
1415 <iidm : battery id =" battery" minP =" 0.0" maxP =" 100.0" bus =" bus" connectableBus =" bus" >
1516 <iidm : minMaxReactiveLimits minQ =" -1.7976931348623157E308" maxQ =" 1.7976931348623157E308" />
You can’t perform that action at this time.
0 commit comments