Skip to content

Commit

Permalink
TwoTerminalDc: Negative setvl (#2530)
Browse files Browse the repository at this point in the history 
Signed-off-by: José Antonio Marqués <marquesja@aia.es>
  • Loading branch information
@marqueslanauja
marqueslanauja authored Apr 9, 2023
1 parent bb91387 commit b279e6a
Show file tree
Hide file tree
Showing 4 changed files with 218 additions and 1 deletion.
2 changes: 1 addition & 1 deletion psse/psse-converter/src/main/java/com/powsybl/psse/converter/TwoTerminalDcConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private static double getTwoTerminalDcActivePowerSetpoint(PsseTwoTerminalDcTrans
switch (psseTwoTerminalDc.getMdc()) {
case 1:
// The desired real power demand
return psseTwoTerminalDc.getSetvl();
return Math.abs(psseTwoTerminalDc.getSetvl());
case 2:
// It is the current in amps (should divide by 1000 to convert to MW)
return psseTwoTerminalDc.getSetvl() * psseTwoTerminalDc.getVschd() / 1000.0;
Expand Down
5 changes: 5 additions & 0 deletions psse/psse-converter/src/test/java/com/powsybl/psse/converter/PsseImporterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ void twoTerminalDc() throws IOException {
importTest("twoTerminalDc", "twoTerminalDc.raw", false);
}

@Test
void twoTerminalDcWithNegativeSetvl() throws IOException {
importTest("twoTerminalDc_with_negative_setvl", "twoTerminalDc_with_negative_setvl.raw", false);
}

@Test
void parallelTwoTerminalDcBetweenSameAcBuses() throws IOException {
importTest("parallelTwoTerminalDcBetweenSameAcBuses", "parallelTwoTerminalDcBetweenSameAcBuses.raw", false);
Expand Down
66 changes: 66 additions & 0 deletions psse/psse-converter/src/test/resources/twoTerminalDc_with_negative_setvl.raw
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
0 100.00 33 0 0 60.000000000 / UW ARCHIVE
TwoTerminalDc Bus Test Case
8/19/93
1 'Bus 1' 230.00 3 1 1 1 1.06000000 .00000000 1.100000000 .900000000 1.100000000 .900000000
2 'Bus 2' 230.00 2 1 1 1 1.04500000 -5.78419916 1.100000000 .900000000 1.100000000 .900000000
3 'Bus 3' 230.00 2 1 1 1 1.01183507 -14.05192514 1.100000000 .900000000 1.100000000 .900000000
4 'Bus 4' 230.00 1 1 1 1 1.06078294 -13.09089157 1.100000000 .900000000 1.100000000 .900000000
5 'Bus 5' 230.00 1 1 1 1 1.05136109 -10.35696444 1.100000000 .900000000 1.100000000 .900000000
6 'Bus 6' 110.00 2 1 1 1 1.09675498 -11.66424213 1.100000000 .900000000 1.100000000 .900000000
7 'Bus 7' 110.00 1 1 1 1 1.36827024 -13.70448468 1.100000000 .900000000 1.100000000 .900000000
8 'Bus 8' 230.00 1 1 1 1 0.98968742 -5.48014421 1.100000000 .900000000 1.100000000 .900000000
9 'Bus 9' 2300.00 1 1 1 1 1.05132788 -15.10432485 1.100000000 .900000000 1.100000000 .900000000
0 / END OF BUS DATA
2 '1' 1 1 1 21.700000000 12.700000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
3 '1' 1 1 1 94.200000000 19.000000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
4 '1' 1 1 1 47.800000000 -3.900000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
5 '1' 1 1 1 7.600000000 1.600000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
6 '1' 1 1 1 11.200000000 7.500000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
7 '1' 1 1 1 7.600000000 1.600000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
9 '1' 1 1 1 98.750000000 -24.100000000 .000000000 .000000000 .000000000 -.000000000 1 1 0
0 / END OF LOAD DATA
9 1 1 .00 19.00
0 / END OF FIXED BUS SHUNT DATA
1 '1' 268.81 -37.65 .000000 .000000 1.060000 0 100.000000 .000000 1.000000 .000000 .000000 .000000 1 100.000000 464.800000 .000000 1 1.0000 0 0.0000 0 0.0000 0 0.0000 0 1.000000000
2 '1' 40.00 4.45 50.000000 -40.000000 1.045000 0 100.000000 .000000 1.000000 .000000 .000000 .000000 1 100.000000 80.000000 .000000 1 1.0000 0 0.0000 0 0.0000 0 0.0000 0 1.000000000
3 '1' .00 .00 40.000000 .000000 1.010000 0 100.000000 .000000 1.000000 .000000 .000000 .000000 1 100.000000 -.000000 .000000 1 1.0000 0 0.0000 0 0.0000 0 0.0000 0 1.000000000
6 '1' .00 -6.00 24.000000 -6.000000 1.010000 0 100.000000 .000000 1.000000 .000000 .000000 .000000 1 100.000000 -.000000 .000000 1 1.0000 0 0.0000 0 0.0000 0 0.0000 0 1.000000000
0 / END OF GENERATOR DATA
1 2 '1' .019380000 .059170000 .052800000 283.391898960 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
1 5 '1' .054030000 .223040000 .049200000 140.900465494 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
2 3 '1' .046990000 .197970000 .043800000 141.110268567 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
2 4 '1' .058110000 .176320000 .037400000 138.167616977 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
2 5 '1' .056950000 .173880000 .034000000 132.658748996 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
3 4 '1' .067010000 .171030000 .034600000 134.934547270 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
4 5 '1' .013350000 .042110000 .012800000 165.399281577 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
8 9 '1' .000000000 .176150000 .000000000 9999.000000000 .000000000 .000000000 .000000000 .000000000 .000000000 .000000000 1 1 1.00 1 1.0000 0 0.0000 0 0.0000 0 0.0000
0 / END OF NON TRANSFORMER BRANCH DATA
4 7 0 '1' 1 1 1 .000000000 .000000000 2 ' ' 1 0 0.0000 0 0.0000 0 0.0000 0 0.0000 ' '
.000000000 .209120000 100.00
.978000000 0.00 .000000000 9999.00 0.00 0.00 0 0 .000000000 .000000000 .000000000 .000000000 1 0 .000000000 .000000000 .000000000
1.000000000 0.00
5 6 0 '1' 1 1 1 .000000000 .000000000 2 ' ' 1 0 0.0000 0 0.0000 0 0.0000 0 0.0000 ' '
.000000000 .252020000 100.00
.932000000 0.00 .000000000 9999.00 0.00 0.00 0 0 .000000000 .000000000 .000000000 .000000000 1 0 .000000000 .000000000 .000000000
1.000000000 0.00
0 / END OF TRANSFORMER BRANCH DATA
1 2 .000000000 999.990000000 'IEEE 14 Bus Test Case'
0 / END OF AREA INTERCHANGE DATA
'EATL P1 ' 1 7.3650 -100.00 240.00 0.00 7.3650 0.10000 'R' 0.00 50 1.00000
4 1 17.30 12.70 0.4800 21.3200 240.0 0.83200 1.10000 1.20000 0.97500 0.01250 0 0 0 '1 ' 0.0000
8 1 20.50 18.00 0.4800 21.3200 240.0 1.73250 1.14190 1.20640 0.89680 0.01290 0 0 0 '1 ' 0.0000
0 / END OF TWO-TERMINAL DC TRANSMISSION LINE DATA
0 / END OF VSC DC DATA
0 / END OF TRANSFORMER IMPEDANCE CORRECTION TABLES
0 / END OF MULTI-TERMINAL DC TRANSMISSION LINE DATA
0 / END OF MULTI-SECTION LINE GROUPING DATA
1 'IEEE 14 BUS'
0 / END OF ZONE DATA
0 / END OF INTER-AREA TRANSFER DATA
1 'Default'
0 / END OF OWNER DATA
0 / END OF FACTS CONTROL DEVICE DATA
7 1 0 1 1.00000 0.99000 0 100.0 ' ' 100.00 1 100.00
0 / END OF SWITCHED SHUNT DATA
0 / END OF GNE DEVICE DATA
0 / END OF INDUCTION MACHINE DATA
Loading

0 comments on commit b279e6a

Please sign in to comment.