diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/GeneratorSynchronousGroovyExtension.groovy b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/SynchronousGeneratorGroovyExtension.groovy similarity index 62% rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/GeneratorSynchronousGroovyExtension.groovy rename to dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/SynchronousGeneratorGroovyExtension.groovy index 1fad6bd73..332fe41cb 100644 --- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/GeneratorSynchronousGroovyExtension.groovy +++ b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/generators/SynchronousGeneratorGroovyExtension.groovy @@ -7,54 +7,51 @@ package com.powsybl.dynawaltz.dsl.models.generators import com.google.auto.service.AutoService -import com.powsybl.dsl.DslException import com.powsybl.dynamicsimulation.DynamicModel import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension import com.powsybl.dynawaltz.dsl.AbstractEquipmentGroovyExtension import com.powsybl.dynawaltz.dsl.EquipmentConfig -import com.powsybl.dynawaltz.dsl.models.builders.AbstractDynamicModelBuilder -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronous -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronousControllable -import com.powsybl.iidm.network.Generator +import com.powsybl.dynawaltz.models.generators.SynchronousGenerator +import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorControllable import com.powsybl.iidm.network.Network /** * @author Marcos de Miguel */ @AutoService(DynamicModelGroovyExtension.class) -class GeneratorSynchronousGroovyExtension extends AbstractEquipmentGroovyExtension implements DynamicModelGroovyExtension { +class SynchronousGeneratorGroovyExtension extends AbstractEquipmentGroovyExtension implements DynamicModelGroovyExtension { protected static final String SYNCHRONOUS_GENERATORS = "synchronousGenerators" - GeneratorSynchronousGroovyExtension() { + SynchronousGeneratorGroovyExtension() { super(SYNCHRONOUS_GENERATORS) } - protected GeneratorSynchronousGroovyExtension(URL config) { + protected SynchronousGeneratorGroovyExtension(URL config) { super(SYNCHRONOUS_GENERATORS, config) } @Override - protected GeneratorSynchronousBuilder createBuilder(Network network, EquipmentConfig equipmentConfig) { - new GeneratorSynchronousBuilder(network, equipmentConfig) + protected SynchronousGeneratorBuilder createBuilder(Network network, EquipmentConfig equipmentConfig) { + new SynchronousGeneratorBuilder(network, equipmentConfig) } - static class GeneratorSynchronousBuilder extends AbstractGeneratorBuilder { + static class SynchronousGeneratorBuilder extends AbstractGeneratorBuilder { EquipmentConfig equipmentConfig - GeneratorSynchronousBuilder(Network network, EquipmentConfig equipmentConfig) { + SynchronousGeneratorBuilder(Network network, EquipmentConfig equipmentConfig) { super(network) this.equipmentConfig = equipmentConfig } @Override - GeneratorSynchronous build() { + SynchronousGenerator build() { checkData() if (equipmentConfig.isControllable()) { - new GeneratorSynchronousControllable(dynamicModelId, generator, parameterSetId, equipmentConfig.lib) + new SynchronousGeneratorControllable(dynamicModelId, generator, parameterSetId, equipmentConfig.lib) } else { - new GeneratorSynchronous(dynamicModelId, generator, parameterSetId, equipmentConfig.lib) + new SynchronousGenerator(dynamicModelId, generator, parameterSetId, equipmentConfig.lib) } } } diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java index a6a05ec84..9cb0939ea 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java +++ b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java @@ -104,8 +104,8 @@ private static Stream provideEquipmentModelData() { Arguments.of("infiniteBus", InfiniteBus.class, HvdcTestNetwork.createVsc(), "B1", "BBM_BUS", "b", "InfiniteBusWithVariations"), Arguments.of("line", StandardLine.class, EurostagTutorialExample1Factory.create(), "NHV1_NHV2_1", "BBM_NHV1_NHV2_1", "LINE", "Line"), Arguments.of("genFictitious", GeneratorFictitious.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GF", "GeneratorFictitious"), - Arguments.of("gen", GeneratorSynchronous.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GSFWPR", "GeneratorSynchronousThreeWindings"), - Arguments.of("genControllable", GeneratorSynchronousControllable.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations"), + Arguments.of("gen", SynchronousGenerator.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GSFWPR", "GeneratorSynchronousThreeWindings"), + Arguments.of("genControllable", SynchronousGeneratorControllable.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations"), Arguments.of("omegaGen", SynchronizedGenerator.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GPQ", "GeneratorPQ"), Arguments.of("omegaGenControllable", SynchronizedGeneratorControllable.class, EurostagTutorialExample1Factory.create(), "GEN", "BBM_GEN", "GPQ", "GeneratorPV"), Arguments.of("transformer", TransformerFixedRatio.class, EurostagTutorialExample1Factory.create(), "NGEN_NHV1", "BBM_NGEN_NHV1", "TFR", "TransformerFixedRatio"), diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java index 422522ead..f264f50f3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java +++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java @@ -12,7 +12,7 @@ import com.powsybl.dynawaltz.models.MacroConnectAttribute; import com.powsybl.dynawaltz.models.VarConnection; import com.powsybl.dynawaltz.models.buses.BusModel; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronousModel; +import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorModel; import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorModel; import com.powsybl.dynawaltz.xml.ParametersXml; @@ -58,7 +58,7 @@ public void writeParameters(XMLStreamWriter writer, DynaWaltzContext context) th int index = 0; for (SynchronizedGeneratorModel generator : synchronizedGenerators) { double weightGen = 0; - if (generator instanceof GeneratorSynchronousModel) { + if (generator instanceof SynchronousGeneratorModel) { double h = dynaWaltzParameters.getModelParameters(generator.getParameterSetId()).getDouble("generator_H"); double snom = dynaWaltzParameters.getModelParameters(generator.getParameterSetId()).getDouble("generator_SNom"); weightGen = h * snom; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronous.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronous.java rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java index 010fc6897..ef2a6291d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronous.java +++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java @@ -15,13 +15,13 @@ /** * @author Florian Dupuy */ -public class GeneratorSynchronous extends SynchronizedGenerator implements GeneratorSynchronousModel { +public class SynchronousGenerator extends SynchronizedGenerator implements SynchronousGeneratorModel { - public GeneratorSynchronous(String dynamicModelId, Generator generator, String parameterSetId, String generatorLib) { + public SynchronousGenerator(String dynamicModelId, Generator generator, String parameterSetId, String generatorLib) { super(dynamicModelId, generator, parameterSetId, generatorLib); } - protected String getOmegaPuVarName() { + public String getOmegaPuVarName() { return "generator_omegaPu"; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousControllable.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousControllable.java rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java index 84d0907a5..45605ffb1 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousControllable.java +++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java @@ -13,9 +13,9 @@ /** * @author Laurent Issertial */ -public class GeneratorSynchronousControllable extends GeneratorSynchronous implements ControllableEquipment { +public class SynchronousGeneratorControllable extends SynchronousGenerator implements ControllableEquipment { - public GeneratorSynchronousControllable(String dynamicModelId, Generator generator, String parameterSetId, String generatorLib) { + public SynchronousGeneratorControllable(String dynamicModelId, Generator generator, String parameterSetId, String generatorLib) { super(dynamicModelId, generator, parameterSetId, generatorLib); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorModel.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousModel.java rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorModel.java index 2581868dc..73badcd09 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorSynchronousModel.java +++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorModel.java @@ -9,6 +9,6 @@ /** * @author Florian Dupuy */ -public interface GeneratorSynchronousModel extends SynchronizedGeneratorModel { +public interface SynchronousGeneratorModel extends SynchronizedGeneratorModel { } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java index 659d4e3cf..cf4de38ef 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java @@ -8,7 +8,7 @@ package com.powsybl.dynawaltz.xml; import com.powsybl.dynawaltz.models.events.EventActivePowerVariation; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronousControllable; +import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorControllable; import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorControllable; import com.powsybl.dynawaltz.models.loads.LoadAlphaBetaControllable; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; @@ -31,7 +31,7 @@ protected void setupNetwork() { @Override protected void addDynamicModels() { dynamicModels.add(new SynchronizedGeneratorControllable("BBM_GENC", network.getGenerator("GEN2"), "GPV", "GeneratorPV")); - dynamicModels.add(new GeneratorSynchronousControllable("BBM_GENC2", network.getGenerator("GEN3"), "GSTWPR", "GeneratorSynchronousFourWindingsGoverPropVRPropInt")); + dynamicModels.add(new SynchronousGeneratorControllable("BBM_GENC2", network.getGenerator("GEN3"), "GSTWPR", "GeneratorSynchronousFourWindingsGoverPropVRPropInt")); dynamicModels.add(new LoadAlphaBetaControllable("BBM_LOADC", network.getLoad("LOAD2"), "load", "LoadAlphaBeta")); eventModels.add(new EventActivePowerVariation(network.getGenerator("GEN"), 1, 1.1)); eventModels.add(new EventActivePowerVariation(network.getGenerator("GEN2"), 1, 1.2)); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java index ee89af15c..4519925ec 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java @@ -15,7 +15,7 @@ import com.powsybl.dynawaltz.models.events.EventInjectionDisconnection; import com.powsybl.dynawaltz.models.events.EventQuadripoleDisconnection; import com.powsybl.dynawaltz.models.generators.GeneratorFictitious; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronous; +import com.powsybl.dynawaltz.models.generators.SynchronousGenerator; import com.powsybl.dynawaltz.models.generators.SynchronizedGenerator; import com.powsybl.dynawaltz.models.lines.StandardLine; import com.powsybl.dynawaltz.models.loads.LoadAlphaBeta; @@ -79,17 +79,17 @@ void setup() { }); network.getGeneratorStream().forEach(g -> { if (g.getId().equals("GEN2")) { - dynamicModels.add(new GeneratorSynchronous("BBM_" + g.getId(), g, "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations")); + dynamicModels.add(new SynchronousGenerator("BBM_" + g.getId(), g, "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations")); } else if (g.getId().equals("GEN3")) { - dynamicModels.add(new GeneratorSynchronous("BBM_" + g.getId(), g, "GSFW", "GeneratorSynchronousFourWindings")); + dynamicModels.add(new SynchronousGenerator("BBM_" + g.getId(), g, "GSFW", "GeneratorSynchronousFourWindings")); } else if (g.getId().equals("GEN4")) { - dynamicModels.add(new GeneratorSynchronous("BBM_" + g.getId(), g, "GSTW", "GeneratorSynchronousThreeWindings")); + dynamicModels.add(new SynchronousGenerator("BBM_" + g.getId(), g, "GSTW", "GeneratorSynchronousThreeWindings")); } else if (g.getId().equals("GEN6")) { dynamicModels.add(new GeneratorFictitious("BBM_" + g.getId(), g, "GF")); } else if (g.getId().equals("GEN7")) { dynamicModels.add(new SynchronizedGenerator("BBM_" + g.getId(), g, "GPQ", "GeneratorPQ")); } else { - dynamicModels.add(new GeneratorSynchronous("BBM_" + g.getId(), g, "GSTWPR", "GeneratorSynchronousThreeWindingsProportionalRegulations")); + dynamicModels.add(new SynchronousGenerator("BBM_" + g.getId(), g, "GSTWPR", "GeneratorSynchronousThreeWindingsProportionalRegulations")); } }); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java index 6ce3798ba..c59ff3292 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java @@ -12,7 +12,7 @@ import com.powsybl.dynawaltz.DynaWaltzParameters; import com.powsybl.dynawaltz.models.InjectionModel; import com.powsybl.dynawaltz.models.generators.GeneratorFictitious; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronousModel; +import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorModel; import com.powsybl.dynawaltz.models.lines.LineModel; import com.powsybl.iidm.network.Identifiable; import org.junit.jupiter.api.Test; @@ -80,8 +80,8 @@ void testDynamicModelGetterException() { assertEquals("The model identified by the static id GEN5 does not match the expected model (LineModel)", e.getMessage()); // default model not implemented - e = assertThrows(PowsyblException.class, () -> dc.getDynamicModel("unknownID", GeneratorSynchronousModel.class)); - assertEquals("Default model not implemented for GeneratorSynchronousModel", e.getMessage()); + e = assertThrows(PowsyblException.class, () -> dc.getDynamicModel("unknownID", SynchronousGeneratorModel.class)); + assertEquals("Default model not implemented for SynchronousGeneratorModel", e.getMessage()); } @Test diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java index a2dea49d2..4f17c995a 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java @@ -12,7 +12,7 @@ import com.powsybl.dynawaltz.DynaWaltzParameters; import com.powsybl.dynawaltz.models.events.EventQuadripoleDisconnection; import com.powsybl.dynawaltz.models.events.EventInjectionDisconnection; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronous; +import com.powsybl.dynawaltz.models.generators.SynchronousGenerator; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -30,7 +30,7 @@ class EventXmlTest extends DynaWaltzTestUtil { @Test void writeDynamicModel() throws SAXException, IOException, XMLStreamException { dynamicModels.clear(); - dynamicModels.add(new GeneratorSynchronous("BBM_GEN2", network.getGenerator("GEN2"), "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations")); + dynamicModels.add(new SynchronousGenerator("BBM_GEN2", network.getGenerator("GEN2"), "GSFWPR", "GeneratorSynchronousFourWindingsProportionalRegulations")); DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java index b4d6a4843..bf429c6f4 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java +++ b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java @@ -7,7 +7,7 @@ */ package com.powsybl.dynawaltz.xml; -import com.powsybl.dynawaltz.models.generators.GeneratorSynchronous; +import com.powsybl.dynawaltz.models.generators.SynchronousGenerator; import com.powsybl.dynawaltz.models.generators.SynchronizedGenerator; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; @@ -28,9 +28,9 @@ protected void setupNetwork() { @Override protected void addDynamicModels() { - dynamicModels.add(new GeneratorSynchronous("BBM_GEN_SYNCHRO", network.getGenerator("GEN"), "GSFW", "GeneratorSynchronousFourWindingsPmConstVRNordic")); + dynamicModels.add(new SynchronousGenerator("BBM_GEN_SYNCHRO", network.getGenerator("GEN"), "GSFW", "GeneratorSynchronousFourWindingsPmConstVRNordic")); dynamicModels.add(new SynchronizedGenerator("BBM_GEN_PQ", network.getGenerator("GEN2"), "GPQ", "GeneratorPQ")); - dynamicModels.add(new GeneratorSynchronous("BBM_GEN_SYNCHRO2", network.getGenerator("GEN3"), "GSTW", "GeneratorSynchronousThreeWindingsPmConstVRNordic")); + dynamicModels.add(new SynchronousGenerator("BBM_GEN_SYNCHRO2", network.getGenerator("GEN3"), "GSTW", "GeneratorSynchronousThreeWindingsPmConstVRNordic")); } @Test