Add flag to enable/disable static var compensator regulation #3324
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -536,9 +536,9 @@ public static String getGeneratorRegulatingControlMode(Generator generator, Remo | |
| } | ||
|
|
||
| public static String getSvcMode(StaticVarCompensator svc) { | ||
| if (svc.getRegulationMode() != null && svc.getRegulationMode().equals(StaticVarCompensator.RegulationMode.VOLTAGE)) { | ||
| return RegulatingControlEq.REGULATING_CONTROL_VOLTAGE; | ||
| } else if (svc.getRegulationMode() != null && svc.getRegulationMode().equals(StaticVarCompensator.RegulationMode.REACTIVE_POWER)) { | ||
| return RegulatingControlEq.REGULATING_CONTROL_REACTIVE_POWER; | ||
| } else { | ||
| boolean validVoltageSetpoint = isValidVoltageSetpoint(svc.getVoltageSetpoint()); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -409,8 +409,7 @@ private static void addRegulatingControlView(Generator g, Map<String, List<Regul | |
| private static void writeStaticVarCompensators(Network network, String cimNamespace, Map<String, List<RegulatingControlView>> regulatingControlViews, | ||
| XMLStreamWriter writer, CgmesExportContext context) throws XMLStreamException { | ||
| for (StaticVarCompensator svc : network.getStaticVarCompensators()) { | ||
| boolean controlEnabled = svc.isRegulating(); | ||
|
|
||
| CgmesExportUtil.writeStartAbout("StaticVarCompensator", context.getNamingStrategy().getCgmesId(svc), cimNamespace, writer, context); | ||
| writer.writeStartElement(cimNamespace, REGULATING_COND_EQ_CONTROL_ENABLED); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,7 +51,9 @@ public static void write(String id, String svcName, String equipmentContainer, S | |
| } | ||
| writer.writeEndElement(); | ||
| writer.writeEmptyElement(cimNamespace, EQ_STATICVARCOMPENSATOR_SVCCONTROLMODE); | ||
| if (svcControlMode != null) { | ||
| writer.writeAttribute(RDF_NAMESPACE, CgmesNames.RESOURCE, cimNamespace + regulationMode(svcControlMode)); | ||
| } | ||
| writer.writeStartElement(cimNamespace, EQ_STATICVARCOMPENSATOR_VOLTAGESETPOINT); | ||
| writer.writeCharacters(CgmesExportUtil.format(voltageSetPoint)); | ||
| writer.writeEndElement(); | ||
|
|
@@ -63,10 +65,6 @@ private static String regulationMode(StaticVarCompensator.RegulationMode svcCont | |
| return "SVCControlMode.voltage"; | ||
| } else if (StaticVarCompensator.RegulationMode.REACTIVE_POWER.equals(svcControlMode)) { | ||
| return "SVCControlMode.reactivePower"; | ||
| } | ||
| throw new PowsyblException("Invalid regulation mode for Static Var Compensator " + svcControlMode); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,22 +28,22 @@ void staticVarCompensatorControlTest() { | |
| assertEquals(7, network.getStaticVarCompensatorCount()); | ||
|
|
||
| StaticVarCompensator svc = network.getStaticVarCompensator("StaticVarCompensator"); | ||
| assertTrue(checkControl(svc, null, Double.NaN, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-voltageSetPoint"); | ||
| assertTrue(checkControl(svc, null, Double.NaN, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-voltage-svcControlMode"); | ||
| assertTrue(checkControl(svc, null, Double.NaN, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-voltageSetPoint-svcControlMode"); | ||
| assertTrue(checkControl(svc, null, 405.0, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-voltageSetPoint-svcControlMode-on"); | ||
| assertTrue(checkControl(svc, StaticVarCompensator.RegulationMode.VOLTAGE, 405.0, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-reactivePower-svcControlMode"); | ||
| assertTrue(checkControl(svc, null, Double.NaN, Double.NaN)); | ||
|
|
||
| svc = network.getStaticVarCompensator("StaticVarCompensator-reactivePower-svcControlMode-on"); | ||
| assertTrue(checkControl(svc, StaticVarCompensator.RegulationMode.REACTIVE_POWER, Double.NaN, 10.0)); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -556,7 +556,7 @@ void microT4InvalidSvcMode() { | |
| Network modified = new CgmesImport().importData(CgmesConformity1ModifiedCatalog.microT4BeBbInvalidSvcMode().dataSource(), NetworkFactory.findDefault(), importParams); | ||
| StaticVarCompensator offSvc = modified.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4"); | ||
| assertNotNull(offSvc); | ||
| assertFalse(offSvc.isRegulating()); | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -586,7 +586,7 @@ void microT4OffSvc() { | |
| Network modified1 = new CgmesImport().importData(CgmesConformity1ModifiedCatalog.microT4BeBbOffSvc().dataSource(), NetworkFactory.findDefault(), importParams); | ||
| StaticVarCompensator off1 = modified1.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4"); | ||
| assertNotNull(off1); | ||
| assertFalse(off1.isRegulating()); | ||
|
|
||
| Network modified2 = new CgmesImport().importData(CgmesConformity1ModifiedCatalog.microT4BeBbOffSvcControl().dataSource(), NetworkFactory.findDefault(), importParams); | ||
| StaticVarCompensator off2 = modified2.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4"); | ||
|
|
@@ -597,7 +597,7 @@ void microT4OffSvc() { | |
| Network modified3 = new CgmesImport().importData(CgmesConformity1ModifiedCatalog.microT4BeBbOffSvcControlV().dataSource(), NetworkFactory.findDefault(), importParams); | ||
| StaticVarCompensator off3 = modified3.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4"); | ||
| assertNotNull(off3); | ||
| assertFalse(off3.isRegulating()); | ||
| assertEquals(231.123, off3.getVoltageSetpoint(), 0.0); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1799,7 +1799,8 @@ private Network prepareNetworkForEQComparison(Network network) { | |
| generator.getTerminal().setP(0.0).setQ(0.0); | ||
| } else if (identifiable instanceof StaticVarCompensator) { | ||
| StaticVarCompensator staticVarCompensator = (StaticVarCompensator) identifiable; | ||
| staticVarCompensator.setRegulationMode(null); | ||
| staticVarCompensator.setRegulating(false).setVoltageSetpoint(0.0); | ||
| staticVarCompensator.getTerminal().setP(0.0).setQ(0.0); | ||
| } else if (identifiable instanceof VscConverterStation) { | ||
| VscConverterStation converter = (VscConverterStation) identifiable; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,6 @@ | |
| import java.nio.file.Path; | ||
| import java.util.Properties; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| /** | ||
|
|
@@ -39,7 +38,8 @@ void microT4SvcRCDisabled() { | |
| Network network = Network.read(CgmesConformity1ModifiedCatalog.microT4BeBbOffSvcControlV().dataSource(), importParams); | ||
| StaticVarCompensator svc = network.getStaticVarCompensator(svcId); | ||
| assertNotNull(svc); | ||
| assertNull(svc.getRegulationMode()); | ||
| assertFalse(svc.isRegulating()); | ||
| assertEquals(rcId, svc.getProperty(Conversion.PROPERTY_REGULATING_CONTROL)); | ||
| assertEquals(231.123, svc.getVoltageSetpoint(), 0.0); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /** | ||
| * Copyright (c) 2016-2025, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
@@ -99,8 +99,7 @@ public interface StaticVarCompensator extends Injection<StaticVarCompensator> { | |
|
|
||
| enum RegulationMode { | ||
| VOLTAGE, | ||
| REACTIVE_POWER | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -178,6 +177,16 @@ enum RegulationMode { | |
| */ | ||
| StaticVarCompensator setRegulationMode(RegulationMode regulationMode); | ||
|
|
||
| /** | ||
| * Get the regulating status. | ||
| */ | ||
| boolean isRegulating(); | ||
|
|
||
| /** | ||
| * Set the regulating status. | ||
| */ | ||
| StaticVarCompensator setRegulating(boolean regulating); | ||
|
|
||
| /** | ||
| * <p>Get the terminal used for regulation.</p> | ||
| * @return the terminal used for regulation | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,8 @@ public interface StaticVarCompensatorAdder extends InjectionAdder<StaticVarCompe | |
|
|
||
| StaticVarCompensatorAdder setRegulationMode(StaticVarCompensator.RegulationMode regulationMode); | ||
|
|
||
| StaticVarCompensatorAdder setRegulating(boolean regulating); | ||
|
|
||
| default StaticVarCompensatorAdder setRegulatingTerminal(Terminal regulatingTerminal) { | ||
| throw new UnsupportedOperationException("Not yet implemented"); | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't we set the RegulationMode as
VOLTAGEto avoid having a null RegulationMode in those kind of cases?@geofjamg