Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CGMES EQ export fixes #2528

Merged
merged 9 commits into from
Apr 13, 2023
Merged

CGMES EQ export fixes #2528

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70717c1
Fix tculControlMode in CGMES export: it is a reference and not a field
miovd Apr 3, 2023
9e324a7
Add SynchronousMachine.type attribute
miovd Apr 4, 2023
fc7f43d
LinearShuntCompensator.gPerSection is not optional
miovd Apr 4, 2023
6b8c953
Add WindGeneratingUnit.windGenUnitType attribute
miovd Apr 4, 2023
1ccb134
Fix `stepVoltageIncrement` to not be infinite
miovd Apr 4, 2023
fca2b70
Merge branch 'main' into fix_tculControlMode
zamarrenolm Apr 12, 2023
9a397ae
Merge branch 'main' into fix_tculControlMode
zamarrenolm Apr 13, 2023
0c260cd
Add test
miovd Apr 13, 2023
c76e9f1
Merge branch 'main' into fix_tculControlMode
miovd Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...s/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,12 @@ private static <C extends Connectable<C>> void writeRatioTapChanger(C eq, RatioT
String cgmesTapChangerId = context.getNamingStrategy().getCgmesIdFromAlias(eq, aliasType);

int neutralStep = getRatioTapChangerNeutralStep(rtc);
double stepVoltageIncrement = 100.0 * (1.0 / rtc.getStep(rtc.getLowTapPosition()).getRho() - 1.0) / (rtc.getLowTapPosition() - neutralStep);
double stepVoltageIncrement;
if (rtc.getHighTapPosition() == rtc.getLowTapPosition()) {
stepVoltageIncrement = 100;
} else {
stepVoltageIncrement = 100.0 * (1.0 / rtc.getStep(rtc.getLowTapPosition()).getRho() - 1.0 / rtc.getStep(rtc.getHighTapPosition()).getRho()) / (rtc.getLowTapPosition() - rtc.getHighTapPosition());
}
String ratioTapChangerTableId = CgmesExportUtil.getUniqueId();
Optional<String> regulatingControlId = getTapChangerControlId(eq, tapChangerId);
String cgmesRegulatingControlId = null;
Expand Down
7 changes: 7 additions & 0 deletions ...nversion/src/main/java/com/powsybl/cgmes/conversion/export/elements/GeneratingUnitEq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

import com.powsybl.cgmes.conversion.export.CgmesExportContext;
import com.powsybl.cgmes.conversion.export.CgmesExportUtil;
import com.powsybl.cgmes.model.CgmesNames;
import com.powsybl.iidm.network.EnergySource;

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;

import static com.powsybl.cgmes.model.CgmesNamespace.RDF_NAMESPACE;

/**
* @author Marcos de Miguel <demiguelm at aia.es>
*/
Expand All @@ -39,6 +42,10 @@ public static void write(String id, String generatingUnitName, EnergySource ener
if (equipmentContainer != null) {
CgmesExportUtil.writeReference("Equipment.EquipmentContainer", equipmentContainer, cimNamespace, writer, context);
}
if (energySource == EnergySource.WIND) {
writer.writeEmptyElement(cimNamespace, "WindGeneratingUnit.windGenUnitType");
writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, String.format("%s%s", cimNamespace, "WindGenUnitKind.onshore")); // all generators are considered onshore
}
writer.writeEndElement();
}

Expand Down
6 changes: 4 additions & 2 deletions ...ersion/src/main/java/com/powsybl/cgmes/conversion/export/elements/ShuntCompensatorEq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ public static void write(String id, String shuntCompensatorName, int normalSecti
writer.writeCharacters(CgmesExportUtil.format(bPerSection));
}
writer.writeEndElement();
writer.writeStartElement(cimNamespace, EQ_LINEARSHUNTCOMPENSATOR_GPERSECTION);
if (!Double.isNaN(gPerSection)) {
writer.writeStartElement(cimNamespace, EQ_LINEARSHUNTCOMPENSATOR_GPERSECTION);
writer.writeCharacters(CgmesExportUtil.format(gPerSection));
writer.writeEndElement();
} else {
writer.writeCharacters("0");
}
writer.writeEndElement();
}
if (regulatingControlId != null) {
CgmesExportUtil.writeReference("RegulatingCondEq.RegulatingControl", regulatingControlId, cimNamespace, writer, context);
Expand Down
5 changes: 5 additions & 0 deletions ...sion/src/main/java/com/powsybl/cgmes/conversion/export/elements/SynchronousMachineEq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@

import com.powsybl.cgmes.conversion.export.CgmesExportContext;
import com.powsybl.cgmes.conversion.export.CgmesExportUtil;
import com.powsybl.cgmes.model.CgmesNames;

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;

import static com.powsybl.cgmes.model.CgmesNamespace.RDF_NAMESPACE;

/**
* @author Marcos de Miguel <demiguelm at aia.es>
*/
Expand Down Expand Up @@ -39,6 +42,8 @@ public static void write(String id, String generatorName, String equipmentContai
writer.writeCharacters(CgmesExportUtil.format(ratedS));
writer.writeEndElement();
}
writer.writeEmptyElement(cimNamespace, "SynchronousMachine.type");
writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, String.format("%s%s", cimNamespace, "SynchronousMachineKind.generator")); // all generators are considered generators
writer.writeEndElement();
}

Expand Down
5 changes: 2 additions & 3 deletions ...s-conversion/src/main/java/com/powsybl/cgmes/conversion/export/elements/TapChangerEq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,8 @@ public static void writeRatio(String id, String tapChangerName, String transform
writer.writeCharacters(CgmesExportUtil.format(stepVoltageIncrement));
writer.writeEndElement();
writeSteps(lowStep, highStep, neutralStep, normalStep, neutralU, ltcFlag, cimNamespace, writer);
writer.writeStartElement(cimNamespace, "RatioTapChanger.tculControlMode");
writer.writeCharacters(String.format("%s%s.%s", cimNamespace, "TransformerControlMode", controlMode));
writer.writeEndElement();
writer.writeEmptyElement(cimNamespace, "RatioTapChanger.tculControlMode");
writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, String.format("%s%s.%s", cimNamespace, "TransformerControlMode", controlMode));
CgmesExportUtil.writeReference(EQ_RATIOTAPCHANGER_RATIOTAPCHANGERTABLE, ratioTapChangerTableId, cimNamespace, writer, context);
if (cgmesRegulatingControlId != null) {
CgmesExportUtil.writeReference("TapChanger.TapChangerControl", cgmesRegulatingControlId, cimNamespace, writer, context);
Expand Down