Skip to content

Commit

Permalink
transformers shunt impedances correction
Browse files Browse the repository at this point in the history
  • Loading branch information
@CBiasuzzi
CBiasuzzi committed Jun 7, 2018
1 parent 3fc12f9 commit c3ee48e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 24 deletions.
8 changes: 8 additions & 0 deletions eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/EchUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,12 @@ public static HvdcConverterStation getVStation(HvdcLine hvdcLine) {
return null;
}

public static boolean isSameConnectionBus(ConnectionBus bus1, ConnectionBus bus2) {
return (bus1 == null || bus2 == null) ? bus1 == bus2 : (bus1.getId() == null ? bus2.getId() == null : bus1.getId().equals(bus2.getId()));
}

public static boolean isSameBus(Bus bus1, Bus bus2) {
return (bus1 == null || bus2 == null) ? bus1 == bus2 : (bus1.getId() == null ? bus2.getId() == null : bus1.getId().equals(bus2.getId()));
}

}
41 changes: 17 additions & 24 deletions ...ag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/EurostagEchExport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private void createCouplingDevices(EsgNetwork esgNetwork) {
Bus bus1 = EchUtil.getBus1(vl, sw.getId(), config);
Bus bus2 = EchUtil.getBus2(vl, sw.getId(), config);
//do not export the Switch if bus1==bus2
if ((bus1 == bus2) || ((bus1 != null) && (bus2 != null) && (bus1.getId().equals(bus2.getId())))) {
if (EchUtil.isSameBus(bus1, bus2)) {
LOGGER.warn("skipping Switch: {}; bus1 is equal to bus2: {}", sw.getId(), bus1 != null ? bus1.getId() : bus1);
continue;
}
Expand Down Expand Up @@ -211,7 +211,7 @@ private void createLines(EsgNetwork esgNetwork, EsgGeneralParameters parameters)
ConnectionBus bus1 = ConnectionBus.fromTerminal(l.getTerminal1(), config, fakeNodes);
ConnectionBus bus2 = ConnectionBus.fromTerminal(l.getTerminal2(), config, fakeNodes);
//do not export the line if bus1==bus2
if ((bus1 == bus2) || ((bus1 != null) && (bus2 != null) && (bus1.getId().equals(bus2.getId())))) {
if (EchUtil.isSameConnectionBus(bus1, bus2)) {
LOGGER.warn("skipping Line: {}; bus1 is equal to bus2: {}", l, bus1 != null ? bus1.getId() : bus1);
continue;
}
Expand Down Expand Up @@ -308,32 +308,25 @@ private EsgDetailedTwoWindingTransformer.Tap createTap(TwoWindingsTransformer tw


private void createAdditionalBank(EsgNetwork esgNetwork, TwoWindingsTransformer twt, Terminal terminal, String nodeName, Set<String> additionalBanksIds) {
float rcapba = 0.0f;
if (-twt.getB() < 0) {
rcapba = twt.getB() * (float) Math.pow(terminal.getVoltageLevel().getNominalV(), 2) / (config.isSpecificCompatibility() ? 2 : 1);
}
float plosba = 0.0f;
if (twt.getG() < 0) {
plosba = twt.getG() * (float) Math.pow(terminal.getVoltageLevel().getNominalV(), 2) / (config.isSpecificCompatibility() ? 2 : 1);
}
if ((Math.abs(plosba) > G_EPSILON) || (rcapba > B_EPSILON)) {
//simple new bank naming: 5 first letters of the node name, 7th letter of the node name, 'C', order code
float rcapba = twt.getB() * (float) Math.pow(terminal.getVoltageLevel().getNominalV(), 2) / (config.isSpecificCompatibility() ? 2 : 1);
float plosba = twt.getG() * (float) Math.pow(terminal.getVoltageLevel().getNominalV(), 2) / (config.isSpecificCompatibility() ? 2 : 1);
if ((Math.abs(plosba) > G_EPSILON) || (Math.abs(rcapba) > B_EPSILON)) {
//simple new bank naming: 4 first letters of the node name, 7th letter of the node name, 'C', 2 digits order code
String nnodeName = Strings.padEnd(nodeName, 8, ' ');
String newBankNamePrefix = nnodeName.substring(0, 5) + nnodeName.charAt(6) + 'C';
String newBankName = newBankNamePrefix + '0';
String newBankNamePrefix = nnodeName.substring(0, 4) + nnodeName.charAt(6) + 'C';
String newBankName = newBankNamePrefix + "00";
int counter = 1;
while (additionalBanksIds.contains(newBankName)) {
String newCounter = Integer.toString(counter++);
if (newCounter.length() > 1) {
String newCounter = String.format("%02d", counter++);
if (newCounter.length() > 2) {
throw new RuntimeException("Renaming error " + nodeName + " -> " + newBankName);
}
newBankName = newBankNamePrefix + newCounter;
}
additionalBanksIds.add(newBankName);
LOGGER.info("create additional bank: {}, node: {}", newBankName, nodeName);
LOGGER.info("create additional bank with id: {} at node: {}, for twt: {} ( B={}, G={} ); rcapba={}, plosba={}", newBankName, nodeName, twt, twt.getB(), twt.getG(), rcapba, plosba);
esgNetwork.addCapacitorsOrReactorBanks(new EsgCapacitorOrReactorBank(new Esg8charName(newBankName), new Esg8charName(nodeName), 1, plosba, rcapba, 1, EsgCapacitorOrReactorBank.RegulatingMode.NOT_REGULATING));
}

}

private float getRtcRho1(TwoWindingsTransformer twt, int p) {
Expand Down Expand Up @@ -416,8 +409,8 @@ private void createTransformers(EsgNetwork esgNetwork, EsgGeneralParameters para

ConnectionBus bus1 = ConnectionBus.fromTerminal(twt.getTerminal1(), config, fakeNodes);
ConnectionBus bus2 = ConnectionBus.fromTerminal(twt.getTerminal2(), config, fakeNodes);
//do not export the Transformet if bus1==bus2
if ((bus1 == bus2) || ((bus1 != null) && (bus2 != null) && (bus1.getId().equals(bus2.getId())))) {
//do not export the Transformer if bus1==bus2
if (EchUtil.isSameConnectionBus(bus1, bus2)) {
LOGGER.warn("skipping Transformer: {}; bus1 is equal to bus2: {}", twt, bus1 != null ? bus1.getId() : bus1);
continue;
}
Expand Down Expand Up @@ -529,13 +522,13 @@ private void createTransformers(EsgNetwork esgNetwork, EsgGeneralParameters para
float pregmax = Float.NaN; //...?

//handling of the cases where cmagn should be negative and where pfer should be negative
if ((-twt.getB() < 0) || (twt.getG() < 0) || (config.isSpecificCompatibility())) {
if ((-twt.getB() < 0) || (twt.getG() < 0)) {
createAdditionalBank(esgNetwork, twt, twt.getTerminal1(), dictionary.getEsgId(bus1.getId()), additionalBanksIds);
if (config.isSpecificCompatibility()) {
createAdditionalBank(esgNetwork, twt, twt.getTerminal2(), dictionary.getEsgId(bus2.getId()), additionalBanksIds);
}
}

if (config.isSpecificCompatibility()) {
createAdditionalBank(esgNetwork, twt, twt.getTerminal2(), dictionary.getEsgId(bus2.getId()), additionalBanksIds);
}

EsgDetailedTwoWindingTransformer esgTransfo = new EsgDetailedTwoWindingTransformer(
new EsgBranchName(new Esg8charName(dictionary.getEsgId(bus1.getId())),
Expand Down

0 comments on commit c3ee48e

Please sign in to comment.