Skip to content

Commit

Permalink
Merge branch 'main' into write-properties-for-calculated-buses
Browse files Browse the repository at this point in the history
  • Loading branch information
@EtienneLt
EtienneLt authored Jul 5, 2023
2 parents d4ab4c3 + cb0a058 commit e565795
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 40 deletions.
21 changes: 15 additions & 6 deletions ...s/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,16 +277,25 @@ private static void writeLoads(Network network, LoadGroups loadGroups, String ci
if (context.isExportedEquipment(load)) {
LoadDetail loadDetail = load.getExtension(LoadDetail.class);
String className = CgmesExportUtil.loadClassName(loadDetail);
String loadGroup = loadGroups.groupFor(className);
EnergyConsumerEq.write(className,
context.getNamingStrategy().getCgmesId(load),
load.getNameOrId(), loadGroup,
context.getNamingStrategy().getCgmesId(load.getTerminal().getVoltageLevel()),
cimNamespace, writer, context);
String loadId = context.getNamingStrategy().getCgmesId(load);
if (load.getP0() < 0) {
// As negative loads are not allowed, they are modeled as energy source.
// Note that negative loads can be the result of network reduction and could be modeled
// as equivalent injections.
writeEnergySource(loadId, load.getNameOrId(), cimNamespace, writer, context);
} else {
String loadGroup = loadGroups.groupFor(className);
EnergyConsumerEq.write(className, loadId, load.getNameOrId(), loadGroup, context.getNamingStrategy().getCgmesId(load.getTerminal().getVoltageLevel()), cimNamespace, writer, context);
}
}
}
}

public static void writeEnergySource(String id, String name, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
CgmesExportUtil.writeStartIdName("EnergySource", id, name, cimNamespace, writer, context);
writer.writeEndElement();
}

private static void writeGenerators(Network network, Map<Terminal, String> mapTerminal2Id, Set<String> regulatingControlsWritten, String cimNamespace, boolean writeInitialP,
XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
// Multiple synchronous machines may be grouped in the same generating unit
Expand Down
85 changes: 51 additions & 34 deletions ...ersion/src/main/java/com/powsybl/cgmes/conversion/export/SteadyStateHypothesisExport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,22 @@ private static void writeEquivalentInjections(Network network, String cimNamespa
// One equivalent injection for every dangling line
List<String> exported = new ArrayList<>();
for (DanglingLine dl : network.getDanglingLines(DanglingLineFilter.UNPAIRED)) {
writeEquivalentInjection(dl, exported, cimNamespace, writer, context);
String ei = dl.getProperty(Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + "EquivalentInjection");
if (!exported.contains(ei) && ei != null) {
// Ensure equivalent injection identifier is valid
String cgmesId = context.getNamingStrategy().getCgmesIdFromProperty(dl, Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + "EquivalentInjection");
// regulationStatus and regulationTarget are optional,
// but test cases contain the attributes with disabled and 0
boolean regulationStatus = false;
double regulationTarget = 0;
if (dl.getGeneration() != null) {
regulationStatus = dl.getGeneration().isVoltageRegulationOn();
regulationTarget = dl.getGeneration().getTargetV();
}
writeEquivalentInjection(cgmesId, dl.getP0(), dl.getQ0(), regulationStatus, regulationTarget, cimNamespace, writer, context);
exported.add(ei);
}

}
}

Expand Down Expand Up @@ -515,48 +530,50 @@ private static void writeTerminal(String terminalId, boolean connected, String c
}
}

private static void writeEquivalentInjection(DanglingLine dl, List<String> exported, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
String ei = dl.getProperty(Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + "EquivalentInjection");
if (exported.contains(ei)) {
return;
}
if (ei != null) {
// Ensure equivalent injection identifier is valid
String cgmesId = context.getNamingStrategy().getCgmesIdFromProperty(dl, Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + "EquivalentInjection");
CgmesExportUtil.writeStartAbout("EquivalentInjection", cgmesId, cimNamespace, writer, context);
writer.writeStartElement(cimNamespace, "EquivalentInjection.p");
writer.writeCharacters(CgmesExportUtil.format(dl.getP0()));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EquivalentInjection.q");
writer.writeCharacters(CgmesExportUtil.format(dl.getQ0()));
writer.writeEndElement();
// regulationStatus and regulationTarget are optional,
// but test cases contain the attributes with disabled and 0
boolean regulationStatus = false;
double regulationTarget = 0;
if (dl.getGeneration() != null) {
regulationStatus = dl.getGeneration().isVoltageRegulationOn();
regulationTarget = dl.getGeneration().getTargetV();
}
writer.writeStartElement(cimNamespace, "EquivalentInjection.regulationStatus");
writer.writeCharacters(Boolean.toString(regulationStatus));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EquivalentInjection.regulationTarget");
writer.writeCharacters(CgmesExportUtil.format(regulationTarget));
writer.writeEndElement();
writer.writeEndElement();
exported.add(ei);
}
private static void writeEquivalentInjection(String cgmesId, double p, double q, boolean regulationStatus, double regulationTarget, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
CgmesExportUtil.writeStartAbout("EquivalentInjection", cgmesId, cimNamespace, writer, context);
writer.writeStartElement(cimNamespace, "EquivalentInjection.p");
writer.writeCharacters(CgmesExportUtil.format(p));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EquivalentInjection.q");
writer.writeCharacters(CgmesExportUtil.format(q));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EquivalentInjection.regulationStatus");
writer.writeCharacters(Boolean.toString(regulationStatus));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EquivalentInjection.regulationTarget");
writer.writeCharacters(CgmesExportUtil.format(regulationTarget));
writer.writeEndElement();
writer.writeEndElement();
}

private static void writeEnergyConsumers(Network network, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
for (Load load : network.getLoads()) {
if (context.isExportedEquipment(load)) {
writeSshEnergyConsumer(context.getNamingStrategy().getCgmesId(load), load.getP0(), load.getQ0(), load.getExtension(LoadDetail.class), cimNamespace, writer, context);
if (load.getP0() < 0) {
// As negative loads are not allowed, they are modeled as energy source.
// Note that negative loads can be the result of network reduction and could be modeled
// as equivalent injections.
String cgmesId = context.getNamingStrategy().getCgmesId(load);
writeEnergySource(cgmesId, load.getP0(), load.getQ0(), cimNamespace, writer, context);
} else {
writeSshEnergyConsumer(context.getNamingStrategy().getCgmesId(load), load.getP0(), load.getQ0(), load.getExtension(LoadDetail.class), cimNamespace, writer, context);
}
}
}
}

private static void writeEnergySource(String id, double p, double q, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
CgmesExportUtil.writeStartAbout("EnergySource", id, cimNamespace, writer, context);
writer.writeStartElement(cimNamespace, "EnergySource.activePower");
writer.writeCharacters(CgmesExportUtil.format(p));
writer.writeEndElement();
writer.writeStartElement(cimNamespace, "EnergySource.reactivePower");
writer.writeCharacters(CgmesExportUtil.format(q));
writer.writeEndElement();
writer.writeEndElement();
}

private static void writeSshEnergyConsumer(String id, double p, double q, LoadDetail loadDetail, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException {
CgmesExportUtil.writeStartAbout(CgmesExportUtil.loadClassName(loadDetail), id, cimNamespace, writer, context);
writer.writeStartElement(cimNamespace, "EnergyConsumer.p");
Expand Down

0 comments on commit e565795

Please sign in to comment.