diff --git a/README.md b/README.md index 3f0ba697c..d727d57bf 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Javadocs](https://www.javadoc.io/badge/com.powsybl/powsybl-dynawo.svg?color=blue)](https://www.javadoc.io/doc/com.powsybl/powsybl-dynawo) [![Slack](https://img.shields.io/badge/slack-powsybl-blueviolet.svg?logo=slack)](https://join.slack.com/t/powsybl/shared_invite/zt-rzvbuzjk-nxi0boim1RKPS5PjieI0rA) -[Dynawo](https://dynawo.github.io) is an hybrid C++/Modelica open source suite of simulation tools for power systems. This integration module allows to use [DynaFlow](https://dynawo.github.io/about/dynaflow) for [power flow simulations](https://www.powsybl.org/pages/documentation/simulation/powerflow) and [DynaWaltz](https://dynawo.github.io/about/dynawaltz) for [time domain simulations](https://www.powsybl.org/pages/documentation/simulation/timedomain). +[Dynawo](https://dynawo.github.io) is an hybrid C++/Modelica open source suite of simulation tools for power systems. This integration module allows to use [DynaFlow](https://dynawo.github.io/about/dynaflow) for [power flow simulations](https://www.powsybl.org/pages/documentation/simulation/powerflow) and [Dynawo](https://dynawo.github.io) for [time domain simulations](https://www.powsybl.org/pages/documentation/simulation/timedomain). ## DynaFlow @@ -21,9 +21,9 @@ LoadFlow.find("DynaFlow").run(network, parameters); To learn more about the usage of DynaFlow, read the [dedicated page](https://www.powsybl.org/pages/documentation/simulation/powerflow/dynaflow.html) on our website. -## DynaWaltz +## Dynawo -To use DynaWaltz as your time domain engine, add the `com.powsybl:powsybl-dynawaltz` and `com.powsybl:powsybl-dynawaltz-dsl` modules to your dependencies. +To use Dynawo as your time domain engine, add the `com.powsybl:powsybl-dynawo` and `com.powsybl:powsybl-dynawo-dsl` modules to your dependencies. To run a dynamic simulation, you need: - a case file - a `DynamicModelsSupplier` to associate dynamic models to the equipment of the network @@ -31,7 +31,7 @@ To run a dynamic simulation, you need: - a `CurvesSupplier` to follow the evolution of dynamic variables during the simulation (optional) - a set of parameters to configure the simulation (optional) -Thanks to `powsybl-dynawaltz-dsl`, the inputs can be easily configured using Groovy scripts. +Thanks to `powsybl-dynawo-dsl`, the inputs can be easily configured using Groovy scripts. The simulation parameters can be configured either in the `config.yml` file or using a Json file. ```java @@ -40,17 +40,17 @@ Network network = Network.read("/path/to/the/casefile.xiidm"); // Load the dynamic models mapping GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( Paths.get("/path/to/dynamicModelsMapping.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); // Load the events GroovyEventModelsSupplier eventModelsSupplier = new GroovyEventModelsSupplier( Paths.get("/path/to/event.groovy"), - GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME)); // Configure the curves GroovyCurvesSupplier curvesSupplier = new GroovyCurvesSupplier( Paths.get("/path/to/curves.groovy"), - GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME)); // Load the parameters DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); @@ -62,7 +62,7 @@ System.out.println("Timeline:"); result.getTimeLine().forEach(tl -> System.out.printf("[%.8f] %s (on %s)%n", tl.time(), tl.message(), tl.modelName())); ``` -To learn more about the usage of DynaWaltz, read the [dedicated page](https://www.powsybl.org/pages/documentation/simulation/timedomain/dynawo) on our website. +To learn more about the usage of Dynawo, read the [dedicated page](https://www.powsybl.org/pages/documentation/simulation/timedomain/dynawo) on our website. ### Examples @@ -171,7 +171,7 @@ For the above example, the corresponding parameter file could be: ``` -Other examples can be found in the [resources](https://github.com/powsybl/powsybl-dynawo/tree/main/dynawaltz-dsl/src/test/resources) of this project. +Other examples can be found in the [resources](https://github.com/powsybl/powsybl-dynawo/tree/main/dynawo-dsl/src/test/resources) of this project. ## Contribute to documentation diff --git a/distribution/pom.xml b/distribution/pom.xml index 39bf21dcd..e08b0bcef 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -32,14 +32,15 @@ ${project.groupId} powsybl-dynaflow + ${project.groupId} - powsybl-dynawaltz + powsybl-dynawo-simulation ${project.groupId} - powsybl-dynawaltz-dsl + powsybl-dynawo-dsl ${project.groupId} diff --git a/docs/dynamic_security_analysis/configuration.md b/docs/dynamic_security_analysis/configuration.md index 36a1b937e..e14dac4db 100644 --- a/docs/dynamic_security_analysis/configuration.md +++ b/docs/dynamic_security_analysis/configuration.md @@ -27,4 +27,4 @@ dynawo-algorithms: ``` ## Default parameters -The dynamic security analysis reuse the `dynawo-default-parameters` [module](../dynamic_simulation/configuration.md#default-parameters). +The dynamic security analysis reuse the `dynawo-simulation-default-parameters` [module](../dynamic_simulation/configuration.md#default-parameters). diff --git a/docs/dynamic_simulation/configuration.md b/docs/dynamic_simulation/configuration.md index 2d9ad5fe9..3e45de2a7 100644 --- a/docs/dynamic_simulation/configuration.md +++ b/docs/dynamic_simulation/configuration.md @@ -27,7 +27,7 @@ dynawo: ``` ## Default parameters -The `dynawo-default-parameters` module defines the default values for all specific parameters of a dynamic simulation run with Dynawo. +The `dynawo-simulation-default-parameters` module defines the default values for all specific parameters of a dynamic simulation run with Dynawo. ### Required parameters @@ -55,7 +55,7 @@ The default value is `1`. **solver.type** `solver.type` defines the solver used in the simulation. -The available `com.powsybl.dynawaltz.DynaWaltzParameters.SolverType` values are: +The available `com.powsybl.dynawo.DynawoSimulationParameters.SolverType` values are: - `SIM`: the simplified solver (fixed time step solver) - `IDA`: the IDA solver (variable time step solver) @@ -87,7 +87,7 @@ The default value is `FALSE`. **timeline.exportMode** `timeline.exportMode` defines the file extension of the timeline export. -The available `com.powsybl.dynawaltz.DynaWaltzParameters.ExportMode` values are: +The available `com.powsybl.dynawo.DynawoSimulationParameters.ExportMode` values are: - `CSV` - `TXT`: same format as `CSV` but with `|` separator - `XML` @@ -101,7 +101,7 @@ The default value is `1e-6`. **log.levelFilter** `log.levelFilter` defines the log level for Dynawo log. The default value is `INFO`. -The available `com.powsybl.dynawaltz.DynaWaltzParameters.LogLevel` values are: +The available `com.powsybl.dynawo.DynawoSimulationParameters.LogLevel` values are: - `DEBUG` - `INFO` - `WARN` @@ -110,7 +110,7 @@ The available `com.powsybl.dynawaltz.DynaWaltzParameters.LogLevel` values are: **log.specificLogs** `log.specificLogs` defines as a list the specifics logs to return besides the regular Dynawo log. The default value is an empty list. -The available `com.powsybl.dynawaltz.DynaWaltzParameters.SpecificLog` values are: +The available `com.powsybl.dynawo.DynawoSimulationParameters.SpecificLog` values are: - `NETWORK` - `MODELER` - `PARAMETERS` @@ -121,7 +121,7 @@ The available `com.powsybl.dynawaltz.DynaWaltzParameters.SpecificLog` values are **YAML configuration:** ```yaml -dynawo-default-parameters: +dynawo-simulation-default-parameters: parametersFile: /home/user/parametersFile network.parametersFile: /home/user/networkParametersFile network.parametersId: 1 @@ -144,7 +144,7 @@ dynawo-default-parameters: **XML configuration:** ```xml - + /home/user/parametersFile /home/user/networkParametersFile NETWORK @@ -161,5 +161,5 @@ dynawo-default-parameters: 10e-6 INFO NETWORK, PARAMETERS - + ``` diff --git a/docs/dynamic_simulation/dynamic-models-dsl.md b/docs/dynamic_simulation/dynamic-models-dsl.md index 672e81065..7ff17ca1d 100644 --- a/docs/dynamic_simulation/dynamic-models-dsl.md +++ b/docs/dynamic_simulation/dynamic-models-dsl.md @@ -50,13 +50,13 @@ OverloadManagementSystem { #### TODO add all automation systems ## Supported models -Models are listed in [models.json](../../dynawaltz/src/main/resources/models.json). +Models are listed in [models.json](../../dynawo/src/main/resources/models.json). The list is divided in categories each linked to a dedicated builder. ### Categories properties * `defaultLib` : name of the default library * `libs` : list of dynawo libraries supported for this category -The list is statically loaded via [ModelConfigLoader](https://javadoc.io/doc/com.powsybl/powsybl-dynawo/latest/com/powsybl/dynawaltz/builders/ModelConfigLoader.html) services and thus can be extended. +The list is statically loaded via [ModelConfigLoader](https://javadoc.io/doc/com.powsybl/powsybl-dynawo/latest/com/powsybl/dynawo/builders/ModelConfigLoader.html) services and thus can be extended. ### Library properties * `lib`: library name used in dynawo diff --git a/docs/dynamic_simulation/index.md b/docs/dynamic_simulation/index.md index b96ba4a78..e6d743836 100644 --- a/docs/dynamic_simulation/index.md +++ b/docs/dynamic_simulation/index.md @@ -8,7 +8,7 @@ event-models-dsl.md curves-dsl.md ``` -PowSyBl provides an implementation of the [DynamicSimulation API from powsybl-core](inv:powsyblcore:*:*#simulation/dynamic/index) with [DynaWaltz](https://dynawo.github.io/about/dynawaltz), a tool for long-term stability simulation from the [Dynaωo](https://dynawo.github.io) suite. +PowSyBl provides an implementation of the [DynamicSimulation API from powsybl-core](inv:powsyblcore:*:*#simulation/dynamic/index) with [Dynaωo](https://dynawo.github.io), a tool for long-term stability simulation. ## Installation diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConfig.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConfig.java deleted file mode 100644 index 829e9d3e0..000000000 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (c) 2020, 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/. - */ -package com.powsybl.dynawaltz; - -import com.powsybl.commons.config.ModuleConfig; -import com.powsybl.commons.config.PlatformConfig; -import com.powsybl.dynawo.commons.AbstractDynawoConfig; - -import java.nio.file.Path; - -/** - * @author Marcos de Miguel {@literal } - */ -public class DynaWaltzConfig extends AbstractDynawoConfig { - - public static final String DYNAWALTZ_LAUNCHER_PROGRAM_NAME = "dynawo"; - protected static final String DYNAWALTZ_MODULE_NAME = "dynawaltz"; - - public static DynaWaltzConfig load() { - return load(DynaWaltzConfig::new, DYNAWALTZ_MODULE_NAME); - } - - public static DynaWaltzConfig load(PlatformConfig platformConfig) { - return load(DynaWaltzConfig::new, DYNAWALTZ_MODULE_NAME, platformConfig); - } - - public DynaWaltzConfig(Path homeDir, boolean debug) { - super(homeDir, debug); - } - - protected DynaWaltzConfig(ModuleConfig config) { - super(config); - } - - @Override - public String getProgram() { - return getProgram(DYNAWALTZ_LAUNCHER_PROGRAM_NAME); - } -} diff --git a/dynawaltz-dsl/pom.xml b/dynawo-dsl/pom.xml similarity index 93% rename from dynawaltz-dsl/pom.xml rename to dynawo-dsl/pom.xml index f09ff81b3..9a4591f7c 100644 --- a/dynawaltz-dsl/pom.xml +++ b/dynawo-dsl/pom.xml @@ -16,9 +16,9 @@ 2.6.0-SNAPSHOT - powsybl-dynawaltz-dsl - DynaWaltz DSL - DSL for DynaWaltz + powsybl-dynawo-dsl + Dynawo DSL + DSL for Dynawo true @@ -46,7 +46,7 @@ com.powsybl - powsybl-dynawaltz + powsybl-dynawo-simulation org.apache.groovy @@ -100,14 +100,14 @@ test - ${project.groupId} - powsybl-dynawaltz - test-jar + com.powsybl + powsybl-iidm-test test - com.powsybl - powsybl-iidm-test + ${project.groupId} + powsybl-dynawo-simulation + test-jar test diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DslReports.groovy b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DslReports.groovy similarity index 95% rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DslReports.groovy rename to dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DslReports.groovy index 3b071e602..6bf06d355 100644 --- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DslReports.groovy +++ b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DslReports.groovy @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl +package com.powsybl.dynawo.dsl import com.powsybl.commons.report.ReportNode diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzCurveGroovyExtension.groovy b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoCurveGroovyExtension.groovy similarity index 83% rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzCurveGroovyExtension.groovy rename to dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoCurveGroovyExtension.groovy index 855c9902a..9c8283df2 100644 --- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzCurveGroovyExtension.groovy +++ b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoCurveGroovyExtension.groovy @@ -4,14 +4,14 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl +package com.powsybl.dynawo.dsl import com.google.auto.service.AutoService import com.powsybl.commons.report.ReportNode import com.powsybl.dynamicsimulation.Curve import com.powsybl.dynamicsimulation.groovy.CurveGroovyExtension -import com.powsybl.dynawaltz.DynaWaltzProvider -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder +import com.powsybl.dynawo.DynawoSimulationProvider +import com.powsybl.dynawo.curves.DynawoCurvesBuilder import java.util.function.Consumer /** @@ -20,11 +20,11 @@ import java.util.function.Consumer * @author Mathieu Bague {@literal } */ @AutoService(CurveGroovyExtension.class) -class DynaWaltzCurveGroovyExtension implements CurveGroovyExtension { +class DynawoCurveGroovyExtension implements CurveGroovyExtension { @Override String getName() { - DynaWaltzProvider.NAME + DynawoSimulationProvider.NAME } @Override diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzDynamicModelGroovyExtension.groovy b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoDynamicModelGroovyExtension.groovy similarity index 82% rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzDynamicModelGroovyExtension.groovy rename to dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoDynamicModelGroovyExtension.groovy index 871b46451..75ff28359 100644 --- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzDynamicModelGroovyExtension.groovy +++ b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoDynamicModelGroovyExtension.groovy @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl +package com.powsybl.dynawo.dsl import com.google.auto.service.AutoService import com.powsybl.commons.report.ReportNode import com.powsybl.dynamicsimulation.DynamicModel import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension -import com.powsybl.dynawaltz.DynaWaltzProvider -import com.powsybl.dynawaltz.builders.BuilderConfig -import com.powsybl.dynawaltz.builders.ModelBuilder -import com.powsybl.dynawaltz.builders.ModelConfigsHandler +import com.powsybl.dynawo.DynawoSimulationProvider +import com.powsybl.dynawo.builders.BuilderConfig +import com.powsybl.dynawo.builders.ModelBuilder +import com.powsybl.dynawo.builders.ModelConfigsHandler import com.powsybl.iidm.network.Network import java.util.function.Consumer @@ -23,17 +23,17 @@ import java.util.function.Consumer * @author Laurent Issertial {@literal } */ @AutoService(DynamicModelGroovyExtension.class) -class DynaWaltzDynamicModelGroovyExtension implements DynamicModelGroovyExtension { +class DynawoDynamicModelGroovyExtension implements DynamicModelGroovyExtension { private final List builderConfigs - DynaWaltzDynamicModelGroovyExtension() { + DynawoDynamicModelGroovyExtension() { builderConfigs = ModelConfigsHandler.getInstance().getBuilderConfigs() } @Override String getName() { - DynaWaltzProvider.NAME + DynawoSimulationProvider.NAME } @Override diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzEventModelGroovyExtension.groovy b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoEventModelGroovyExtension.groovy similarity index 81% rename from dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzEventModelGroovyExtension.groovy rename to dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoEventModelGroovyExtension.groovy index 3a9a7a46b..287c570a2 100644 --- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/DynaWaltzEventModelGroovyExtension.groovy +++ b/dynawo-dsl/src/main/groovy/com/powsybl/dynawo/dsl/DynawoEventModelGroovyExtension.groovy @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl +package com.powsybl.dynawo.dsl import com.google.auto.service.AutoService import com.powsybl.commons.report.ReportNode import com.powsybl.dynamicsimulation.EventModel import com.powsybl.dynamicsimulation.groovy.EventModelGroovyExtension -import com.powsybl.dynawaltz.DynaWaltzProvider -import com.powsybl.dynawaltz.builders.EventBuilderConfig -import com.powsybl.dynawaltz.builders.ModelBuilder -import com.powsybl.dynawaltz.builders.ModelConfigsHandler +import com.powsybl.dynawo.DynawoSimulationProvider +import com.powsybl.dynawo.builders.EventBuilderConfig +import com.powsybl.dynawo.builders.ModelBuilder +import com.powsybl.dynawo.builders.ModelConfigsHandler import com.powsybl.iidm.network.Network import java.util.function.Consumer @@ -23,17 +23,17 @@ import java.util.function.Consumer * @author Laurent Issertial {@literal } */ @AutoService(EventModelGroovyExtension.class) -class DynaWaltzEventModelGroovyExtension implements EventModelGroovyExtension { +class DynawoEventModelGroovyExtension implements EventModelGroovyExtension { private final List builderConfigs - DynaWaltzEventModelGroovyExtension() { + DynawoEventModelGroovyExtension() { builderConfigs = ModelConfigsHandler.getInstance().getEventBuilderConfigs() } @Override String getName() { - DynaWaltzProvider.NAME + DynawoSimulationProvider.NAME } List getModelNames() { diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/AbstractModelSupplierTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/AbstractModelSupplierTest.java similarity index 97% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/AbstractModelSupplierTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/AbstractModelSupplierTest.java index c9507e507..85ad11bee 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/AbstractModelSupplierTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/AbstractModelSupplierTest.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl; +package com.powsybl.dynawo.dsl; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.TestUtil; diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynaWaltzGroovyCurvesSupplierTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/CurvesSupplierTest.java similarity index 89% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynaWaltzGroovyCurvesSupplierTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/CurvesSupplierTest.java index 2b540613b..86731722d 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynaWaltzGroovyCurvesSupplierTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/CurvesSupplierTest.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl; +package com.powsybl.dynawo.dsl; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; @@ -13,8 +13,8 @@ import com.powsybl.dynamicsimulation.groovy.CurveGroovyExtension; import com.powsybl.dynamicsimulation.groovy.GroovyCurvesSupplier; import com.powsybl.dynamicsimulation.groovy.GroovyExtension; -import com.powsybl.dynawaltz.curves.DynawoCurve; -import com.powsybl.dynawaltz.DynaWaltzProvider; +import com.powsybl.dynawo.curves.DynawoCurve; +import com.powsybl.dynawo.DynawoSimulationProvider; import com.powsybl.iidm.network.Generator; import com.powsybl.iidm.network.Load; import com.powsybl.iidm.network.Network; @@ -35,7 +35,7 @@ /** * @author Marcos de Miguel {@literal } */ -class DynaWaltzGroovyCurvesSupplierTest extends AbstractModelSupplierTest { +class CurvesSupplierTest extends AbstractModelSupplierTest { private FileSystem fileSystem; private Network network; @@ -63,9 +63,9 @@ void test() { } private List validateGroovyExtension() { - List extensions = GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME); + List extensions = GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME); assertEquals(1, extensions.size()); - assertInstanceOf(DynaWaltzCurveGroovyExtension.class, extensions.get(0)); + assertInstanceOf(DynawoCurveGroovyExtension.class, extensions.get(0)); return extensions; } diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/DynamicModelsSupplierTest.java similarity index 93% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/DynamicModelsSupplierTest.java index 35811d64e..c83e3430d 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/DynamicModelsSupplierTest.java @@ -5,35 +5,34 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl; +package com.powsybl.dynawo.dsl; import com.powsybl.dynamicsimulation.DynamicModel; import com.powsybl.dynamicsimulation.DynamicModelsSupplier; import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension; import com.powsybl.dynamicsimulation.groovy.GroovyDynamicModelsSupplier; import com.powsybl.dynamicsimulation.groovy.GroovyExtension; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.EquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.automationsystems.*; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystem; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystem; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystem; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystem; -import com.powsybl.dynawaltz.models.buses.InfiniteBus; -import com.powsybl.dynawaltz.models.buses.StandardBus; -import com.powsybl.dynawaltz.models.generators.*; -import com.powsybl.dynawaltz.models.hvdc.HvdcP; -import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling; -import com.powsybl.dynawaltz.models.hvdc.HvdcVsc; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling; -import com.powsybl.dynawaltz.models.lines.StandardLine; -import com.powsybl.dynawaltz.models.loads.*; -import com.powsybl.dynawaltz.models.svarcs.BaseStaticVarCompensator; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatio; -import com.powsybl.dynawaltz.models.generators.GridFormingConverter; -import com.powsybl.dynawaltz.models.generators.SynchronizedWeccGen; -import com.powsybl.dynawaltz.models.generators.WeccGen; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.EquipmentBlackBoxModel; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystem; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystem; +import com.powsybl.dynawo.models.automationsystems.UnderVoltageAutomationSystem; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystem; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystem; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystem; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystem; +import com.powsybl.dynawo.models.buses.InfiniteBus; +import com.powsybl.dynawo.models.buses.StandardBus; +import com.powsybl.dynawo.models.generators.*; +import com.powsybl.dynawo.models.loads.*; +import com.powsybl.dynawo.models.hvdc.HvdcP; +import com.powsybl.dynawo.models.hvdc.HvdcPDangling; +import com.powsybl.dynawo.models.hvdc.HvdcVsc; +import com.powsybl.dynawo.models.hvdc.HvdcVscDangling; +import com.powsybl.dynawo.models.lines.StandardLine; +import com.powsybl.dynawo.models.svarcs.BaseStaticVarCompensator; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatio; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import com.powsybl.iidm.network.test.FourSubstationsNodeBreakerFactory; @@ -55,7 +54,7 @@ */ class DynamicModelsSupplierTest extends AbstractModelSupplierTest { - private static final List EXTENSIONS = GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME); + private static final List EXTENSIONS = GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME); @Test void testLibsInfo() { diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/EventModelsSupplierTest.java similarity index 97% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/EventModelsSupplierTest.java index 76e181aa4..0f8a742ec 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/EventModelsSupplierTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/EventModelsSupplierTest.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.dsl; +package com.powsybl.dynawo.dsl; import com.powsybl.commons.PowsyblException; import com.powsybl.dynamicsimulation.EventModel; @@ -13,8 +13,8 @@ import com.powsybl.dynamicsimulation.groovy.EventModelGroovyExtension; import com.powsybl.dynamicsimulation.groovy.GroovyEventModelsSupplier; import com.powsybl.dynamicsimulation.groovy.GroovyExtension; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.models.events.*; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.models.events.*; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import com.powsybl.iidm.network.test.HvdcTestNetwork; @@ -35,7 +35,7 @@ */ class EventModelsSupplierTest extends AbstractModelSupplierTest { - protected static final List EXTENSIONS = GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME); + protected static final List EXTENSIONS = GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME); @Test void testLibsInfo() { diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/AbstractIeeeTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/AbstractIeeeTest.java similarity index 78% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/AbstractIeeeTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/AbstractIeeeTest.java index 617f08ecd..75826799a 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/AbstractIeeeTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/AbstractIeeeTest.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee; +package com.powsybl.dynawo.dsl.ieee; import com.powsybl.commons.config.PlatformConfig; import com.powsybl.commons.io.FileUtil; @@ -14,9 +14,9 @@ import com.powsybl.computation.local.LocalComputationManager; import com.powsybl.dynamicsimulation.*; import com.powsybl.dynamicsimulation.groovy.*; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.iidm.network.Network; import org.junit.jupiter.api.AfterEach; @@ -57,7 +57,7 @@ protected void setup(String parametersFile, String networkParametersFile, String String dynamicModelsFile, String eventModelsFile, String curvesFile, int startTime, int stopTime) throws IOException { // The parameter files are copied into the PlatformConfig filesystem, - // that filesystem is the one that DynaWaltzContext and ParametersXml will use to read the parameters + // that filesystem is the one that DynawoSimulationContext and ParametersXml will use to read the parameters fileSystem = PlatformConfig.defaultConfig().getConfigDir().map(Path::getFileSystem).orElseThrow(AssertionError::new); workingDir = Files.createDirectory(fileSystem.getPath(getWorkingDirName())); @@ -68,16 +68,16 @@ protected void setup(String parametersFile, String networkParametersFile, String // Dynamic models if (dynamicModelsFile != null) { Files.copy(Objects.requireNonNull(getClass().getResourceAsStream(dynamicModelsFile)), workingDir.resolve("dynamicModels.groovy")); - List dynamicModelGroovyExtensions = GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME); + List dynamicModelGroovyExtensions = GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME); dynamicModelsSupplier = new GroovyDynamicModelsSupplier(workingDir.resolve("dynamicModels.groovy"), dynamicModelGroovyExtensions); } else { - dynamicModelsSupplier = (n, NO_OP) -> Collections.emptyList(); + dynamicModelsSupplier = (n, r) -> Collections.emptyList(); } // Event models if (eventModelsFile != null) { Files.copy(Objects.requireNonNull(getClass().getResourceAsStream(eventModelsFile)), workingDir.resolve("eventModels.groovy")); - List eventModelGroovyExtensions = GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME); + List eventModelGroovyExtensions = GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME); eventModelsSupplier = new GroovyEventModelsSupplier(workingDir.resolve("eventModels.groovy"), eventModelGroovyExtensions); } else { eventModelsSupplier = EventModelsSupplier.empty(); @@ -86,7 +86,7 @@ protected void setup(String parametersFile, String networkParametersFile, String // Curves if (curvesFile != null) { Files.copy(Objects.requireNonNull(getClass().getResourceAsStream(curvesFile)), workingDir.resolve("curves.groovy")); - List curveGroovyExtensions = GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME); + List curveGroovyExtensions = GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME); curvesSupplier = new GroovyCurvesSupplier(workingDir.resolve("curves.groovy"), curveGroovyExtensions); } else { curvesSupplier = CurvesSupplier.empty(); @@ -95,26 +95,26 @@ protected void setup(String parametersFile, String networkParametersFile, String parameters = new DynamicSimulationParameters() .setStartTime(startTime) .setStopTime(stopTime); - DynaWaltzParameters dynaWaltzParameters = new DynaWaltzParameters(); - parameters.addExtension(DynaWaltzParameters.class, dynaWaltzParameters); - dynaWaltzParameters.setModelsParameters(ParametersXml.load(getClass().getResourceAsStream(parametersFile))) + DynawoSimulationParameters dynawoSimulationParameters = new DynawoSimulationParameters(); + parameters.addExtension(DynawoSimulationParameters.class, dynawoSimulationParameters); + dynawoSimulationParameters.setModelsParameters(ParametersXml.load(getClass().getResourceAsStream(parametersFile))) .setNetworkParameters(ParametersXml.load(getClass().getResourceAsStream(networkParametersFile), networkParametersId)) .setSolverParameters(ParametersXml.load(getClass().getResourceAsStream(solverParametersFile), solverParametersId)) - .setSolverType(DynaWaltzParameters.SolverType.IDA); + .setSolverType(DynawoSimulationParameters.SolverType.IDA); } - protected DynaWaltzParameters getDynaWaltzSimulationParameters(DynamicSimulationParameters parameters) { - DynaWaltzParameters dynaWaltzParameters = parameters.getExtension(DynaWaltzParameters.class); - if (dynaWaltzParameters == null) { - dynaWaltzParameters = DynaWaltzParameters.load(); + protected DynawoSimulationParameters getDynamicSimulationParameters(DynamicSimulationParameters parameters) { + DynawoSimulationParameters dynawoSimulationParameters = parameters.getExtension(DynawoSimulationParameters.class); + if (dynawoSimulationParameters == null) { + dynawoSimulationParameters = DynawoSimulationParameters.load(); } - return dynaWaltzParameters; + return dynawoSimulationParameters; } public DynamicSimulationResult runSimulation(LocalCommandExecutor commandExecutor) throws Exception { ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(workingDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); return dynawoSimulation.run(network, dynamicModelsSupplier, eventModelsSupplier, curvesSupplier, network.getVariantManager().getWorkingVariantId(), computationManager, parameters, NO_OP); diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/DynaWaltzLocalCommandExecutor.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/DynawoLocalCommandExecutor.java similarity index 68% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/DynaWaltzLocalCommandExecutor.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/DynawoLocalCommandExecutor.java index c0cb1d2dc..940fc4bd7 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee/DynaWaltzLocalCommandExecutor.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee/DynawoLocalCommandExecutor.java @@ -4,10 +4,10 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee; +package com.powsybl.dynawo.dsl.ieee; import com.powsybl.computation.local.LocalCommandExecutor; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DynawoSimulationParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xmlunit.builder.DiffBuilder; @@ -25,44 +25,44 @@ import java.util.Map; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.*; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.*; import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Marcos de Miguel {@literal } * @author Laurent Issertial {@literal } */ -public class DynaWaltzLocalCommandExecutor implements LocalCommandExecutor { +public class DynawoLocalCommandExecutor implements LocalCommandExecutor { - private static final Logger LOGGER = LoggerFactory.getLogger(DynaWaltzLocalCommandExecutor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DynawoLocalCommandExecutor.class); private final FileSystem fileSystem; private final String networkId; - private final DynaWaltzParameters dynaWaltzParameters; + private final DynawoSimulationParameters dynawoSimulationParameters; private final String baseDirName; private final String stdOutFileRef; - public DynaWaltzLocalCommandExecutor(FileSystem fileSystem, String networkId, DynaWaltzParameters dynaWaltzParameters, String baseDir, String stdOutFileRef) { + public DynawoLocalCommandExecutor(FileSystem fileSystem, String networkId, DynawoSimulationParameters dynawoSimulationParameters, String baseDir, String stdOutFileRef) { this.fileSystem = Objects.requireNonNull(fileSystem); this.networkId = Objects.requireNonNull(networkId); - this.dynaWaltzParameters = Objects.requireNonNull(dynaWaltzParameters); + this.dynawoSimulationParameters = Objects.requireNonNull(dynawoSimulationParameters); this.baseDirName = baseDir; this.stdOutFileRef = stdOutFileRef; } protected void validateInputs(Path workingDir) throws IOException { - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.xiidm"), Files.newInputStream(workingDir.resolve(NETWORK_FILENAME))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.jobs"), Files.newInputStream(workingDir.resolve(JOBS_FILENAME))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.dyd"), Files.newInputStream(workingDir.resolve(DYD_FILENAME))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/models.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.MODELS_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/network.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.NETWORK_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/solvers.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynaWaltzParameters.SOLVER_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/" + networkId + ".par"), Files.newInputStream(workingDir.resolve(networkId + ".par"))); - compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-inputs/powsybl_dynawaltz.crv"), Files.newInputStream(workingDir.resolve(CRV_FILENAME))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/powsybl_dynawo.xiidm"), Files.newInputStream(workingDir.resolve(NETWORK_FILENAME))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/powsybl_dynawo.jobs"), Files.newInputStream(workingDir.resolve(JOBS_FILENAME))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/powsybl_dynawo.dyd"), Files.newInputStream(workingDir.resolve(DYD_FILENAME))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/models.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynawoSimulationParameters.MODELS_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/network.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynawoSimulationParameters.NETWORK_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/solvers.par"), Files.newInputStream(workingDir.resolve(fileSystem.getPath(DynawoSimulationParameters.SOLVER_OUTPUT_PARAMETERS_FILE).getFileName().toString()))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/" + networkId + ".par"), Files.newInputStream(workingDir.resolve(networkId + ".par"))); + compareXml(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-inputs/powsybl_dynawo.crv"), Files.newInputStream(workingDir.resolve(CRV_FILENAME))); } protected void copyOutputs(Path workingDir) throws IOException { Path output = Files.createDirectories(workingDir.resolve("outputs/curves").toAbsolutePath()); - Files.copy(Objects.requireNonNull(getClass().getResourceAsStream("/" + baseDirName + "/dynawaltz-outputs/curves.csv")), output.resolve("curves.csv")); + Files.copy(Objects.requireNonNull(getClass().getResourceAsStream("/" + baseDirName + "/dynawo-outputs/curves.csv")), output.resolve("curves.csv")); } @Override diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DisconnectLineTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DisconnectLineTest.java similarity index 79% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DisconnectLineTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DisconnectLineTest.java index 901bb34d4..7128bcbce 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DisconnectLineTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DisconnectLineTest.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee14; +package com.powsybl.dynawo.dsl.ieee14; import com.powsybl.dynamicsimulation.DynamicSimulationResult; -import com.powsybl.dynawaltz.dsl.ieee.AbstractIeeeTest; -import com.powsybl.dynawaltz.dsl.ieee.DynaWaltzLocalCommandExecutor; +import com.powsybl.dynawo.dsl.ieee.AbstractIeeeTest; +import com.powsybl.dynawo.dsl.ieee.DynawoLocalCommandExecutor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ public void setup() throws IOException { @Test void testSimulation() throws Exception { - DynaWaltzLocalCommandExecutor commandExecutor = new DynaWaltzLocalCommandExecutor(fileSystem, network.getId(), getDynaWaltzSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); + DynawoLocalCommandExecutor commandExecutor = new DynawoLocalCommandExecutor(fileSystem, network.getId(), getDynamicSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); DynamicSimulationResult result; result = runSimulation(commandExecutor); assertNotNull(result); diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java similarity index 80% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java index 46c16e084..cee3f36d0 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14DynamicOverloadManagementSystemTest.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee14; +package com.powsybl.dynawo.dsl.ieee14; import com.powsybl.dynamicsimulation.DynamicSimulationResult; -import com.powsybl.dynawaltz.dsl.ieee.AbstractIeeeTest; -import com.powsybl.dynawaltz.dsl.ieee.DynaWaltzLocalCommandExecutor; +import com.powsybl.dynawo.dsl.ieee.AbstractIeeeTest; +import com.powsybl.dynawo.dsl.ieee.DynawoLocalCommandExecutor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ void setup() throws IOException { @Test void testSimulation() throws Exception { - DynaWaltzLocalCommandExecutor commandExecutor = new DynaWaltzLocalCommandExecutor(fileSystem, network.getId(), getDynaWaltzSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); + DynawoLocalCommandExecutor commandExecutor = new DynawoLocalCommandExecutor(fileSystem, network.getId(), getDynamicSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); DynamicSimulationResult result = runSimulation(commandExecutor); assertNotNull(result); } diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14MacroConnectsTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14MacroConnectsTest.java similarity index 79% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14MacroConnectsTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14MacroConnectsTest.java index 78f52e92d..ef2577a41 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee14/Ieee14MacroConnectsTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee14/Ieee14MacroConnectsTest.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee14; +package com.powsybl.dynawo.dsl.ieee14; import com.powsybl.dynamicsimulation.DynamicSimulationResult; -import com.powsybl.dynawaltz.dsl.ieee.AbstractIeeeTest; -import com.powsybl.dynawaltz.dsl.ieee.DynaWaltzLocalCommandExecutor; +import com.powsybl.dynawo.dsl.ieee.AbstractIeeeTest; +import com.powsybl.dynawo.dsl.ieee.DynawoLocalCommandExecutor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ void setup() throws IOException { @Test void testSimulation() throws Exception { - DynaWaltzLocalCommandExecutor commandExecutor = new DynaWaltzLocalCommandExecutor(fileSystem, network.getId(), getDynaWaltzSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); + DynawoLocalCommandExecutor commandExecutor = new DynawoLocalCommandExecutor(fileSystem, network.getId(), getDynamicSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); DynamicSimulationResult result = runSimulation(commandExecutor); assertNotNull(result); } diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee57/Ieee57DisconnectGeneratorTest.java b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee57/Ieee57DisconnectGeneratorTest.java similarity index 79% rename from dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee57/Ieee57DisconnectGeneratorTest.java rename to dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee57/Ieee57DisconnectGeneratorTest.java index b3fac05cd..ab2df83e3 100644 --- a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/ieee57/Ieee57DisconnectGeneratorTest.java +++ b/dynawo-dsl/src/test/java/com/powsybl/dynawo/dsl/ieee57/Ieee57DisconnectGeneratorTest.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.dsl.ieee57; +package com.powsybl.dynawo.dsl.ieee57; import com.powsybl.dynamicsimulation.DynamicSimulationResult; -import com.powsybl.dynawaltz.dsl.ieee.AbstractIeeeTest; -import com.powsybl.dynawaltz.dsl.ieee.DynaWaltzLocalCommandExecutor; +import com.powsybl.dynawo.dsl.ieee.AbstractIeeeTest; +import com.powsybl.dynawo.dsl.ieee.DynawoLocalCommandExecutor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ void setup() throws IOException { @Test void testSimulation() throws Exception { - DynaWaltzLocalCommandExecutor commandExecutor = new DynaWaltzLocalCommandExecutor(fileSystem, network.getId(), getDynaWaltzSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); + DynawoLocalCommandExecutor commandExecutor = new DynawoLocalCommandExecutor(fileSystem, network.getId(), getDynamicSimulationParameters(parameters), getWorkingDirName(), "/dynawo_version.out"); DynamicSimulationResult result = runSimulation(commandExecutor); assertNotNull(result); } diff --git a/dynawaltz-dsl/src/test/resources/curves.groovy b/dynawo-dsl/src/test/resources/curves.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/curves.groovy rename to dynawo-dsl/src/test/resources/curves.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels.groovy b/dynawo-dsl/src/test/resources/dynamicModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels.groovy rename to dynawo-dsl/src/test/resources/dynamicModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/bus.groovy b/dynawo-dsl/src/test/resources/dynamicModels/bus.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/bus.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/bus.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy b/dynawo-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/gen.groovy b/dynawo-dsl/src/test/resources/dynamicModels/gen.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/gen.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/gen.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/genControllable.groovy b/dynawo-dsl/src/test/resources/dynamicModels/genControllable.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/genControllable.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/genControllable.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/genFictitious.groovy b/dynawo-dsl/src/test/resources/dynamicModels/genFictitious.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/genFictitious.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/genFictitious.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/genTfo.groovy b/dynawo-dsl/src/test/resources/dynamicModels/genTfo.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/genTfo.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/genTfo.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/gridFormingConverter.groovy b/dynawo-dsl/src/test/resources/dynamicModels/gridFormingConverter.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/gridFormingConverter.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/gridFormingConverter.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcP.groovy b/dynawo-dsl/src/test/resources/dynamicModels/hvdcP.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcP.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/hvdcP.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy b/dynawo-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVsc.groovy b/dynawo-dsl/src/test/resources/dynamicModels/hvdcVsc.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVsc.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/hvdcVsc.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy b/dynawo-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/infiniteBus.groovy b/dynawo-dsl/src/test/resources/dynamicModels/infiniteBus.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/infiniteBus.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/infiniteBus.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/line.groovy b/dynawo-dsl/src/test/resources/dynamicModels/line.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/line.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/line.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadAB.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadAB.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadAB.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadAB.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadABControllable.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadABControllable.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadABControllable.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadABControllable.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadTransformer.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadTransformer.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadTransformer.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadTransformer.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadTransformerTapChanger.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadTransformerTapChanger.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadTransformerTapChanger.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadTransformerTapChanger.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadTwoTransformers.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadTwoTransformers.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadTwoTransformers.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadTwoTransformers.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/loadTwoTransformersTapChangers.groovy b/dynawo-dsl/src/test/resources/dynamicModels/loadTwoTransformersTapChangers.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/loadTwoTransformersTapChangers.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/loadTwoTransformersTapChangers.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/omegaGen.groovy b/dynawo-dsl/src/test/resources/dynamicModels/omegaGen.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/omegaGen.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/omegaGen.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/omegaGenControllable.groovy b/dynawo-dsl/src/test/resources/dynamicModels/omegaGenControllable.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/omegaGenControllable.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/omegaGenControllable.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/overloadManagement b/dynawo-dsl/src/test/resources/dynamicModels/overloadManagement similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/overloadManagement rename to dynawo-dsl/src/test/resources/dynamicModels/overloadManagement diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/overloadManagementTwoLevels.groovy b/dynawo-dsl/src/test/resources/dynamicModels/overloadManagementTwoLevels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/overloadManagementTwoLevels.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/overloadManagementTwoLevels.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/phaseShifterI.groovy b/dynawo-dsl/src/test/resources/dynamicModels/phaseShifterI.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/phaseShifterI.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/phaseShifterI.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/phaseShifterP.groovy b/dynawo-dsl/src/test/resources/dynamicModels/phaseShifterP.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/phaseShifterP.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/phaseShifterP.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/svarc.groovy b/dynawo-dsl/src/test/resources/dynamicModels/svarc.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/svarc.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/svarc.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/tapChanger.groovy b/dynawo-dsl/src/test/resources/dynamicModels/tapChanger.groovy similarity index 89% rename from dynawaltz-dsl/src/test/resources/dynamicModels/tapChanger.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/tapChanger.groovy index 1905ee8d0..3dba1dc35 100644 --- a/dynawaltz-dsl/src/test/resources/dynamicModels/tapChanger.groovy +++ b/dynawo-dsl/src/test/resources/dynamicModels/tapChanger.groovy @@ -8,7 +8,7 @@ package dynamicModels -import com.powsybl.dynawaltz.models.TransformerSide +import com.powsybl.dynawo.models.TransformerSide TapChangerAutomaton { diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBlocking.groovy b/dynawo-dsl/src/test/resources/dynamicModels/tapChangerBlocking.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBlocking.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/tapChangerBlocking.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBlockingBusBar.groovy b/dynawo-dsl/src/test/resources/dynamicModels/tapChangerBlockingBusBar.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/tapChangerBlockingBusBar.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/tapChangerBlockingBusBar.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/transformer.groovy b/dynawo-dsl/src/test/resources/dynamicModels/transformer.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/transformer.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/transformer.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/underVoltage.groovy b/dynawo-dsl/src/test/resources/dynamicModels/underVoltage.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/underVoltage.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/underVoltage.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/wecc.groovy b/dynawo-dsl/src/test/resources/dynamicModels/wecc.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/wecc.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/wecc.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/weccSynchro.groovy b/dynawo-dsl/src/test/resources/dynamicModels/weccSynchro.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynamicModels/weccSynchro.groovy rename to dynawo-dsl/src/test/resources/dynamicModels/weccSynchro.groovy diff --git a/dynawaltz-dsl/src/test/resources/dynawo_bad_version.out b/dynawo-dsl/src/test/resources/dynawo_bad_version.out similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynawo_bad_version.out rename to dynawo-dsl/src/test/resources/dynawo_bad_version.out diff --git a/dynawaltz-dsl/src/test/resources/dynawo_version.out b/dynawo-dsl/src/test/resources/dynawo_version.out similarity index 100% rename from dynawaltz-dsl/src/test/resources/dynawo_version.out rename to dynawo-dsl/src/test/resources/dynawo_version.out diff --git a/dynawaltz-dsl/src/test/resources/eventModels.groovy b/dynawo-dsl/src/test/resources/eventModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels.groovy rename to dynawo-dsl/src/test/resources/eventModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventModels/branchDisconnection.groovy b/dynawo-dsl/src/test/resources/eventModels/branchDisconnection.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels/branchDisconnection.groovy rename to dynawo-dsl/src/test/resources/eventModels/branchDisconnection.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventModels/equipmentDisconnection.groovy b/dynawo-dsl/src/test/resources/eventModels/equipmentDisconnection.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels/equipmentDisconnection.groovy rename to dynawo-dsl/src/test/resources/eventModels/equipmentDisconnection.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy b/dynawo-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy rename to dynawo-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventModels/nodeFault.groovy b/dynawo-dsl/src/test/resources/eventModels/nodeFault.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels/nodeFault.groovy rename to dynawo-dsl/src/test/resources/eventModels/nodeFault.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventModels/step.groovy b/dynawo-dsl/src/test/resources/eventModels/step.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventModels/step.groovy rename to dynawo-dsl/src/test/resources/eventModels/step.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingAPVParameters.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingAPVParameters.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingAPVParameters.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingAPVParameters.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionEquipment.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingDisconnectionEquipment.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionEquipment.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingDisconnectionEquipment.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingNodeFaultParameters.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingNodeFaultParameters.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingNodeFaultParameters.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingNodeFaultParameters.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingStartTime.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingStartTime.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingStartTime.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingStartTime.groovy diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingStaticId.groovy b/dynawo-dsl/src/test/resources/eventWarnings/missingStaticId.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/eventWarnings/missingStaticId.groovy rename to dynawo-dsl/src/test/resources/eventWarnings/missingStaticId.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/models.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/config/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/models.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/config/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/network.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/config/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/network.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/config/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/solvers.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/config/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/config/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/config/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/ieee14bus.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/ieee14bus.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/ieee14bus.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/ieee14bus.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/models.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/models.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/network.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/network.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.crv b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.crv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.crv rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.crv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.dyd b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.dyd similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.dyd rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.dyd diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.jobs b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.jobs similarity index 71% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.jobs rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.jobs index 5591a9cb7..675e954c2 100644 --- a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.jobs +++ b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.jobs @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.xiidm b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.xiidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/powsybl_dynawaltz.xiidm rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/powsybl_dynawo.xiidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/solvers.par b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-inputs/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-inputs/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-outputs/curves.csv b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-outputs/curves.csv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-outputs/curves.csv rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-outputs/curves.csv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-outputs/timeline.log b/dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-outputs/timeline.log similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/dynawaltz-outputs/timeline.log rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/dynawo-outputs/timeline.log diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/IEEE14.iidm b/dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/IEEE14.iidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/IEEE14.iidm rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/IEEE14.iidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/curves.groovy b/dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/curves.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/curves.groovy rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/curves.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/dynamicModels.groovy b/dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/dynamicModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/dynamicModels.groovy rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/dynamicModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy b/dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy rename to dynawo-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/models.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/config/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/models.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/config/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/network.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/config/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/network.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/config/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/solvers.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/config/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/config/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/config/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/ieee14bus.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/ieee14bus.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/ieee14bus.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/ieee14bus.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/models.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/models.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/network.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/network.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.crv b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.crv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.crv rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.crv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.dyd b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.dyd similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.dyd rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.dyd diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.jobs b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.jobs similarity index 70% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.jobs rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.jobs index 2ffceda39..0ab7d1e09 100644 --- a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.jobs +++ b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.jobs @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.xiidm b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.xiidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/powsybl_dynawaltz.xiidm rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/powsybl_dynawo.xiidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/solvers.par b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-inputs/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-inputs/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-outputs/curves.csv b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-outputs/curves.csv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-outputs/curves.csv rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-outputs/curves.csv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-outputs/timeline.log b/dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-outputs/timeline.log similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/dynawaltz-outputs/timeline.log rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/dynawo-outputs/timeline.log diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/IEEE14.iidm b/dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/IEEE14.iidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/IEEE14.iidm rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/IEEE14.iidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/curves.groovy b/dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/curves.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/curves.groovy rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/curves.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/dynamicModels.groovy b/dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/dynamicModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/dynamicModels.groovy rename to dynawo-dsl/src/test/resources/ieee14-macroconnects/powsybl-inputs/dynamicModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/models.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/models.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/network.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/network.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/solvers.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/config/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/ieee14bus.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/ieee14bus.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/ieee14bus.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/ieee14bus.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/models.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/models.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/network.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/network.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.crv b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.crv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.crv rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.crv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.dyd b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.dyd similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.dyd rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.dyd diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.jobs b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.jobs similarity index 71% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.jobs rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.jobs index efff61aa6..18fe6c2b2 100644 --- a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.jobs +++ b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.jobs @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.xiidm b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.xiidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawaltz.xiidm rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/powsybl_dynawo.xiidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/solvers.par b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/solvers.par rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-inputs/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/curves.csv b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/curves.csv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/curves.csv rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/curves.csv diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/timeline.log b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/timeline.log similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/timeline.log rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/dynawaltz-outputs/timeline.log diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/IEEE14.iidm b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/IEEE14.iidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/IEEE14.iidm rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/IEEE14.iidm diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/curves.groovy b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/curves.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/curves.groovy rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/curves.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/dynamicModels.groovy b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/dynamicModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/dynamicModels.groovy rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/dynamicModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/eventModels.groovy b/dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/eventModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/eventModels.groovy rename to dynawo-dsl/src/test/resources/ieee14-overloadmanagementsystem/powsybl-inputs/eventModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/models.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/models.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/network.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/network.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/solvers.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/config/solvers.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/config/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/ieee57bus.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/ieee57bus.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/ieee57bus.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/ieee57bus.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/models.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/models.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/models.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/models.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/network.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/network.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/network.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/network.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.crv b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.crv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.crv rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.crv diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.dyd b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.dyd similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.dyd rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.dyd diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.jobs b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.jobs similarity index 70% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.jobs rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.jobs index 2f6f9dcbc..5793a04c1 100644 --- a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.jobs +++ b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.jobs @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.xiidm b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.xiidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/powsybl_dynawaltz.xiidm rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/powsybl_dynawo.xiidm diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/solvers.par b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/solvers.par similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-inputs/solvers.par rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-inputs/solvers.par diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-outputs/curves.csv b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-outputs/curves.csv similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-outputs/curves.csv rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-outputs/curves.csv diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-outputs/timeline.log b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-outputs/timeline.log similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/dynawaltz-outputs/timeline.log rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/dynawo-outputs/timeline.log diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/IEEE57.iidm b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/IEEE57.iidm similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/IEEE57.iidm rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/IEEE57.iidm diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/curves.groovy b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/curves.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/curves.groovy rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/curves.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/dynamicModels.groovy b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/dynamicModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/dynamicModels.groovy rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/dynamicModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/eventModels.groovy b/dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/eventModels.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/eventModels.groovy rename to dynawo-dsl/src/test/resources/ieee57-disconnectgenerator/powsybl-inputs/eventModels.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy b/dynawo-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy rename to dynawo-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy b/dynawo-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy rename to dynawo-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy b/dynawo-dsl/src/test/resources/warnings/claMissingControlled.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy rename to dynawo-dsl/src/test/resources/warnings/claMissingControlled.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy b/dynawo-dsl/src/test/resources/warnings/claMissingMeasurement.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy rename to dynawo-dsl/src/test/resources/warnings/claMissingMeasurement.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurementSide.groovy b/dynawo-dsl/src/test/resources/warnings/claMissingMeasurementSide.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurementSide.groovy rename to dynawo-dsl/src/test/resources/warnings/claMissingMeasurementSide.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/hvdcVscWrongStaticType.groovy b/dynawo-dsl/src/test/resources/warnings/hvdcVscWrongStaticType.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/hvdcVscWrongStaticType.groovy rename to dynawo-dsl/src/test/resources/warnings/hvdcVscWrongStaticType.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingDangling.groovy b/dynawo-dsl/src/test/resources/warnings/missingDangling.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/missingDangling.groovy rename to dynawo-dsl/src/test/resources/warnings/missingDangling.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy b/dynawo-dsl/src/test/resources/warnings/missingDanglingProperty.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy rename to dynawo-dsl/src/test/resources/warnings/missingDanglingProperty.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingEquipment.groovy b/dynawo-dsl/src/test/resources/warnings/missingEquipment.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/missingEquipment.groovy rename to dynawo-dsl/src/test/resources/warnings/missingEquipment.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingParameterId.groovy b/dynawo-dsl/src/test/resources/warnings/missingParameterId.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/missingParameterId.groovy rename to dynawo-dsl/src/test/resources/warnings/missingParameterId.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingStaticId.groovy b/dynawo-dsl/src/test/resources/warnings/missingStaticId.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/missingStaticId.groovy rename to dynawo-dsl/src/test/resources/warnings/missingStaticId.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/phaseShifterMissingTransformer.groovy b/dynawo-dsl/src/test/resources/warnings/phaseShifterMissingTransformer.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/phaseShifterMissingTransformer.groovy rename to dynawo-dsl/src/test/resources/warnings/phaseShifterMissingTransformer.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/tapChangerCompatible.groovy b/dynawo-dsl/src/test/resources/warnings/tapChangerCompatible.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/tapChangerCompatible.groovy rename to dynawo-dsl/src/test/resources/warnings/tapChangerCompatible.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/tapChangerMissingBus.groovy b/dynawo-dsl/src/test/resources/warnings/tapChangerMissingBus.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/tapChangerMissingBus.groovy rename to dynawo-dsl/src/test/resources/warnings/tapChangerMissingBus.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/tapChangerMissingBusList.groovy b/dynawo-dsl/src/test/resources/warnings/tapChangerMissingBusList.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/tapChangerMissingBusList.groovy rename to dynawo-dsl/src/test/resources/warnings/tapChangerMissingBusList.groovy diff --git a/dynawaltz-dsl/src/test/resources/warnings/underVoltageMissingGenerator.groovy b/dynawo-dsl/src/test/resources/warnings/underVoltageMissingGenerator.groovy similarity index 100% rename from dynawaltz-dsl/src/test/resources/warnings/underVoltageMissingGenerator.groovy rename to dynawo-dsl/src/test/resources/warnings/underVoltageMissingGenerator.groovy diff --git a/dynawo-integration-tests/pom.xml b/dynawo-integration-tests/pom.xml index 57b4e43a6..6436749bf 100644 --- a/dynawo-integration-tests/pom.xml +++ b/dynawo-integration-tests/pom.xml @@ -36,11 +36,11 @@ com.powsybl - powsybl-dynawaltz + powsybl-dynawo-simulation com.powsybl - powsybl-dynawaltz-dsl + powsybl-dynawo-dsl com.powsybl diff --git a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSecurityAnalysisTest.java b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSecurityAnalysisTest.java index 56e5d6e45..1d136dbb2 100644 --- a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSecurityAnalysisTest.java +++ b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSecurityAnalysisTest.java @@ -17,10 +17,10 @@ import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension; import com.powsybl.dynamicsimulation.groovy.GroovyDynamicModelsSupplier; import com.powsybl.dynamicsimulation.groovy.GroovyExtension; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.parameters.ParametersSet; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.parameters.ParametersSet; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.dynawo.security.DynawoAlgorithmsConfig; import com.powsybl.dynawo.security.DynawoSecurityAnalysisProvider; @@ -53,7 +53,7 @@ class DynawoSecurityAnalysisTest extends AbstractDynawoTest { private DynamicSecurityAnalysisParameters parameters; - private DynaWaltzParameters dynaWaltzParameters; + private DynawoSimulationParameters dynawoSimulationParameters; @Override @BeforeEach @@ -63,8 +63,8 @@ void setUp() throws Exception { parameters = new DynamicSecurityAnalysisParameters() .setDynamicSimulationParameters(new DynamicSimulationParameters(0, 100)) .setDynamicContingenciesParameters(new DynamicSecurityAnalysisParameters.ContingenciesParameters(50)); - dynaWaltzParameters = new DynaWaltzParameters(); - parameters.getDynamicSimulationParameters().addExtension(DynaWaltzParameters.class, dynaWaltzParameters); + dynawoSimulationParameters = new DynawoSimulationParameters(); + parameters.getDynamicSimulationParameters().addExtension(DynawoSimulationParameters.class, dynawoSimulationParameters); } @Test @@ -73,15 +73,15 @@ void testIeee14() throws IOException { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/ieee14/disconnectline/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); List modelsParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/models.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/solvers.par"), "2"); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA); + .setSolverType(DynawoSimulationParameters.SolverType.IDA); ReportNode reportNode = ReportNode.newRootReportNode() .withMessageTemplate("root", "Root message") diff --git a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSimulationTest.java similarity index 83% rename from dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java rename to dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSimulationTest.java index 6c474426c..e8ddcb85d 100644 --- a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java +++ b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynawoSimulationTest.java @@ -11,14 +11,14 @@ import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.*; import com.powsybl.dynamicsimulation.groovy.*; -import com.powsybl.dynawaltz.DumpFileParameters; -import com.powsybl.dynawaltz.DynaWaltzConfig; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.parameters.ParametersSet; -import com.powsybl.dynawaltz.suppliers.dynamicmodels.DynawoModelsSupplier; -import com.powsybl.dynawaltz.suppliers.events.DynawoEventModelsSupplier; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.DumpFileParameters; +import com.powsybl.dynawo.DynawoSimulationConfig; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.parameters.ParametersSet; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynawoModelsSupplier; +import com.powsybl.dynawo.suppliers.events.DynawoEventModelsSupplier; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.VariantManagerConstants; import com.powsybl.iidm.network.test.SvcTestCaseFactory; @@ -40,24 +40,24 @@ /** * @author Geoffroy Jamgotchian {@literal } */ -class DynaWaltzTest extends AbstractDynawoTest { +class DynawoSimulationTest extends AbstractDynawoTest { private DynamicSimulationProvider provider; private DynamicSimulationParameters parameters; - private DynaWaltzParameters dynaWaltzParameters; + private DynawoSimulationParameters dynawoSimulationParameters; @Override @BeforeEach void setUp() throws Exception { super.setUp(); - provider = new DynaWaltzProvider(new DynaWaltzConfig(Path.of("/dynawo"), false)); + provider = new DynawoSimulationProvider(new DynawoSimulationConfig(Path.of("/dynawo"), true)); parameters = new DynamicSimulationParameters() .setStartTime(0) .setStopTime(100); - dynaWaltzParameters = new DynaWaltzParameters(); - parameters.addExtension(DynaWaltzParameters.class, dynaWaltzParameters); + dynawoSimulationParameters = new DynawoSimulationParameters(); + parameters.addExtension(DynawoSimulationParameters.class, dynawoSimulationParameters); } @Test @@ -66,24 +66,24 @@ void testIeee14() { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/ieee14/disconnectline/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyEventModelsSupplier eventModelsSupplier = new GroovyEventModelsSupplier( getResourceAsStream("/ieee14/disconnectline/eventModels.groovy"), - GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyCurvesSupplier curvesSupplier = new GroovyCurvesSupplier( getResourceAsStream("/ieee14/disconnectline/curves.groovy"), - GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME)); List modelsParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/models.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/solvers.par"), "2"); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) - .setTimelineExportMode(DynaWaltzParameters.ExportMode.XML); + .setSolverType(DynawoSimulationParameters.SolverType.IDA) + .setTimelineExportMode(DynawoSimulationParameters.ExportMode.XML); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, curvesSupplier, VariantManagerConstants.INITIAL_VARIANT_ID, computationManager, parameters, NO_OP) @@ -106,15 +106,15 @@ void testIeee14WithDump() throws IOException { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/ieee14/disconnectline/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyEventModelsSupplier eventModelsSupplier = new GroovyEventModelsSupplier( getResourceAsStream("/ieee14/disconnectline/eventModels.groovy"), - GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyCurvesSupplier curvesSupplier = new GroovyCurvesSupplier( getResourceAsStream("/ieee14/disconnectline/curves.groovy"), - GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME)); Path dumpDir = Files.createDirectory(localDir.resolve("dumpFiles")); @@ -124,10 +124,10 @@ void testIeee14WithDump() throws IOException { ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/solvers.par"), "2"); DumpFileParameters dumpFileParameters = DumpFileParameters.createExportDumpFileParameters(dumpDir); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) + .setSolverType(DynawoSimulationParameters.SolverType.IDA) .setDumpFileParameters(dumpFileParameters); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, curvesSupplier, @@ -143,7 +143,7 @@ void testIeee14WithDump() throws IOException { try (Stream stream = Files.list(dumpDir)) { dumpFile = stream.findFirst().map(Path::getFileName).map(Path::toString).orElseThrow(); } - dynaWaltzParameters.setDumpFileParameters(DumpFileParameters.createImportDumpFileParameters(dumpDir, dumpFile)); + dynawoSimulationParameters.setDumpFileParameters(DumpFileParameters.createImportDumpFileParameters(dumpDir, dumpFile)); result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, curvesSupplier, VariantManagerConstants.INITIAL_VARIANT_ID, computationManager, parameters, NO_OP) @@ -158,15 +158,15 @@ void testSvarc() { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/svarc/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); List modelsParameters = ParametersXml.load(getResourceAsStream("/svarc/models.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/svarc/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/svarc/solvers.par"), "2"); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) + .setSolverType(DynawoSimulationParameters.SolverType.IDA) .setPrecision(10e-8); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, EventModelsSupplier.empty(), CurvesSupplier.empty(), @@ -187,17 +187,17 @@ void testHvdc() { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/hvdc/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); List modelsParameters = ParametersXml.load(getResourceAsStream("/hvdc/models.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/hvdc/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/hvdc/solvers.par"), "2"); ReportNode reportNode = newRootReportNode().withMessageTemplate("testHvdc", "Test HVDC").build(); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) - .setSpecificLogs(EnumSet.allOf(DynaWaltzParameters.SpecificLog.class)); + .setSolverType(DynawoSimulationParameters.SolverType.IDA) + .setSpecificLogs(EnumSet.allOf(DynawoSimulationParameters.SpecificLog.class)); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, EventModelsSupplier.empty(), CurvesSupplier.empty(), VariantManagerConstants.INITIAL_VARIANT_ID, computationManager, parameters, reportNode) @@ -217,23 +217,23 @@ void testSmib() { GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/smib/dynamicModels.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyEventModelsSupplier eventModelsSupplier = new GroovyEventModelsSupplier( getResourceAsStream("/smib/eventModels.groovy"), - GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyCurvesSupplier curvesSupplier = new GroovyCurvesSupplier( getResourceAsStream("/smib/curves.groovy"), - GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(CurveGroovyExtension.class, DynawoSimulationProvider.NAME)); List modelsParameters = ParametersXml.load(getResourceAsStream("/smib/SMIB.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/smib/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/smib/solvers.par"), "1"); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) + .setSolverType(DynawoSimulationParameters.SolverType.IDA) .setWriteFinalState(false); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, curvesSupplier, @@ -249,21 +249,21 @@ void testSmib() { @Test void testSimulationError() { - Network network = Network.read(new ResourceDataSource("powsybl_dynawaltz", new ResourceSet("/error", "powsybl_dynawaltz.xiidm"))); + Network network = Network.read(new ResourceDataSource("powsybl_dynawo", new ResourceSet("/error", "powsybl_dynawo.xiidm"))); GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( getResourceAsStream("/error/models.groovy"), - GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME)); GroovyEventModelsSupplier eventModelsSupplier = new GroovyEventModelsSupplier( getResourceAsStream("/error/eventModels.groovy"), - GroovyExtension.find(EventModelGroovyExtension.class, DynaWaltzProvider.NAME)); + GroovyExtension.find(EventModelGroovyExtension.class, DynawoSimulationProvider.NAME)); parameters.setStopTime(200); - dynaWaltzParameters.setModelsParameters(ParametersXml.load(getResourceAsStream("/error/models.par"))) + dynawoSimulationParameters.setModelsParameters(ParametersXml.load(getResourceAsStream("/error/models.par"))) .setNetworkParameters(ParametersXml.load(getResourceAsStream("/error/network.par"), "NETWORK")) .setSolverParameters(ParametersXml.load(getResourceAsStream("/error/solvers.par"), "3")) - .setSolverType(DynaWaltzParameters.SolverType.SIM); + .setSolverType(DynawoSimulationParameters.SolverType.SIM); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, CurvesSupplier.empty(), VariantManagerConstants.INITIAL_VARIANT_ID, computationManager, parameters, NO_OP) @@ -285,11 +285,11 @@ void testIeee14DynawoSuppliers() { List modelsParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/models.par")); ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/network.par"), "8"); ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/ieee14/disconnectline/solvers.par"), "2"); - dynaWaltzParameters.setModelsParameters(modelsParameters) + dynawoSimulationParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) - .setSolverType(DynaWaltzParameters.SolverType.IDA) - .setTimelineExportMode(DynaWaltzParameters.ExportMode.XML); + .setSolverType(DynawoSimulationParameters.SolverType.IDA) + .setTimelineExportMode(DynawoSimulationParameters.ExportMode.XML); DynamicSimulationResult result = provider.run(network, dynamicModelsSupplier, eventModelsSupplier, CurvesSupplier.empty(), VariantManagerConstants.INITIAL_VARIANT_ID, computationManager, parameters, NO_OP) diff --git a/dynawo-integration-tests/src/test/resources/error/powsybl_dynawaltz.xiidm b/dynawo-integration-tests/src/test/resources/error/powsybl_dynawo.xiidm similarity index 100% rename from dynawo-integration-tests/src/test/resources/error/powsybl_dynawaltz.xiidm rename to dynawo-integration-tests/src/test/resources/error/powsybl_dynawo.xiidm diff --git a/dynawo-security-analysis/pom.xml b/dynawo-security-analysis/pom.xml index 95b1fe630..6a0152f9b 100644 --- a/dynawo-security-analysis/pom.xml +++ b/dynawo-security-analysis/pom.xml @@ -29,7 +29,7 @@ ${project.groupId} - powsybl-dynawaltz + powsybl-dynawo-simulation ${project.groupId} @@ -74,7 +74,7 @@ ${project.groupId} - powsybl-dynawaltz + powsybl-dynawo-simulation test-jar test diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/ContingencyEventModels.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/ContingencyEventModels.java index bf783ec2a..4c06a7b5f 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/ContingencyEventModels.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/ContingencyEventModels.java @@ -8,10 +8,10 @@ package com.powsybl.dynawo.security; import com.powsybl.contingency.Contingency; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnect; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnector; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnect; +import com.powsybl.dynawo.models.macroconnections.MacroConnector; +import com.powsybl.dynawo.parameters.ParametersSet; import java.util.List; import java.util.Map; diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfig.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfig.java index bb073a577..88960f1d0 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfig.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfig.java @@ -9,23 +9,23 @@ import com.powsybl.commons.config.ModuleConfig; import com.powsybl.commons.config.PlatformConfig; -import com.powsybl.dynawaltz.DynaWaltzConfig; +import com.powsybl.dynawo.DynawoSimulationConfig; import java.nio.file.Path; /** * @author Laurent Issertial */ -public class DynawoAlgorithmsConfig extends DynaWaltzConfig { +public class DynawoAlgorithmsConfig extends DynawoSimulationConfig { public static final String DYNAWO_ALGORITHMS_LAUNCHER_PROGRAM_NAME = "dynawo-algorithms"; public static DynawoAlgorithmsConfig load() { - return load(DynawoAlgorithmsConfig::new, DYNAWALTZ_MODULE_NAME); + return load(DynawoAlgorithmsConfig::new, DYNAWO_MODULE_NAME); } public static DynawoAlgorithmsConfig load(PlatformConfig platformConfig) { - return load(DynawoAlgorithmsConfig::new, DYNAWALTZ_MODULE_NAME, platformConfig); + return load(DynawoAlgorithmsConfig::new, DYNAWO_MODULE_NAME, platformConfig); } public DynawoAlgorithmsConfig(Path homeDir, boolean debug) { diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisHandler.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisHandler.java index 91f2bc0cf..aedb25440 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisHandler.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisHandler.java @@ -14,10 +14,10 @@ import com.powsybl.computation.CommandExecution; import com.powsybl.computation.ExecutionReport; import com.powsybl.dynaflow.ContingencyResultsUtils; -import com.powsybl.dynawaltz.xml.DydXml; -import com.powsybl.dynawaltz.xml.DynaWaltzConstants; -import com.powsybl.dynawaltz.xml.JobsXml; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.xml.DydXml; +import com.powsybl.dynawo.xml.DynawoSimulationConstants; +import com.powsybl.dynawo.xml.JobsXml; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.dynawo.commons.DynawoConstants; import com.powsybl.dynawo.commons.DynawoUtil; import com.powsybl.dynawo.commons.NetworkResultsUpdater; @@ -40,8 +40,8 @@ import java.util.List; import static com.powsybl.dynaflow.SecurityAnalysisConstants.DYNAWO_CONSTRAINTS_FOLDER; -import static com.powsybl.dynawaltz.DynaWaltzConstants.FINAL_STATE_FOLDER; -import static com.powsybl.dynawaltz.DynaWaltzConstants.OUTPUTS_FOLDER; +import static com.powsybl.dynawo.DynawoSimulationConstants.FINAL_STATE_FOLDER; +import static com.powsybl.dynawo.DynawoSimulationConstants.OUTPUTS_FOLDER; import static com.powsybl.dynawo.commons.DynawoConstants.DYNAWO_TIMELINE_FOLDER; import static com.powsybl.dynawo.commons.DynawoUtil.getCommandExecutions; @@ -85,7 +85,7 @@ public SecurityAnalysisReport after(Path workingDir, ExecutionReport report) thr context.getNetwork().getVariantManager().setWorkingVariant(context.getWorkingVariantId()); Path outputNetworkFile = workingDir.resolve(OUTPUTS_FOLDER).resolve(FINAL_STATE_FOLDER).resolve(DynawoConstants.OUTPUT_IIDM_FILENAME); if (Files.exists(outputNetworkFile)) { - NetworkResultsUpdater.update(context.getNetwork(), NetworkSerDe.read(outputNetworkFile), context.getDynaWaltzParameters().isMergeLoads()); + NetworkResultsUpdater.update(context.getNetwork(), NetworkSerDe.read(outputNetworkFile), context.getDynawoSimulationParameters().isMergeLoads()); } ContingencyResultsUtils.reportContingenciesTimelines(context.getContingencies(), workingDir.resolve(DYNAWO_TIMELINE_FOLDER), reportNode); @@ -99,7 +99,7 @@ public SecurityAnalysisReport after(Path workingDir, ExecutionReport report) thr private void writeInputFiles(Path workingDir) { try { - DynawoUtil.writeIidm(network, workingDir.resolve(DynaWaltzConstants.NETWORK_FILENAME)); + DynawoUtil.writeIidm(network, workingDir.resolve(DynawoSimulationConstants.NETWORK_FILENAME)); JobsXml.write(workingDir, context); DydXml.write(workingDir, context); ParametersXml.write(workingDir, context); diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisProvider.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisProvider.java index a6fe958ed..14e336a9f 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisProvider.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/DynawoSecurityAnalysisProvider.java @@ -16,10 +16,10 @@ import com.powsybl.contingency.ContingenciesProvider; import com.powsybl.contingency.Contingency; import com.powsybl.dynamicsimulation.DynamicModelsSupplier; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.models.utils.BlackBoxSupplierUtils; -import com.powsybl.dynawaltz.xml.DynaWaltzConstants; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.models.utils.BlackBoxSupplierUtils; +import com.powsybl.dynawo.xml.DynawoSimulationConstants; import com.powsybl.dynawo.commons.DynawoUtil; import com.powsybl.dynawo.commons.PowsyblDynawoVersion; import com.powsybl.iidm.network.Network; @@ -36,7 +36,7 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import static com.powsybl.dynawaltz.DynaWaltzConfig.DYNAWALTZ_LAUNCHER_PROGRAM_NAME; +import static com.powsybl.dynawo.DynawoSimulationConfig.DYNAWO_LAUNCHER_PROGRAM_NAME; /** * @author Laurent Issertial @@ -45,7 +45,7 @@ public class DynawoSecurityAnalysisProvider implements DynamicSecurityAnalysisProvider { private static final Logger LOGGER = LoggerFactory.getLogger(DynawoSecurityAnalysisProvider.class); - private static final String WORKING_DIR_PREFIX = "dynawaltz_sa_"; + private static final String WORKING_DIR_PREFIX = "dynawo_sa_"; private final DynawoAlgorithmsConfig config; public DynawoSecurityAnalysisProvider() { @@ -79,13 +79,13 @@ public CompletableFuture run(Network network, String wor ReportNode dsaReportNode = DynamicSecurityAnalysisReports.createDynamicSecurityAnalysisReportNode(runParameters.getReportNode(), network.getId()); network.getVariantManager().setWorkingVariant(workingVariantId); ExecutionEnvironment execEnv = new ExecutionEnvironment(Collections.emptyMap(), WORKING_DIR_PREFIX, config.isDebug()); - DynawoUtil.requireDynaMinVersion(execEnv, runParameters.getComputationManager(), getVersionCommand(config), DYNAWALTZ_LAUNCHER_PROGRAM_NAME, false); + DynawoUtil.requireDynaMinVersion(execEnv, runParameters.getComputationManager(), getVersionCommand(config), DYNAWO_LAUNCHER_PROGRAM_NAME, false); List contingencies = contingenciesProvider.getContingencies(network); DynamicSecurityAnalysisParameters parameters = runParameters.getDynamicSecurityAnalysisParameters(); SecurityAnalysisContext context = new SecurityAnalysisContext(network, workingVariantId, BlackBoxSupplierUtils.getBlackBoxModelList(dynamicModelsSupplier, network, dsaReportNode), parameters, - DynaWaltzParameters.load(parameters.getDynamicSimulationParameters()), + DynawoSimulationParameters.load(parameters.getDynamicSimulationParameters()), contingencies); return runParameters.getComputationManager().execute(execEnv, new DynawoSecurityAnalysisHandler(context, getCommand(config), runParameters.getFilter(), runParameters.getInterceptors(), dsaReportNode)); @@ -93,7 +93,7 @@ public CompletableFuture run(Network network, String wor @Override public String getName() { - return DynaWaltzProvider.NAME; + return DynawoSimulationProvider.NAME; } @Override @@ -104,8 +104,8 @@ public String getVersion() { public static Command getCommand(DynawoAlgorithmsConfig config) { List args = Arrays.asList( "SA", - "--input", DynaWaltzConstants.MULTIPLE_JOBS_FILENAME, - "--output", DynaWaltzConstants.AGGREGATED_RESULTS); + "--input", DynawoSimulationConstants.MULTIPLE_JOBS_FILENAME, + "--output", DynawoSimulationConstants.AGGREGATED_RESULTS); return new SimpleCommandBuilder() .id("dynawo_dynamic_sa") .program(config.getProgram()) diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/SecurityAnalysisContext.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/SecurityAnalysisContext.java index 70f00f0ef..263faf9cb 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/SecurityAnalysisContext.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/SecurityAnalysisContext.java @@ -10,14 +10,14 @@ import com.powsybl.commons.PowsyblException; import com.powsybl.contingency.Contingency; import com.powsybl.contingency.ContingencyElement; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.events.ContextDependentEvent; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnect; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnector; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.events.ContextDependentEvent; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.macroconnections.MacroConnect; +import com.powsybl.dynawo.models.macroconnections.MacroConnector; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.Network; import com.powsybl.security.dynamic.DynamicSecurityAnalysisParameters; @@ -27,7 +27,7 @@ /** * @author Laurent Issertial */ -public class SecurityAnalysisContext extends DynaWaltzContext { +public class SecurityAnalysisContext extends DynawoSimulationContext { private final List contingencies; private final List contingencyEventModels; @@ -35,10 +35,10 @@ public class SecurityAnalysisContext extends DynaWaltzContext { public SecurityAnalysisContext(Network network, String workingVariantId, List dynamicModels, DynamicSecurityAnalysisParameters parameters, - DynaWaltzParameters dynaWaltzParameters, + DynawoSimulationParameters dynawoSimulationParameters, List contingencies) { super(network, workingVariantId, dynamicModels, List.of(), Collections.emptyList(), - parameters.getDynamicSimulationParameters(), dynaWaltzParameters); + parameters.getDynamicSimulationParameters(), dynawoSimulationParameters); double contingenciesStartTime = parameters.getDynamicContingenciesParameters().getContingenciesStartTime(); this.contingencies = contingencies; this.contingencyEventModels = contingencies.stream() diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesDydXml.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesDydXml.java index 9209bc6b6..1d1239bb6 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesDydXml.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesDydXml.java @@ -7,10 +7,10 @@ */ package com.powsybl.dynawo.security.xml; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnect; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnector; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnect; +import com.powsybl.dynawo.models.macroconnections.MacroConnector; import com.powsybl.dynawo.security.ContingencyEventModels; import com.powsybl.dynawo.security.SecurityAnalysisContext; @@ -36,7 +36,7 @@ public static void write(Path workingDir, SecurityAnalysisContext context) throw } } - private static void writeEvent(XMLStreamWriter writer, DynaWaltzContext context, ContingencyEventModels model) throws XMLStreamException { + private static void writeEvent(XMLStreamWriter writer, DynawoSimulationContext context, ContingencyEventModels model) throws XMLStreamException { for (BlackBoxModel ev : model.eventModels()) { ev.write(writer, ContingenciesParXml.createParFileName(model)); } diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesParXml.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesParXml.java index 6516d0c01..985dd81b1 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesParXml.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/ContingenciesParXml.java @@ -7,14 +7,14 @@ */ package com.powsybl.dynawo.security.xml; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.dynawo.security.ContingencyEventModels; import com.powsybl.dynawo.security.SecurityAnalysisContext; import java.nio.file.Path; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_PREFIX; /** * @author Laurent Issertial diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/MultipleJobsXml.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/MultipleJobsXml.java index da429a7cd..892c8ebbf 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/MultipleJobsXml.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/MultipleJobsXml.java @@ -16,8 +16,8 @@ import java.nio.file.Path; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.JOBS_FILENAME; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.MULTIPLE_JOBS_FILENAME; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.JOBS_FILENAME; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.MULTIPLE_JOBS_FILENAME; /** * @author Laurent Issertial diff --git a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/XmlUtil.java b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/XmlUtil.java index 04c74f928..ba94242b3 100644 --- a/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/XmlUtil.java +++ b/dynawo-security-analysis/src/main/java/com/powsybl/dynawo/security/xml/XmlUtil.java @@ -7,7 +7,7 @@ */ package com.powsybl.dynawo.security.xml; -import com.powsybl.dynawaltz.xml.XmlStreamWriterFactory; +import com.powsybl.dynawo.xml.XmlStreamWriterFactory; import com.powsybl.dynawo.security.ContingencyEventModels; import com.powsybl.dynawo.security.SecurityAnalysisContext; @@ -20,8 +20,8 @@ import java.nio.file.Path; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_PREFIX; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Laurent Issertial @@ -29,23 +29,23 @@ public final class XmlUtil { @FunctionalInterface - public interface XmlDynawaltzContingenciesWriter { - void writeContingencies(XMLStreamWriter writer, SecurityAnalysisContext dynaWaltzContext) throws XMLStreamException; + public interface XmlDynawoContingenciesWriter { + void writeContingencies(XMLStreamWriter writer, SecurityAnalysisContext context) throws XMLStreamException; } @FunctionalInterface - public interface XmlDynawaltzEventWriter { - void writeEvent(XMLStreamWriter writer, SecurityAnalysisContext dynaWaltzContext, ContingencyEventModels model) throws XMLStreamException; + public interface XmlDynawoEventWriter { + void writeEvent(XMLStreamWriter writer, SecurityAnalysisContext context, ContingencyEventModels model) throws XMLStreamException; } private XmlUtil() { } - public static void write(Path file, SecurityAnalysisContext context, String elementName, XmlDynawaltzEventWriter xmlDynawaltzEventWriter, ContingencyEventModels model) throws IOException, XMLStreamException { + public static void write(Path file, SecurityAnalysisContext context, String elementName, XmlDynawoEventWriter xmlDynawoEventWriter, ContingencyEventModels model) throws IOException, XMLStreamException { Objects.requireNonNull(file); Objects.requireNonNull(context); Objects.requireNonNull(elementName); - Objects.requireNonNull(xmlDynawaltzEventWriter); + Objects.requireNonNull(xmlDynawoEventWriter); try (Writer writer = Files.newBufferedWriter(file, StandardCharsets.UTF_8)) { XMLStreamWriter xmlWriter = XmlStreamWriterFactory.newInstance(writer); @@ -55,7 +55,7 @@ public static void write(Path file, SecurityAnalysisContext context, String elem xmlWriter.writeStartElement(DYN_URI, elementName); xmlWriter.writeNamespace(DYN_PREFIX, DYN_URI); - xmlDynawaltzEventWriter.writeEvent(xmlWriter, context, model); + xmlDynawoEventWriter.writeEvent(xmlWriter, context, model); xmlWriter.writeEndElement(); xmlWriter.writeEndDocument(); @@ -65,11 +65,11 @@ public static void write(Path file, SecurityAnalysisContext context, String elem } } - public static void write(Path file, SecurityAnalysisContext context, String elementName, XmlDynawaltzContingenciesWriter xmlDynawaltzWriter) throws IOException, XMLStreamException { + public static void write(Path file, SecurityAnalysisContext context, String elementName, XmlDynawoContingenciesWriter xmlDynawoWriter) throws IOException, XMLStreamException { Objects.requireNonNull(file); Objects.requireNonNull(context); Objects.requireNonNull(elementName); - Objects.requireNonNull(xmlDynawaltzWriter); + Objects.requireNonNull(xmlDynawoWriter); try (Writer writer = Files.newBufferedWriter(file, StandardCharsets.UTF_8)) { XMLStreamWriter xmlWriter = XmlStreamWriterFactory.newInstance(writer); @@ -78,7 +78,7 @@ public static void write(Path file, SecurityAnalysisContext context, String elem xmlWriter.writeStartElement(elementName); xmlWriter.writeNamespace("", DYN_URI); - xmlDynawaltzWriter.writeContingencies(xmlWriter, context); + xmlDynawoWriter.writeContingencies(xmlWriter, context); xmlWriter.writeEndElement(); xmlWriter.writeEndDocument(); diff --git a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfigTest.java b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfigTest.java index d7e1e633d..939abbc89 100644 --- a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfigTest.java +++ b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/DynawoAlgorithmsConfigTest.java @@ -43,7 +43,7 @@ void checkConfig() { String homeDir = "homeDir"; boolean debug = true; - MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawaltz"); + MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawo"); moduleConfig.setStringProperty("homeDir", homeDir); moduleConfig.setStringProperty("debug", Boolean.toString(debug)); DynawoAlgorithmsConfig config = DynawoAlgorithmsConfig.load(platformConfig); diff --git a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/ContingenciesXmlTest.java b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/ContingenciesXmlTest.java index 55cde9df9..39a44c951 100644 --- a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/ContingenciesXmlTest.java +++ b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/ContingenciesXmlTest.java @@ -9,9 +9,9 @@ import com.powsybl.contingency.Contingency; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.xml.DynawoTestUtil; +import com.powsybl.dynawo.DynawoSimulationParameters; import com.powsybl.dynawo.security.SecurityAnalysisContext; -import com.powsybl.dynawaltz.xml.DynaWaltzTestUtil; import com.powsybl.security.dynamic.DynamicSecurityAnalysisParameters; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -23,21 +23,21 @@ /** * @author Laurent Issertial */ -class ContingenciesXmlTest extends DynaWaltzTestUtil { +class ContingenciesXmlTest extends DynawoTestUtil { @Test void writeDyds() throws SAXException, IOException, XMLStreamException { DynamicSecurityAnalysisParameters parameters = DynamicSecurityAnalysisParameters.load(); parameters.setDynamicSimulationParameters(new DynamicSimulationParameters(0, 20)); parameters.setDynamicContingenciesParameters(new DynamicSecurityAnalysisParameters.ContingenciesParameters(10)); - DynaWaltzParameters dynawaltzParameters = DynaWaltzParameters.load(); + DynawoSimulationParameters dynawoSimulationParameters = DynawoSimulationParameters.load(); List contingencies = List.of( Contingency.load("LOAD"), Contingency.builder("DisconnectLineGenerator") .addLine("NHV1_NHV2_1") .addGenerator("GEN2") .build()); - SecurityAnalysisContext context = new SecurityAnalysisContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, parameters, dynawaltzParameters, contingencies); + SecurityAnalysisContext context = new SecurityAnalysisContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, parameters, dynawoSimulationParameters, contingencies); ContingenciesDydXml.write(tmpDir, context); ContingenciesParXml.write(tmpDir, context); diff --git a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/MultiplesJobsXmlTest.java b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/MultiplesJobsXmlTest.java index 8b8872ff4..91c35df11 100644 --- a/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/MultiplesJobsXmlTest.java +++ b/dynawo-security-analysis/src/test/java/com/powsybl/dynawo/security/xml/MultiplesJobsXmlTest.java @@ -8,10 +8,10 @@ package com.powsybl.dynawo.security.xml; import com.powsybl.contingency.Contingency; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DynawoSimulationParameters; import com.powsybl.dynawo.security.SecurityAnalysisContext; -import com.powsybl.dynawaltz.xml.DynaWaltzConstants; -import com.powsybl.dynawaltz.xml.DynaWaltzTestUtil; +import com.powsybl.dynawo.xml.DynawoSimulationConstants; +import com.powsybl.dynawo.xml.DynawoTestUtil; import com.powsybl.security.dynamic.DynamicSecurityAnalysisParameters; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -23,22 +23,22 @@ /** * @author Laurent Issertial */ -class MultiplesJobsXmlTest extends DynaWaltzTestUtil { +class MultiplesJobsXmlTest extends DynawoTestUtil { @Test void writeMultiplesJobs() throws SAXException, IOException, XMLStreamException { DynamicSecurityAnalysisParameters parameters = DynamicSecurityAnalysisParameters.load(); - DynaWaltzParameters dynawaltzParameters = DynaWaltzParameters.load(); + DynawoSimulationParameters dynawoSimulationParameters = DynawoSimulationParameters.load(); List contingencies = List.of( Contingency.load("LOAD"), Contingency.builder("DisconnectLineGenerator") .addLine("NHV1_NHV2_1") .addGenerator("GEN2") .build()); - SecurityAnalysisContext context = new SecurityAnalysisContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, parameters, dynawaltzParameters, contingencies); + SecurityAnalysisContext context = new SecurityAnalysisContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, parameters, dynawoSimulationParameters, contingencies); MultipleJobsXml.write(tmpDir, context); - validate("multipleJobs.xsd", "multipleJobs.xml", tmpDir.resolve(DynaWaltzConstants.MULTIPLE_JOBS_FILENAME)); + validate("multipleJobs.xsd", "multipleJobs.xml", tmpDir.resolve(DynawoSimulationConstants.MULTIPLE_JOBS_FILENAME)); } } diff --git a/dynawo-security-analysis/src/test/resources/multipleJobs.xml b/dynawo-security-analysis/src/test/resources/multipleJobs.xml index da5e3c488..1ad813292 100644 --- a/dynawo-security-analysis/src/test/resources/multipleJobs.xml +++ b/dynawo-security-analysis/src/test/resources/multipleJobs.xml @@ -1,6 +1,6 @@ - + diff --git a/dynawaltz/pom.xml b/dynawo-simulation/pom.xml similarity index 95% rename from dynawaltz/pom.xml rename to dynawo-simulation/pom.xml index 27f487f20..6f10837e2 100644 --- a/dynawaltz/pom.xml +++ b/dynawo-simulation/pom.xml @@ -16,9 +16,9 @@ 2.6.0-SNAPSHOT - powsybl-dynawaltz - DynaWaltz - DynaWaltz integration module for powsybl + powsybl-dynawo-simulation + Dynawo simulation + Dynawo simulation integration module for powsybl @@ -28,7 +28,7 @@ - com.powsybl.dynawaltz + com.powsybl.dynawo diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DumpFileParameters.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DumpFileParameters.java similarity index 99% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DumpFileParameters.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DumpFileParameters.java index 8854ddae8..dc856667d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DumpFileParameters.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DumpFileParameters.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.powsybl.commons.PowsyblException; diff --git a/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConfig.java new file mode 100644 index 000000000..63006cbb3 --- /dev/null +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConfig.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2020, 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/. + */ +package com.powsybl.dynawo; + +import com.powsybl.commons.config.ModuleConfig; +import com.powsybl.commons.config.PlatformConfig; +import com.powsybl.dynawo.commons.AbstractDynawoConfig; + +import java.nio.file.Path; + +/** + * @author Marcos de Miguel {@literal } + */ +public class DynawoSimulationConfig extends AbstractDynawoConfig { + + public static final String DYNAWO_LAUNCHER_PROGRAM_NAME = "dynawo"; + protected static final String DYNAWO_MODULE_NAME = "dynawo"; + + public static DynawoSimulationConfig load() { + return load(DynawoSimulationConfig::new, DYNAWO_MODULE_NAME); + } + + public static DynawoSimulationConfig load(PlatformConfig platformConfig) { + return load(DynawoSimulationConfig::new, DYNAWO_MODULE_NAME, platformConfig); + } + + public DynawoSimulationConfig(Path homeDir, boolean debug) { + super(homeDir, debug); + } + + protected DynawoSimulationConfig(ModuleConfig config) { + super(config); + } + + @Override + public String getProgram() { + return getProgram(DYNAWO_LAUNCHER_PROGRAM_NAME); + } +} diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConstants.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConstants.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConstants.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConstants.java index afcb6d99d..b821f29c8 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConstants.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationConstants.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; /** * @author Laurent Issertial */ -public final class DynaWaltzConstants { +public final class DynawoSimulationConstants { - private DynaWaltzConstants() { + private DynawoSimulationConstants() { } public static final String OUTPUTS_FOLDER = "outputs"; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationContext.java similarity index 78% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationContext.java index 96290715f..3eda357c6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationContext.java @@ -4,29 +4,29 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.Curve; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.curves.DynawoCurve; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.EquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.buses.AbstractBus; -import com.powsybl.dynawaltz.models.defaultmodels.DefaultModelsHandler; -import com.powsybl.dynawaltz.models.events.ContextDependentEvent; -import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizedModel; -import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizerModel; -import com.powsybl.dynawaltz.models.frequencysynchronizers.OmegaRef; -import com.powsybl.dynawaltz.models.frequencysynchronizers.SetPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnect; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnector; -import com.powsybl.dynawaltz.parameters.ParametersSet; -import com.powsybl.dynawaltz.xml.MacroStaticReference; +import com.powsybl.dynawo.curves.DynawoCurve; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.EquipmentBlackBoxModel; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.buses.AbstractBus; +import com.powsybl.dynawo.models.defaultmodels.DefaultModelsHandler; +import com.powsybl.dynawo.models.events.ContextDependentEvent; +import com.powsybl.dynawo.models.frequencysynchronizers.FrequencySynchronizedModel; +import com.powsybl.dynawo.models.frequencysynchronizers.FrequencySynchronizerModel; +import com.powsybl.dynawo.models.frequencysynchronizers.OmegaRef; +import com.powsybl.dynawo.models.frequencysynchronizers.SetPoint; +import com.powsybl.dynawo.models.macroconnections.MacroConnect; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnector; +import com.powsybl.dynawo.parameters.ParametersSet; +import com.powsybl.dynawo.xml.MacroStaticReference; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.Network; import org.slf4j.Logger; @@ -42,16 +42,16 @@ * @author Marcos de Miguel {@literal } * @author Laurent Issertial {@literal } */ -public class DynaWaltzContext { +public class DynawoSimulationContext { - protected static final Logger LOGGER = LoggerFactory.getLogger(DynaWaltzContext.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(DynawoSimulationContext.class); private static final String MODEL_ID_EXCEPTION = "The model identified by the static id %s does not match the expected model (%s)"; private static final String MODEL_ID_LOG = "The model identified by the static id {} does not match the expected model ({})"; protected final Network network; private final String workingVariantId; private final DynamicSimulationParameters parameters; - private final DynaWaltzParameters dynaWaltzParameters; + private final DynawoSimulationParameters dynawoSimulationParameters; private final List dynamicModels; private final List eventModels; private final Map staticIdBlackBoxModelMap; @@ -64,23 +64,23 @@ public class DynaWaltzContext { private final List dynamicModelsParameters = new ArrayList<>(); protected final MacroConnectionsAdder macroConnectionsAdder; - public DynaWaltzContext(Network network, String workingVariantId, List dynamicModels, List eventModels, - List curves, DynamicSimulationParameters parameters, DynaWaltzParameters dynaWaltzParameters) { - this(network, workingVariantId, dynamicModels, eventModels, curves, parameters, dynaWaltzParameters, ReportNode.NO_OP); + public DynawoSimulationContext(Network network, String workingVariantId, List dynamicModels, List eventModels, + List curves, DynamicSimulationParameters parameters, DynawoSimulationParameters dynawoSimulationParameters) { + this(network, workingVariantId, dynamicModels, eventModels, curves, parameters, dynawoSimulationParameters, ReportNode.NO_OP); } - public DynaWaltzContext(Network network, String workingVariantId, List dynamicModels, List eventModels, - List curves, DynamicSimulationParameters parameters, DynaWaltzParameters dynaWaltzParameters, ReportNode reportNode) { + public DynawoSimulationContext(Network network, String workingVariantId, List dynamicModels, List eventModels, + List curves, DynamicSimulationParameters parameters, DynawoSimulationParameters dynawoSimulationParameters, ReportNode reportNode) { - ReportNode contextReportNode = DynawaltzReports.createDynaWaltzContextReportNode(reportNode); + ReportNode contextReportNode = DynawoSimulationReports.createDynawoSimulationContextReportNode(reportNode); this.network = Objects.requireNonNull(network); this.workingVariantId = Objects.requireNonNull(workingVariantId); this.parameters = Objects.requireNonNull(parameters); - this.dynaWaltzParameters = Objects.requireNonNull(dynaWaltzParameters); + this.dynawoSimulationParameters = Objects.requireNonNull(dynawoSimulationParameters); Stream uniqueIdsDynamicModels = Objects.requireNonNull(dynamicModels).stream() .filter(distinctByDynamicId(contextReportNode).and(distinctByStaticId(contextReportNode))); - this.dynamicModels = dynaWaltzParameters.isUseModelSimplifiers() + this.dynamicModels = dynawoSimulationParameters.isUseModelSimplifiers() ? simplifyModels(uniqueIdsDynamicModels, contextReportNode).toList() : uniqueIdsDynamicModels.toList(); @@ -115,7 +115,7 @@ public DynaWaltzContext(Network network, String workingVariantId, List simplifyModels(Stream inputBbm, Rep outputBbm = outputBbm.filter(modelsSimplifier.getModelRemovalPredicate(reportNode)); } for (ModelsSubstitutionSimplifier modelsSimplifier : ServiceLoader.load(ModelsSubstitutionSimplifier.class)) { - outputBbm = outputBbm.map(modelsSimplifier.getModelSubstitutionFunction(network, dynaWaltzParameters, reportNode)) + outputBbm = outputBbm.map(modelsSimplifier.getModelSubstitutionFunction(network, dynawoSimulationParameters, reportNode)) .filter(Objects::nonNull); } return outputBbm; @@ -154,8 +154,8 @@ public DynamicSimulationParameters getParameters() { return parameters; } - public DynaWaltzParameters getDynaWaltzParameters() { - return dynaWaltzParameters; + public DynawoSimulationParameters getDynawoSimulationParameters() { + return dynawoSimulationParameters; } public Collection getMacroStaticReferences() { @@ -206,7 +206,7 @@ protected static Predicate distinctByStaticId(ReportNode reportNo Set seen = new HashSet<>(); return bbm -> { if (bbm instanceof EquipmentBlackBoxModel eBbm && !seen.add(eBbm.getStaticId())) { - DynawaltzReports.reportDuplicateStaticId(reportNode, eBbm.getStaticId(), eBbm.getLib(), eBbm.getDynamicModelId()); + DynawoSimulationReports.reportDuplicateStaticId(reportNode, eBbm.getStaticId(), eBbm.getLib(), eBbm.getDynamicModelId()); return false; } return true; @@ -217,7 +217,7 @@ protected static Predicate distinctByDynamicId(ReportNode reportN Set seen = new HashSet<>(); return bbm -> { if (!seen.add(bbm.getDynamicModelId())) { - DynawaltzReports.reportDuplicateDynamicId(reportNode, bbm.getDynamicModelId(), bbm.getName()); + DynawoSimulationReports.reportDuplicateDynamicId(reportNode, bbm.getDynamicModelId(), bbm.getName()); return false; } return true; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzHandler.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzHandler.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java index b9460d065..d0391ed6a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzHandler.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationHandler.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.report.ReportNode; import com.powsybl.computation.AbstractExecutionHandler; @@ -15,10 +15,10 @@ import com.powsybl.dynamicsimulation.DynamicSimulationResult; import com.powsybl.dynamicsimulation.DynamicSimulationResultImpl; import com.powsybl.dynamicsimulation.TimelineEvent; -import com.powsybl.dynawaltz.xml.CurvesXml; -import com.powsybl.dynawaltz.xml.DydXml; -import com.powsybl.dynawaltz.xml.JobsXml; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.xml.CurvesXml; +import com.powsybl.dynawo.xml.DydXml; +import com.powsybl.dynawo.xml.JobsXml; +import com.powsybl.dynawo.xml.ParametersXml; import com.powsybl.dynawo.commons.CommonReports; import com.powsybl.dynawo.commons.DynawoUtil; import com.powsybl.dynawo.commons.NetworkResultsUpdater; @@ -44,27 +44,27 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.powsybl.dynawaltz.DynaWaltzConstants.FINAL_STATE_FOLDER; -import static com.powsybl.dynawaltz.DynaWaltzConstants.OUTPUTS_FOLDER; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.*; +import static com.powsybl.dynawo.DynawoSimulationConstants.FINAL_STATE_FOLDER; +import static com.powsybl.dynawo.DynawoSimulationConstants.OUTPUTS_FOLDER; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.*; import static com.powsybl.dynawo.commons.DynawoConstants.DYNAWO_TIMELINE_FOLDER; import static com.powsybl.dynawo.commons.DynawoUtil.getCommandExecutions; /** * @author Laurent Issertial */ -public final class DynaWaltzHandler extends AbstractExecutionHandler { +public final class DynawoSimulationHandler extends AbstractExecutionHandler { - private static final Logger LOGGER = LoggerFactory.getLogger(DynaWaltzHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DynawoSimulationHandler.class); private static final String LOGS_FOLDER = "logs"; private static final String OUTPUT_IIDM_FILENAME = "outputIIDM.xml"; private static final String OUTPUT_DUMP_FILENAME = "outputState.dmp"; private static final String TIMELINE_FILENAME = "timeline"; - private static final String LOGS_FILENAME = "dynawaltz.log"; + private static final String LOGS_FILENAME = "dynawo.log"; private static final String ERROR_FILENAME = "dyn_fs_0.err"; private static final String DYNAWO_ERROR_PATTERN = "DYN Error: "; - private final DynaWaltzContext context; + private final DynawoSimulationContext context; private final Command command; private final Network dynawoInput; private final ReportNode reportNode; @@ -74,9 +74,9 @@ public final class DynaWaltzHandler extends AbstractExecutionHandler specificLogs) throws IOException { + private void setDynawoLog(Path outputsFolder, Set specificLogs) throws IOException { Path logFolder = outputsFolder.resolve(LOGS_FOLDER); if (Files.exists(logFolder)) { Path logFile = logFolder.resolve(LOGS_FILENAME); @@ -142,11 +142,11 @@ private void setDynawoLog(Path outputsFolder, Set CommonReports.reportLogEntry(logReportNode, e)); } - for (DynaWaltzParameters.SpecificLog specificLog : specificLogs) { + for (DynawoSimulationParameters.SpecificLog specificLog : specificLogs) { Path specificLogFile = logFolder.resolve(specificLog.getFileName()); if (Files.exists(specificLogFile)) { - ReportNode logReport = DynawaltzReports.createDynawoSpecificLogReportNode(reportNode, specificLog); - DynawaltzReports.reportSpecificLogEntry(logReport, Files.readString(specificLogFile)); + ReportNode logReport = DynawoSimulationReports.createDynawoSpecificLogReportNode(reportNode, specificLog); + DynawoSimulationReports.reportSpecificLogEntry(logReport, Files.readString(specificLogFile)); } } } else { @@ -157,7 +157,7 @@ private void setDynawoLog(Path outputsFolder, Set} * @author Florian Dupuy {@literal } */ -public class DynaWaltzParameters extends AbstractExtension { +public class DynawoSimulationParameters extends AbstractExtension { public static final SolverType DEFAULT_SOLVER_TYPE = SolverType.SIM; public static final String DEFAULT_NETWORK_PAR_ID = "1"; @@ -117,20 +117,20 @@ public String getFileName() { /** * Loads parameters from the default platform configuration. */ - public static DynaWaltzParameters load() { + public static DynawoSimulationParameters load() { return load(PlatformConfig.defaultConfig()); } /** * Load parameters from a provided platform configuration. */ - public static DynaWaltzParameters load(PlatformConfig platformConfig) { + public static DynawoSimulationParameters load(PlatformConfig platformConfig) { return load(platformConfig, FileSystems.getDefault()); } - public static DynaWaltzParameters load(PlatformConfig platformConfig, FileSystem fileSystem) { - DynaWaltzParameters parameters = new DynaWaltzParameters(); - Optional config = platformConfig.getOptionalModuleConfig("dynawaltz-default-parameters"); + public static DynawoSimulationParameters load(PlatformConfig platformConfig, FileSystem fileSystem) { + DynawoSimulationParameters parameters = new DynawoSimulationParameters(); + Optional config = platformConfig.getOptionalModuleConfig("dynawo-simulation-default-parameters"); String parametersFile = config.flatMap(c -> c.getOptionalStringProperty("parametersFile")).orElse(DEFAULT_INPUT_PARAMETERS_FILE); String networkParametersFile = config.flatMap(c -> c.getOptionalStringProperty("network.parametersFile")).orElse(DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); @@ -163,17 +163,17 @@ private static Path resolveParameterPath(String fileName, PlatformConfig platfor return platformConfig.getConfigDir().map(configDir -> configDir.resolve(fileName)).orElse(fileSystem.getPath(fileName)); } - public static DynaWaltzParameters load(DynamicSimulationParameters parameters) { - DynaWaltzParameters dynaWaltzParameters = parameters.getExtension(DynaWaltzParameters.class); - if (dynaWaltzParameters == null) { - dynaWaltzParameters = DynaWaltzParameters.load(); + public static DynawoSimulationParameters load(DynamicSimulationParameters parameters) { + DynawoSimulationParameters dynawoSimulationParameters = parameters.getExtension(DynawoSimulationParameters.class); + if (dynawoSimulationParameters == null) { + dynawoSimulationParameters = DynawoSimulationParameters.load(); } - return dynaWaltzParameters; + return dynawoSimulationParameters; } @Override public String getName() { - return "DynaWaltzParameters"; + return "DynawoSimulationParameters"; } public void addModelParameters(ParametersSet parameterSet) { @@ -194,13 +194,13 @@ public Collection getModelParameters() { } @JsonSetter("modelsParameters") - public DynaWaltzParameters setModelsParameters(Collection parametersSets) { + public DynawoSimulationParameters setModelsParameters(Collection parametersSets) { modelsParameters = new LinkedHashMap<>(); parametersSets.forEach(parametersSet -> modelsParameters.put(parametersSet.getId(), parametersSet)); return this; } - public DynaWaltzParameters setNetworkParameters(ParametersSet networkParameters) { + public DynawoSimulationParameters setNetworkParameters(ParametersSet networkParameters) { this.networkParameters = Objects.requireNonNull(networkParameters); return this; } @@ -209,7 +209,7 @@ public ParametersSet getNetworkParameters() { return networkParameters; } - public DynaWaltzParameters setSolverParameters(ParametersSet solverParameters) { + public DynawoSimulationParameters setSolverParameters(ParametersSet solverParameters) { this.solverParameters = Objects.requireNonNull(solverParameters); return this; } @@ -218,7 +218,7 @@ public ParametersSet getSolverParameters() { return solverParameters; } - public DynaWaltzParameters setSolverType(SolverType solverType) { + public DynawoSimulationParameters setSolverType(SolverType solverType) { this.solverType = solverType; return this; } @@ -231,12 +231,12 @@ public boolean isMergeLoads() { return mergeLoads; } - public DynaWaltzParameters setMergeLoads(boolean mergeLoads) { + public DynawoSimulationParameters setMergeLoads(boolean mergeLoads) { this.mergeLoads = mergeLoads; return this; } - public DynaWaltzParameters setWriteFinalState(boolean writeFinalState) { + public DynawoSimulationParameters setWriteFinalState(boolean writeFinalState) { this.writeFinalState = writeFinalState; return this; } @@ -249,7 +249,7 @@ public boolean isUseModelSimplifiers() { return useModelSimplifiers; } - public DynaWaltzParameters setUseModelSimplifiers(boolean useModelSimplifiers) { + public DynawoSimulationParameters setUseModelSimplifiers(boolean useModelSimplifiers) { this.useModelSimplifiers = useModelSimplifiers; return this; } @@ -258,7 +258,7 @@ public DumpFileParameters getDumpFileParameters() { return dumpFileParameters; } - public DynaWaltzParameters setDumpFileParameters(DumpFileParameters dumpFileParameters) { + public DynawoSimulationParameters setDumpFileParameters(DumpFileParameters dumpFileParameters) { this.dumpFileParameters = dumpFileParameters; return this; } @@ -267,7 +267,7 @@ public double getPrecision() { return precision; } - public DynaWaltzParameters setPrecision(double precision) { + public DynawoSimulationParameters setPrecision(double precision) { this.precision = precision; return this; } @@ -276,7 +276,7 @@ public ExportMode getTimelineExportMode() { return timelineExportMode; } - public DynaWaltzParameters setTimelineExportMode(ExportMode timelineExportMode) { + public DynawoSimulationParameters setTimelineExportMode(ExportMode timelineExportMode) { this.timelineExportMode = timelineExportMode; return this; } @@ -285,7 +285,7 @@ public LogLevel getLogLevelFilter() { return logLevelFilter; } - public DynaWaltzParameters setLogLevelFilter(LogLevel logLevelFilter) { + public DynawoSimulationParameters setLogLevelFilter(LogLevel logLevelFilter) { this.logLevelFilter = logLevelFilter; return this; } @@ -294,12 +294,12 @@ public Set getSpecificLogs() { return specificLogs; } - public DynaWaltzParameters setSpecificLogs(Set specificLogs) { + public DynawoSimulationParameters setSpecificLogs(Set specificLogs) { this.specificLogs = EnumSet.copyOf(specificLogs); return this; } - public DynaWaltzParameters addSpecificLog(SpecificLog specificLog) { + public DynawoSimulationParameters addSpecificLog(SpecificLog specificLog) { specificLogs.add(specificLog); return this; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzProvider.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationProvider.java similarity index 66% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzProvider.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationProvider.java index c56441966..4068d6a4d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzProvider.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationProvider.java @@ -4,14 +4,14 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.google.auto.service.AutoService; import com.powsybl.commons.config.PlatformConfig; import com.powsybl.commons.report.ReportNode; import com.powsybl.computation.*; import com.powsybl.dynamicsimulation.*; -import com.powsybl.dynawaltz.models.utils.BlackBoxSupplierUtils; +import com.powsybl.dynawo.models.utils.BlackBoxSupplierUtils; import com.powsybl.dynawo.commons.DynawoUtil; import com.powsybl.dynawo.commons.PowsyblDynawoVersion; import com.powsybl.iidm.network.Network; @@ -21,28 +21,28 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.JOBS_FILENAME; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.JOBS_FILENAME; /** * @author Marcos de Miguel {@literal } */ @AutoService(DynamicSimulationProvider.class) -public class DynaWaltzProvider implements DynamicSimulationProvider { +public class DynawoSimulationProvider implements DynamicSimulationProvider { - public static final String NAME = "DynaWaltz"; - private static final String WORKING_DIR_PREFIX = "powsybl_dynawaltz_"; + public static final String NAME = "Dynawo"; + private static final String WORKING_DIR_PREFIX = "dynawo_"; - private final DynaWaltzConfig config; + private final DynawoSimulationConfig config; - public DynaWaltzProvider() { + public DynawoSimulationProvider() { this(PlatformConfig.defaultConfig()); } - public DynaWaltzProvider(PlatformConfig platformConfig) { - this(DynaWaltzConfig.load(platformConfig)); + public DynawoSimulationProvider(PlatformConfig platformConfig) { + this(DynawoSimulationConfig.load(platformConfig)); } - public DynaWaltzProvider(DynaWaltzConfig config) { + public DynawoSimulationProvider(DynawoSimulationConfig config) { this.config = Objects.requireNonNull(config); } @@ -56,21 +56,21 @@ public String getVersion() { return new PowsyblDynawoVersion().getMavenProjectVersion(); } - public static Command getCommand(DynaWaltzConfig dynaWaltzConfig) { + public static Command getCommand(DynawoSimulationConfig dynawoSimulationConfig) { return new GroupCommandBuilder() .id("dyn_fs") .subCommand() - .program(dynaWaltzConfig.getProgram()) + .program(dynawoSimulationConfig.getProgram()) .args("jobs", JOBS_FILENAME) .add() .build(); } - public static Command getVersionCommand(DynaWaltzConfig dynaWaltzConfig) { + public static Command getVersionCommand(DynawoSimulationConfig dynawoSimulationConfig) { List args = Collections.singletonList("version"); return new SimpleCommandBuilder() .id("dynawo_version") - .program(dynaWaltzConfig.getProgram()) + .program(dynawoSimulationConfig.getProgram()) .args(args) .build(); } @@ -85,18 +85,18 @@ public CompletableFuture run(Network network, DynamicMo Objects.requireNonNull(parameters); Objects.requireNonNull(reportNode); - ReportNode dsReportNode = DynawaltzReports.createDynaWaltzReportNode(reportNode, network.getId()); + ReportNode dsReportNode = DynawoSimulationReports.createDynawoSimulationReportNode(reportNode, network.getId()); network.getVariantManager().setWorkingVariant(workingVariantId); ExecutionEnvironment execEnv = new ExecutionEnvironment(Collections.emptyMap(), WORKING_DIR_PREFIX, config.isDebug()); - DynawoUtil.requireDynaMinVersion(execEnv, computationManager, getVersionCommand(config), DynaWaltzConfig.DYNAWALTZ_LAUNCHER_PROGRAM_NAME, false); - DynaWaltzContext context = new DynaWaltzContext(network, workingVariantId, + DynawoUtil.requireDynaMinVersion(execEnv, computationManager, getVersionCommand(config), DynawoSimulationConfig.DYNAWO_LAUNCHER_PROGRAM_NAME, false); + DynawoSimulationContext context = new DynawoSimulationContext(network, workingVariantId, BlackBoxSupplierUtils.getBlackBoxModelList(dynamicModelsSupplier, network, dsReportNode), BlackBoxSupplierUtils.getBlackBoxModelList(eventModelsSupplier, network, dsReportNode), curvesSupplier.get(network), parameters, - DynaWaltzParameters.load(parameters), + DynawoSimulationParameters.load(parameters), reportNode); - return computationManager.execute(execEnv, new DynaWaltzHandler(context, getCommand(config), reportNode)); + return computationManager.execute(execEnv, new DynawoSimulationHandler(context, getCommand(config), reportNode)); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynawaltzReports.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationReports.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/DynawaltzReports.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationReports.java index b5d1c3128..2ca46361f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynawaltzReports.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/DynawoSimulationReports.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.report.TypedValue; @@ -14,21 +14,23 @@ /** * @author Laurent Issertial {@literal } */ -public final class DynawaltzReports { +public final class DynawoSimulationReports { - private DynawaltzReports() { + private static final String DYNAMIC_ID_FIELD = "dynamicId"; + + private DynawoSimulationReports() { } - public static ReportNode createDynaWaltzReportNode(ReportNode reportNode, String networkId) { + public static ReportNode createDynawoSimulationReportNode(ReportNode reportNode, String networkId) { return reportNode.newReportNode() - .withMessageTemplate("dynawaltz", "Dynawaltz dynamic simulation on network '${networkId}'") + .withMessageTemplate("dynawoSimulation", "Dynawo dynamic simulation on network '${networkId}'") .withUntypedValue("networkId", networkId) .add(); } - public static ReportNode createDynaWaltzContextReportNode(ReportNode reportNode) { + public static ReportNode createDynawoSimulationContextReportNode(ReportNode reportNode) { return reportNode.newReportNode() - .withMessageTemplate("dynawaltzContext", "Dynawaltz models processing") + .withMessageTemplate("dynawoSimulationContext", "Dynawo models processing") .add(); } @@ -37,7 +39,7 @@ public static void reportDuplicateStaticId(ReportNode reportNode, String duplica .withMessageTemplate("duplicateStaticId", "Duplicate static id found: ${duplicateId} -> model ${modelName} ${dynamicId} will be skipped") .withUntypedValue("duplicateId", duplicateId) .withUntypedValue("modelName", modelName) - .withUntypedValue("dynamicId", dynamicId) + .withUntypedValue(DYNAMIC_ID_FIELD, dynamicId) .withSeverity(TypedValue.WARN_SEVERITY) .add(); } @@ -57,7 +59,7 @@ public static void reportEmptyAutomaton(ReportNode reportNode, String automatonN .withMessageTemplate("emptyAutomaton", "${automatonName} ${dynamicId} equipment ${equipmentId} is not a ${expectedModels}, the automation system will be skipped") .withUntypedValue("automatonName", automatonName) - .withUntypedValue("dynamicId", dynamicId) + .withUntypedValue(DYNAMIC_ID_FIELD, dynamicId) .withUntypedValue("equipmentId", equipmentId) .withUntypedValue("expectedModels", expectedModels) .withSeverity(TypedValue.WARN_SEVERITY) @@ -69,13 +71,13 @@ public static void reportEmptyListAutomaton(ReportNode reportNode, String automa .withMessageTemplate("emptyListAutomaton", "None of ${automatonName} ${dynamicId} equipments are ${expectedModels}, the automation system will be skipped") .withUntypedValue("automatonName", automatonName) - .withUntypedValue("dynamicId", dynamicId) + .withUntypedValue(DYNAMIC_ID_FIELD, dynamicId) .withUntypedValue("expectedModels", expectedModels) .withSeverity(TypedValue.WARN_SEVERITY) .add(); } - public static ReportNode createDynawoSpecificLogReportNode(ReportNode reportNode, DynaWaltzParameters.SpecificLog logType) { + public static ReportNode createDynawoSpecificLogReportNode(ReportNode reportNode, DynawoSimulationParameters.SpecificLog logType) { String logTypeName = StringUtils.capitalize(logType.toString().toLowerCase()); return reportNode.newReportNode() .withMessageTemplate("dynawo" + logTypeName + "Log", logTypeName + " log") diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsRemovalSimplifier.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsRemovalSimplifier.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsRemovalSimplifier.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsRemovalSimplifier.java index 13ba309b6..4de88a573 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsRemovalSimplifier.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsRemovalSimplifier.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.BlackBoxModel; import java.util.function.Predicate; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsSubstitutionSimplifier.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsSubstitutionSimplifier.java similarity index 77% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsSubstitutionSimplifier.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsSubstitutionSimplifier.java index 78ea58fe7..de4c691fa 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/ModelsSubstitutionSimplifier.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/ModelsSubstitutionSimplifier.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import java.util.function.Function; @@ -18,5 +18,5 @@ */ public interface ModelsSubstitutionSimplifier { - Function getModelSubstitutionFunction(Network network, DynaWaltzParameters dynaWaltzParameters, ReportNode reportNode); + Function getModelSubstitutionFunction(Network network, DynawoSimulationParameters dynawoSimulationParameters, ReportNode reportNode); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractDynamicModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractDynamicModelBuilder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractDynamicModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractDynamicModelBuilder.java index ff1a62574..33e553ca5 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractDynamicModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractDynamicModelBuilder.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractEquipmentModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractEquipmentModelBuilder.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractEquipmentModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractEquipmentModelBuilder.java index 57319bce7..c52cbfbae 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/AbstractEquipmentModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/AbstractEquipmentModelBuilder.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderConfig.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderConfig.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderConfig.java index f541be2e6..decbd4057 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderConfig.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderConfig.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModel; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipment.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipment.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipment.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipment.java index fa6e6452a..210b26f2f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipment.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipment.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipmentsList.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipmentsList.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipmentsList.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipmentsList.java index 5adcc74ee..665b02e5b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderEquipmentsList.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderEquipmentsList.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderIdListEquipmentList.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderIdListEquipmentList.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderIdListEquipmentList.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderIdListEquipmentList.java index 01071cbb1..ad746b184 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderIdListEquipmentList.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderIdListEquipmentList.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderReports.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderReports.java index e2b482857..e3a408961 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuilderReports.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuilderReports.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.report.TypedValue; @@ -17,6 +17,7 @@ public final class BuilderReports { private static final String FIELD_NAME = "fieldName"; + private static final String EQUIPMENT_TYPE_FIELD = "equipmentType"; private BuilderReports() { } @@ -83,7 +84,7 @@ public static void reportFieldNotSet(ReportNode reportNode, String fieldName) { public static void reportStaticIdUnknown(ReportNode reportNode, String fieldName, String staticId, String equipmentType) { reportNode.newReportNode() .withMessageTemplate("unknownStaticIdToDynamic", "'${fieldName}' field value '${staticId}' not found for equipment type(s) ${equipmentType}") - .withUntypedValue("equipmentType", equipmentType) + .withUntypedValue(EQUIPMENT_TYPE_FIELD, equipmentType) .withUntypedValue(FIELD_NAME, fieldName) .withUntypedValue("staticId", staticId) .withSeverity(TypedValue.WARN_SEVERITY) @@ -93,7 +94,7 @@ public static void reportStaticIdUnknown(ReportNode reportNode, String fieldName public static void reportDifferentNetwork(ReportNode reportNode, String fieldName, String staticId, String equipmentType) { reportNode.newReportNode() .withMessageTemplate("wrongNetwork", "'${fieldName}' field value ${equipmentType} ${staticId} does not belong to the builder network") - .withUntypedValue("equipmentType", equipmentType) + .withUntypedValue(EQUIPMENT_TYPE_FIELD, equipmentType) .withUntypedValue(FIELD_NAME, fieldName) .withUntypedValue("staticId", staticId) .withSeverity(TypedValue.WARN_SEVERITY) @@ -103,7 +104,7 @@ public static void reportDifferentNetwork(ReportNode reportNode, String fieldNam public static void reportUnknownStaticIdHandling(ReportNode reportNode, String fieldName, String staticId, String equipmentType) { reportNode.newReportNode() .withMessageTemplate("staticIdUnknown", "'${fieldName}' field value '${staticId}' not found for equipment type(s) ${equipmentType}, id will be used as pure dynamic model id") - .withUntypedValue("equipmentType", equipmentType) + .withUntypedValue(EQUIPMENT_TYPE_FIELD, equipmentType) .withUntypedValue(FIELD_NAME, fieldName).withUntypedValue("staticId", staticId) .withSeverity(TypedValue.INFO_SEVERITY) .add(); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuildersUtil.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuildersUtil.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuildersUtil.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuildersUtil.java index f1b6178a6..abf527433 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/BuildersUtil.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/BuildersUtil.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.iidm.network.*; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EquipmentModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EquipmentModelBuilder.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EquipmentModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EquipmentModelBuilder.java index 97db380ed..99a3f0bee 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EquipmentModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EquipmentModelBuilder.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.dynamicsimulation.DynamicModel; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventBuilderConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventBuilderConfig.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventBuilderConfig.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventBuilderConfig.java index c829cc7af..b969a23f4 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventBuilderConfig.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventBuilderConfig.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.EventModel; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventModelInfo.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventModelInfo.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventModelInfo.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventModelInfo.java index 4e049f844..0a28bbd38 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/EventModelInfo.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/EventModelInfo.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; /** * @param name Model name diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelBuilder.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelBuilder.java index eac7f0f75..e72746d34 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelBuilder.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfig.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfig.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfig.java index 4872893ba..05a7deda8 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfig.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfig.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import java.util.List; import java.util.Objects; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoader.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoader.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoader.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoader.java index dd1a32e55..ad4af88a8 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoader.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoader.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderImpl.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoaderImpl.java similarity index 76% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderImpl.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoaderImpl.java index f5e3292ac..789910cae 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderImpl.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigLoaderImpl.java @@ -5,30 +5,30 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.google.auto.service.AutoService; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.UnderVoltageAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.buses.InfiniteBusBuilder; -import com.powsybl.dynawaltz.models.buses.StandardBusBuilder; -import com.powsybl.dynawaltz.models.events.EventActivePowerVariationBuilder; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.events.NodeFaultEventBuilder; -import com.powsybl.dynawaltz.models.generators.*; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; -import com.powsybl.dynawaltz.models.lines.LineBuilder; -import com.powsybl.dynawaltz.models.loads.*; -import com.powsybl.dynawaltz.models.shunts.BaseShuntBuilder; -import com.powsybl.dynawaltz.models.svarcs.BaseStaticVarCompensatorBuilder; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.UnderVoltageAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; +import com.powsybl.dynawo.models.buses.InfiniteBusBuilder; +import com.powsybl.dynawo.models.buses.StandardBusBuilder; +import com.powsybl.dynawo.models.events.EventActivePowerVariationBuilder; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.events.NodeFaultEventBuilder; +import com.powsybl.dynawo.models.generators.*; +import com.powsybl.dynawo.models.loads.*; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.lines.LineBuilder; +import com.powsybl.dynawo.models.shunts.BaseShuntBuilder; +import com.powsybl.dynawo.models.svarcs.BaseStaticVarCompensatorBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; import java.util.stream.Stream; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigs.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigs.java index 8cb62b882..91f7087a0 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigs.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigs.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsHandler.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsHandler.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsHandler.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsHandler.java index 267e29f87..699af3b26 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsHandler.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsHandler.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.google.common.collect.Lists; import com.powsybl.commons.report.ReportNode; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsJsonDeserializer.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsJsonDeserializer.java index c34cdcd46..7f3986b7b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelConfigsJsonDeserializer.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelInfo.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelInfo.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelInfo.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelInfo.java index 2e6347eb6..9cfbf5a18 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelInfo.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/builders/ModelInfo.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurve.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurve.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurve.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurve.java index 82e955b0b..de9670b7b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurve.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurve.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.curves; +package com.powsybl.dynawo.curves; import com.powsybl.dynamicsimulation.Curve; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurvesBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurvesBuilder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurvesBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurvesBuilder.java index 26d9437a4..a519420f4 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/curves/DynawoCurvesBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/curves/DynawoCurvesBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.curves; +package com.powsybl.dynawo.curves; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.Curve; -import com.powsybl.dynawaltz.builders.BuilderReports; +import com.powsybl.dynawo.builders.BuilderReports; import java.util.*; import java.util.function.Consumer; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/json/DynaWaltzSimulationParametersSerializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/json/DynawoSimulationParametersSerializer.java similarity index 70% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/json/DynaWaltzSimulationParametersSerializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/json/DynawoSimulationParametersSerializer.java index e66a9ef0c..dd66df728 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/json/DynaWaltzSimulationParametersSerializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/json/DynawoSimulationParametersSerializer.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.json; +package com.powsybl.dynawo.json; import java.io.IOException; @@ -19,13 +19,13 @@ import com.powsybl.dynamicsimulation.DynamicSimulationParameters; import com.powsybl.dynamicsimulation.json.JsonDynamicSimulationParameters; import com.powsybl.dynamicsimulation.json.JsonDynamicSimulationParameters.ExtensionSerializer; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DynawoSimulationParameters; /** * @author Marcos de Miguel {@literal } */ @AutoService(ExtensionSerializer.class) -public class DynaWaltzSimulationParametersSerializer implements JsonDynamicSimulationParameters.ExtensionSerializer { +public class DynawoSimulationParametersSerializer implements JsonDynamicSimulationParameters.ExtensionSerializer { @Override public String getCategoryName() { @@ -33,13 +33,13 @@ public String getCategoryName() { } @Override - public Class getExtensionClass() { - return DynaWaltzParameters.class; + public Class getExtensionClass() { + return DynawoSimulationParameters.class; } @Override public String getExtensionName() { - return "DynaWaltzParameters"; + return "DynawoSimulationParameters"; } /** @@ -56,18 +56,18 @@ private interface SerializationSpec { private static ObjectMapper createMapper() { return JsonUtil.createObjectMapper() - .addMixIn(DynaWaltzParameters.class, SerializationSpec.class); + .addMixIn(DynawoSimulationParameters.class, SerializationSpec.class); } @Override - public void serialize(DynaWaltzParameters dynawoParameters, JsonGenerator generator, + public void serialize(DynawoSimulationParameters dynawoParameters, JsonGenerator generator, SerializerProvider provider) throws IOException { createMapper().writeValue(generator, dynawoParameters); } @Override - public DynaWaltzParameters deserialize(JsonParser parser, DeserializationContext arg1) + public DynawoSimulationParameters deserialize(JsonParser parser, DeserializationContext arg1) throws IOException { - return createMapper().readValue(parser, DynaWaltzParameters.class); + return createMapper().readValue(parser, DynawoSimulationParameters.class); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractBlackBoxModel.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractBlackBoxModel.java index dd91a7c01..b6d55d3cc 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractBlackBoxModel.java @@ -4,12 +4,12 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.parameters.ParametersSet; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -57,7 +57,7 @@ public void setParameterSetId(String parameterSetId) { } @Override - public void createDynamicModelParameters(DynaWaltzContext context, Consumer parametersAdder) { + public void createDynamicModelParameters(DynawoSimulationContext context, Consumer parametersAdder) { // method empty by default to be redefined by specific models } @@ -77,8 +77,8 @@ public List getMacroConnectToAttributes() { } @Override - public String getParFile(DynaWaltzContext context) { - return DynaWaltzParameters.MODELS_OUTPUT_PARAMETERS_FILE; + public String getParFile(DynawoSimulationContext context) { + return DynawoSimulationParameters.MODELS_OUTPUT_PARAMETERS_FILE; } @Override diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractEquipmentBlackBoxModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractEquipmentBlackBoxModel.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractEquipmentBlackBoxModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractEquipmentBlackBoxModel.java index 341d6e88b..b01c67fa6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractEquipmentBlackBoxModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractEquipmentBlackBoxModel.java @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.xml.MacroStaticReference; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.xml.MacroStaticReference; import com.powsybl.iidm.network.Identifiable; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Luma Zamarreño {@literal } @@ -41,7 +41,7 @@ public T getEquipment() { } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { write(writer, getParFile(context)); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractPureDynamicBlackBoxModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractPureDynamicBlackBoxModel.java similarity index 84% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractPureDynamicBlackBoxModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractPureDynamicBlackBoxModel.java index c22f40400..684388c1e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractPureDynamicBlackBoxModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/AbstractPureDynamicBlackBoxModel.java @@ -4,16 +4,16 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.DynaWaltzContext; +import com.powsybl.dynawo.DynawoSimulationContext; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.util.Collections; import java.util.List; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * Superclass for automation system and event black box models (model without IIDM static id) @@ -37,7 +37,7 @@ public final List getVarsMapping() { } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { write(writer, getParFile(context)); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/BlackBoxModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/BlackBoxModel.java similarity index 65% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/BlackBoxModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/BlackBoxModel.java index b651db0e7..97d5ee674 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/BlackBoxModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/BlackBoxModel.java @@ -4,12 +4,12 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.parameters.ParametersSet; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -33,13 +33,13 @@ public interface BlackBoxModel extends Model { List getMacroConnectFromAttributes(); - String getParFile(DynaWaltzContext context); + String getParFile(DynawoSimulationContext context); - void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException; + void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException; void write(XMLStreamWriter writer, String parFileName) throws XMLStreamException; - void createDynamicModelParameters(DynaWaltzContext context, Consumer parametersAdder); + void createDynamicModelParameters(DynawoSimulationContext context, Consumer parametersAdder); void createNetworkParameter(ParametersSet networkParameters); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/EquipmentBlackBoxModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/EquipmentBlackBoxModel.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/EquipmentBlackBoxModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/EquipmentBlackBoxModel.java index 0e38d9f62..0c85f560b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/EquipmentBlackBoxModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/EquipmentBlackBoxModel.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; import com.powsybl.iidm.network.Identifiable; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/InjectionModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/InjectionModel.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/InjectionModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/InjectionModel.java index 33ad9051a..cd76d6a06 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/InjectionModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/InjectionModel.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPointSuffix.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/MeasurementPointSuffix.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPointSuffix.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/MeasurementPointSuffix.java index c715f8337..2c81a82d3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPointSuffix.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/MeasurementPointSuffix.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionSuffix; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionSuffix; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/Model.java similarity index 82% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/Model.java index c11fc06b2..bbe885e59 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/Model.java @@ -4,10 +4,10 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; import com.powsybl.dynamicsimulation.DynamicModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/TransformerSide.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/TransformerSide.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/TransformerSide.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/TransformerSide.java index ca3794f8b..e5e7a58cc 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/TransformerSide.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/TransformerSide.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarConnection.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarConnection.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarConnection.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarConnection.java index 855353476..9432dc917 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarConnection.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarConnection.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; /** * @author Florian Dupuy {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarMapping.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarMapping.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarMapping.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarMapping.java index d976cd392..9b5f05f44 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/VarMapping.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/VarMapping.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; /** * @author Florian Dupuy {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/AbstractAutomationSystemModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/AbstractAutomationSystemModelBuilder.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/AbstractAutomationSystemModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/AbstractAutomationSystemModelBuilder.java index 53a691109..d2fe4f994 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/AbstractAutomationSystemModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/AbstractAutomationSystemModelBuilder.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModel; -import com.powsybl.dynawaltz.builders.AbstractDynamicModelBuilder; -import com.powsybl.dynawaltz.builders.ModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfig; -import com.powsybl.dynawaltz.builders.BuilderReports; +import com.powsybl.dynawo.builders.AbstractDynamicModelBuilder; +import com.powsybl.dynawo.builders.ModelBuilder; +import com.powsybl.dynawo.builders.ModelConfig; +import com.powsybl.dynawo.builders.BuilderReports; import com.powsybl.iidm.network.Network; import java.util.Objects; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/BranchModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/BranchModel.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/BranchModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/BranchModel.java index 23f414582..9218786e1 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/BranchModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/BranchModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import com.powsybl.iidm.network.TwoSides; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/ConnectionStatefulModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/ConnectionStatefulModel.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/ConnectionStatefulModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/ConnectionStatefulModel.java index 3e62b21d9..6d419f2cc 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/ConnectionStatefulModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/ConnectionStatefulModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; /** * Indicates the connection state of a dynamic model diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystem.java similarity index 80% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystem.java index 06a8cdbc0..91baa563f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystem.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; -import com.powsybl.dynawaltz.DynawaltzReports; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.loads.LoadWithTransformers; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.transformers.TapChangerModel; +import com.powsybl.dynawo.DynawoSimulationReports; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.loads.LoadWithTransformers; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.transformers.TapChangerModel; import com.powsybl.iidm.network.Load; import javax.xml.stream.XMLStreamException; @@ -52,7 +52,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) { boolean isSkipped = adder.createMacroConnectionsOrSkip(this, load, LoadWithTransformers.class, this::getVarConnectionsWith); if (isSkipped) { connection = ConnectionState.CANNOT_CONNECT; - DynawaltzReports.reportEmptyAutomaton(adder.getReportNode(), getName(), getDynamicModelId(), load.getId(), LoadWithTransformers.class.getSimpleName()); + DynawoSimulationReports.reportEmptyAutomaton(adder.getReportNode(), getName(), getDynamicModelId(), load.getId(), LoadWithTransformers.class.getSimpleName()); } else { connection = ConnectionState.CONNECTED; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystemBuilder.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystemBuilder.java index 7fa6efac6..62218a9bc 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerAutomationSystemBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; -import com.powsybl.dynawaltz.models.TransformerSide; +import com.powsybl.dynawo.builders.*; +import com.powsybl.dynawo.models.TransformerSide; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Load; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystem.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystem.java index a78f8a06c..9193ba972 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystem.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.DynawaltzReports; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.MeasurementPointSuffix; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.ActionConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.transformers.TapChangerModel; +import com.powsybl.dynawo.DynawoSimulationReports; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.MeasurementPointSuffix; +import com.powsybl.dynawo.models.buses.ActionConnectionPoint; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.transformers.TapChangerModel; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.IdentifiableType; @@ -86,7 +86,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) { } } else { isConnected = false; - DynawaltzReports.reportEmptyListAutomaton(adder.getReportNode(), this.getName(), getDynamicModelId(), TapChangerModel.class.getSimpleName()); + DynawoSimulationReports.reportEmptyListAutomaton(adder.getReportNode(), this.getName(), getDynamicModelId(), TapChangerModel.class.getSimpleName()); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java index 3db71cf3e..bbaf55389 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.*; import java.util.*; -import static com.powsybl.dynawaltz.builders.BuildersUtil.MEASUREMENT_POINT_TYPE; +import static com.powsybl.dynawo.builders.BuildersUtil.MEASUREMENT_POINT_TYPE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystem.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystem.java index f4bd33b07..665a8bddb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystem.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.generators.GeneratorModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.generators.GeneratorModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; import com.powsybl.iidm.network.Generator; import java.util.Arrays; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystemBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystemBuilder.java index f114e90a1..d61ba0bc5 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/UnderVoltageAutomationSystemBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems; +package com.powsybl.dynawo.models.automationsystems; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Generator; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java index 3e58043fc..436c37eba 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/AbstractOverloadManagementSystemBuilder.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.overloadmanagments; +package com.powsybl.dynawo.models.automationsystems.overloadmanagments; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.BuilderEquipment; -import com.powsybl.dynawaltz.builders.ModelConfig; -import com.powsybl.dynawaltz.builders.BuilderReports; -import com.powsybl.dynawaltz.models.automationsystems.AbstractAutomationSystemModelBuilder; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.ModelConfig; +import com.powsybl.dynawo.builders.BuilderReports; +import com.powsybl.dynawo.models.automationsystems.AbstractAutomationSystemModelBuilder; import com.powsybl.iidm.network.Branch; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java index 3b94ed32a..c779bf99f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystem.java @@ -4,13 +4,13 @@ * 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/. */ -package com.powsybl.dynawaltz.models.automationsystems.overloadmanagments; +package com.powsybl.dynawo.models.automationsystems.overloadmanagments; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.automationsystems.BranchModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.automationsystems.BranchModel; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.Branch; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java index bf036c447..ba4812ec1 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.overloadmanagments; +package com.powsybl.dynawo.models.automationsystems.overloadmanagments; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java index c3c358a03..2ce2756bb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystem.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.overloadmanagments; +package com.powsybl.dynawo.models.automationsystems.overloadmanagments; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.automationsystems.BranchModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.automationsystems.BranchModel; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.Branch; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java index 8f13079ae..4765bb691 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.overloadmanagments; +package com.powsybl.dynawo.models.automationsystems.overloadmanagments; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Branch; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java similarity index 78% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java index 3dbbb4d3c..d7409fa47 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterAutomationSystem.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.transformers.TransformerModel; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.transformers.TransformerModel; import com.powsybl.iidm.network.TwoWindingsTransformer; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java index f2a8ade9d..57a752399 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/AbstractPhaseShifterModelBuilder.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.BuilderEquipment; -import com.powsybl.dynawaltz.builders.ModelConfig; -import com.powsybl.dynawaltz.models.automationsystems.AbstractAutomationSystemModelBuilder; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.ModelConfig; +import com.powsybl.dynawo.models.automationsystems.AbstractAutomationSystemModelBuilder; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoWindingsTransformer; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java similarity index 73% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java index c55d4a412..7230382d7 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystem.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; - -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynawaltzReports; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.transformers.TransformerModel; -import com.powsybl.dynawaltz.models.utils.ImmutableLateInit; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; + +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationReports; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.transformers.TransformerModel; +import com.powsybl.dynawo.models.utils.ImmutableLateInit; import com.powsybl.iidm.network.TwoWindingsTransformer; import javax.xml.stream.XMLStreamException; @@ -40,7 +40,7 @@ public void createMacroConnections(MacroConnectionsAdder adder) { if (isConnected) { adder.createMacroConnections(this, transformer.getValue(), TransformerModel.class, this::getVarConnectionsWith); } else { - DynawaltzReports.reportEmptyAutomaton(adder.getReportNode(), getName(), getDynamicModelId(), phaseShifterIDynamicId, PhaseShifterIModel.class.getSimpleName()); + DynawoSimulationReports.reportEmptyAutomaton(adder.getReportNode(), getName(), getDynamicModelId(), phaseShifterIDynamicId, PhaseShifterIModel.class.getSimpleName()); } } @@ -54,7 +54,7 @@ protected List getVarConnectionsWith(TransformerModel connected) } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { if (isConnected) { super.write(writer, context); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java index 22ac9d2df..816ebaf2a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterBlockingIAutomationSystemBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; -import com.powsybl.dynawaltz.models.automationsystems.AbstractAutomationSystemModelBuilder; +import com.powsybl.dynawo.builders.*; +import com.powsybl.dynawo.models.automationsystems.AbstractAutomationSystemModelBuilder; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java index a91a590ab..34e266071 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystem.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.automationsystems.ConnectionStatefulModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.transformers.TransformerModel; +import com.powsybl.dynawo.models.automationsystems.ConnectionStatefulModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.transformers.TransformerModel; import com.powsybl.iidm.network.TwoWindingsTransformer; import java.util.Arrays; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java index 9dd2998d9..4fa3b05fb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIModel.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIModel.java index ae03d14da..ace78fe94 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterIModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import com.powsybl.iidm.network.TwoWindingsTransformer; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java index 0ab779fe1..e33fb4b12 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystem.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.transformers.TransformerModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.transformers.TransformerModel; import com.powsybl.iidm.network.TwoWindingsTransformer; import java.util.Arrays; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java index af7a92ca2..72873518c 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.automationsystems.phaseshifters; +package com.powsybl.dynawo.models.automationsystems.phaseshifters; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBus.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBus.java index 2a7ded14c..9c2078b0e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBus.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.EquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.EquipmentBlackBoxModel; import com.powsybl.iidm.network.Bus; import java.util.ArrayList; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBusBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBusBuilder.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBusBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBusBuilder.java index 6f6880fba..b8a5d2fde 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBusBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/AbstractBusBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.AbstractEquipmentModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfig; +import com.powsybl.dynawo.builders.AbstractEquipmentModelBuilder; +import com.powsybl.dynawo.builders.ModelConfig; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/ActionConnectionPoint.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/ActionConnectionPoint.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/ActionConnectionPoint.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/ActionConnectionPoint.java index 2a1d7ef2e..e4da98012 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/ActionConnectionPoint.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/ActionConnectionPoint.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import java.util.Optional; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/BusOfFrequencySynchronizedModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/BusOfFrequencySynchronizedModel.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/BusOfFrequencySynchronizedModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/BusOfFrequencySynchronizedModel.java index 2ea7fd412..432aa2275 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/BusOfFrequencySynchronizedModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/BusOfFrequencySynchronizedModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; /** * View of frequency synchronized equipment from the bus to which it is connected diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultActionConnectionPoint.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultActionConnectionPoint.java similarity index 90% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultActionConnectionPoint.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultActionConnectionPoint.java index 5fb5ce8ab..e3af4ef04 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultActionConnectionPoint.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultActionConnectionPoint.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel; +import com.powsybl.dynawo.models.defaultmodels.AbstractDefaultModel; import java.util.Optional; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBusOfFrequencySynchronized.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultBusOfFrequencySynchronized.java similarity index 71% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBusOfFrequencySynchronized.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultBusOfFrequencySynchronized.java index 0961168b5..1d943f099 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBusOfFrequencySynchronized.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultBusOfFrequencySynchronized.java @@ -1,8 +1,8 @@ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants; +import com.powsybl.dynawo.models.defaultmodels.AbstractDefaultModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.xml.DynawoSimulationXmlConstants; import java.util.List; @@ -27,7 +27,7 @@ public String getNumCCVarName() { @Override public List getMacroConnectToAttributes() { return List.of( - MacroConnectAttribute.of("id2", DynaWaltzXmlConstants.NETWORK), + MacroConnectAttribute.of("id2", DynawoSimulationXmlConstants.NETWORK), MacroConnectAttribute.of("name2", frequencySynchronizedStaticId) ); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultEquipmentConnectionPoint.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultEquipmentConnectionPoint.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultEquipmentConnectionPoint.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultEquipmentConnectionPoint.java index b484e431b..fa35a2235 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultEquipmentConnectionPoint.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/DefaultEquipmentConnectionPoint.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.xml.DynawoSimulationXmlConstants; import com.powsybl.iidm.network.TwoSides; import java.util.List; @@ -58,6 +58,6 @@ public Optional getSwitchOffSignalVarName(TwoSides side) { @Override public List getMacroConnectToAttributes() { - return List.of(MacroConnectAttribute.of("id2", DynaWaltzXmlConstants.NETWORK)); + return List.of(MacroConnectAttribute.of("id2", DynawoSimulationXmlConstants.NETWORK)); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/EquipmentConnectionPoint.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/EquipmentConnectionPoint.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/EquipmentConnectionPoint.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/EquipmentConnectionPoint.java index 03f2d30ec..e1c18460e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/EquipmentConnectionPoint.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/EquipmentConnectionPoint.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import com.powsybl.iidm.network.TwoSides; import java.util.Optional; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBus.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBus.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBus.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBus.java index 8753d1c4b..bed3f0087 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBus.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBus.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.iidm.network.Bus; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBusBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBusBuilder.java index 30cf99e4e..0d708a212 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/InfiniteBusBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBus.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBus.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBus.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBus.java index 3b965c7e2..7db37c03c 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBus.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBus.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.iidm.network.Bus; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBusBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBusBuilder.java index 55bf2692b..8dfae88cc 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/buses/StandardBusBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractDefaultModel.java similarity index 62% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractDefaultModel.java index b7c5c158b..b91c4cb7a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractDefaultModel.java @@ -1,8 +1,8 @@ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.xml.DynawoSimulationXmlConstants; import java.util.List; import java.util.Objects; @@ -22,7 +22,7 @@ public String getStaticId() { @Override public List getMacroConnectToAttributes() { return List.of( - MacroConnectAttribute.of("id2", DynaWaltzXmlConstants.NETWORK), + MacroConnectAttribute.of("id2", DynawoSimulationXmlConstants.NETWORK), MacroConnectAttribute.of("name2", staticId) ); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractInjectionDefaultModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractInjectionDefaultModel.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractInjectionDefaultModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractInjectionDefaultModel.java index d7362aac0..f1c6b09a2 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractInjectionDefaultModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/AbstractInjectionDefaultModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; -import com.powsybl.dynawaltz.models.InjectionModel; +import com.powsybl.dynawo.models.InjectionModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelConfiguration.java similarity index 71% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelConfiguration.java index 1bd1437f2..5c872b63c 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelConfiguration.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelConfiguration.java @@ -5,23 +5,26 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; -import com.powsybl.dynawaltz.models.InjectionModel; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.buses.*; -import com.powsybl.dynawaltz.models.generators.DefaultGenerator; -import com.powsybl.dynawaltz.models.generators.GeneratorModel; -import com.powsybl.dynawaltz.models.hvdc.DefaultHvdc; -import com.powsybl.dynawaltz.models.hvdc.HvdcModel; -import com.powsybl.dynawaltz.models.lines.DefaultLine; -import com.powsybl.dynawaltz.models.lines.LineModel; -import com.powsybl.dynawaltz.models.loads.DefaultLoad; -import com.powsybl.dynawaltz.models.shunts.DefaultShunt; -import com.powsybl.dynawaltz.models.shunts.ShuntModel; -import com.powsybl.dynawaltz.models.svarcs.DefaultStaticVarCompensator; -import com.powsybl.dynawaltz.models.transformers.DefaultTransformer; -import com.powsybl.dynawaltz.models.transformers.TransformerModel; +import com.powsybl.dynawo.models.InjectionModel; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.buses.ActionConnectionPoint; +import com.powsybl.dynawo.models.buses.DefaultActionConnectionPoint; +import com.powsybl.dynawo.models.buses.DefaultEquipmentConnectionPoint; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.generators.DefaultGenerator; +import com.powsybl.dynawo.models.generators.GeneratorModel; +import com.powsybl.dynawo.models.hvdc.DefaultHvdc; +import com.powsybl.dynawo.models.hvdc.HvdcModel; +import com.powsybl.dynawo.models.lines.DefaultLine; +import com.powsybl.dynawo.models.lines.LineModel; +import com.powsybl.dynawo.models.loads.DefaultLoad; +import com.powsybl.dynawo.models.shunts.DefaultShunt; +import com.powsybl.dynawo.models.shunts.ShuntModel; +import com.powsybl.dynawo.models.svarcs.DefaultStaticVarCompensator; +import com.powsybl.dynawo.models.transformers.DefaultTransformer; +import com.powsybl.dynawo.models.transformers.TransformerModel; import com.powsybl.iidm.network.IdentifiableType; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactory.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactory.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactory.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactory.java index c3f975be1..d87b4d9cb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactory.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactory.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; import java.util.HashMap; import java.util.Map; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactoryInterface.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactoryInterface.java similarity index 90% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactoryInterface.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactoryInterface.java index 3e2b88ea8..a2cf58867 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelFactoryInterface.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelFactoryInterface.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelsHandler.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelsHandler.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelsHandler.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelsHandler.java index 97ff99424..6ee7770fd 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelsHandler.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelsHandler.java @@ -4,10 +4,10 @@ * 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/. */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.IdentifiableType; import org.slf4j.Logger; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractDynamicLibEventDisconnection.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractDynamicLibEventDisconnection.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractDynamicLibEventDisconnection.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractDynamicLibEventDisconnection.java index e7c10aa40..886179940 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractDynamicLibEventDisconnection.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractDynamicLibEventDisconnection.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.utils.ImmutableLateInit; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.utils.ImmutableLateInit; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.Identifiable; -import static com.powsybl.dynawaltz.parameters.ParameterType.BOOL; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.BOOL; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; import static java.lang.Boolean.TRUE; /** @@ -50,7 +50,7 @@ protected void createEventSpecificParameters(ParametersSet paramSet) { } @Override - public final void setEquipmentHasDynamicModel(DynaWaltzContext context) { + public final void setEquipmentHasDynamicModel(DynawoSimulationContext context) { this.equipmentHasDynamicModel.setValue(hasDynamicModel(context)); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEvent.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEvent.java similarity index 79% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEvent.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEvent.java index e84a95020..2a6845421 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEvent.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEvent.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; import com.powsybl.dynamicsimulation.EventModel; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.Identifiable; import java.util.function.Consumer; @@ -40,12 +40,12 @@ public double getStartTime() { } @Override - public String getParFile(DynaWaltzContext context) { + public String getParFile(DynawoSimulationContext context) { return context.getSimulationParFile(); } @Override - public void createDynamicModelParameters(DynaWaltzContext context, Consumer parametersAdder) { + public void createDynamicModelParameters(DynawoSimulationContext context, Consumer parametersAdder) { ParametersSet paramSet = new ParametersSet(getParameterSetId()); createEventSpecificParameters(paramSet); parametersAdder.accept(paramSet); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEventModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEventModelBuilder.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEventModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEventModelBuilder.java index 8bf4216ce..5031b9a84 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/AbstractEventModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/AbstractEventModelBuilder.java @@ -5,11 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.EventModel; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.AbstractDynamicModelBuilder; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.BuilderReports; +import com.powsybl.dynawo.builders.ModelBuilder; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ContextDependentEvent.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ContextDependentEvent.java similarity index 71% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ContextDependentEvent.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ContextDependentEvent.java index 61c14dd86..93f925ecb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ContextDependentEvent.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ContextDependentEvent.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.DynaWaltzContext; +import com.powsybl.dynawo.DynawoSimulationContext; import com.powsybl.iidm.network.Identifiable; /** @@ -17,9 +17,9 @@ public interface ContextDependentEvent { Identifiable getEquipment(); - default boolean hasDynamicModel(DynaWaltzContext context) { + default boolean hasDynamicModel(DynawoSimulationContext context) { return context.hasDynamicModel(getEquipment()); } - void setEquipmentHasDynamicModel(DynaWaltzContext context); + void setEquipmentHasDynamicModel(DynawoSimulationContext context); } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ControllableEquipment.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ControllableEquipment.java similarity index 50% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ControllableEquipment.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ControllableEquipment.java index 6248a71fc..dc76a2853 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/ControllableEquipment.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/ControllableEquipment.java @@ -1,6 +1,6 @@ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; public interface ControllableEquipment extends Model { diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariation.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariation.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariation.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariation.java index cd9ba9c87..d58b4187f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariation.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariation.java @@ -5,21 +5,21 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.ImmutableLateInit; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.utils.ImmutableLateInit; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Injection; import java.util.EnumSet; import java.util.List; -import static com.powsybl.dynawaltz.parameters.ParameterType.BOOL; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.BOOL; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; import static java.lang.Boolean.TRUE; /** @@ -86,7 +86,7 @@ public void createNetworkParameter(ParametersSet networkParameters) { } @Override - public final void setEquipmentHasDynamicModel(DynaWaltzContext context) { + public final void setEquipmentHasDynamicModel(DynawoSimulationContext context) { this.equipmentHasDynamicModel.setValue(hasDynamicModel(context)); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariationBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariationBuilder.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariationBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariationBuilder.java index 86cc130c8..28d0fffa6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventActivePowerVariationBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventActivePowerVariationBuilder.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.BuilderEquipment; -import com.powsybl.dynawaltz.builders.BuilderReports; -import com.powsybl.dynawaltz.builders.EventModelInfo; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.BuilderReports; +import com.powsybl.dynawo.builders.EventModelInfo; import com.powsybl.iidm.network.Injection; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventBranchDisconnection.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventBranchDisconnection.java similarity index 80% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventBranchDisconnection.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventBranchDisconnection.java index 7dcda04f2..e51620bc6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventBranchDisconnection.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventBranchDisconnection.java @@ -4,19 +4,19 @@ * 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/. */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.automationsystems.BranchModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.automationsystems.BranchModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.Branch; import com.powsybl.iidm.network.TwoSides; import java.util.List; -import static com.powsybl.dynawaltz.parameters.ParameterType.BOOL; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.BOOL; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; /** * @author Marcos de Miguel {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventDisconnectionBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventDisconnectionBuilder.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventDisconnectionBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventDisconnectionBuilder.java index 71d3cd2b7..5b0a00d74 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventDisconnectionBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventDisconnectionBuilder.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.BuilderEquipment; -import com.powsybl.dynawaltz.builders.BuilderReports; -import com.powsybl.dynawaltz.builders.EventModelInfo; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.BuilderReports; +import com.powsybl.dynawo.builders.EventModelInfo; import com.powsybl.iidm.network.*; import java.util.EnumSet; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventHvdcDisconnection.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventHvdcDisconnection.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventHvdcDisconnection.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventHvdcDisconnection.java index 8dbc02f12..ac3a593d3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventHvdcDisconnection.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventHvdcDisconnection.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.hvdc.HvdcModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.hvdc.HvdcModel; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventInjectionDisconnection.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventInjectionDisconnection.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventInjectionDisconnection.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventInjectionDisconnection.java index 5c295d272..13b8e6c61 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/EventInjectionDisconnection.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/EventInjectionDisconnection.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.models.InjectionModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.InjectionModel; +import com.powsybl.dynawo.models.VarConnection; import com.powsybl.iidm.network.*; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEvent.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEvent.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEvent.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEvent.java index 8be27e06c..11d839a8c 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEvent.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEvent.java @@ -5,18 +5,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.ActionConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.ActionConnectionPoint; +import com.powsybl.dynawo.parameters.ParametersSet; import com.powsybl.iidm.network.Bus; import java.util.List; -import static com.powsybl.dynawaltz.parameters.ParameterType.BOOL; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.BOOL; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEventBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEventBuilder.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEventBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEventBuilder.java index ca59eed65..9002b2db7 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/events/NodeFaultEventBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/events/NodeFaultEventBuilder.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.events; +package com.powsybl.dynawo.models.events; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.BuilderEquipment; -import com.powsybl.dynawaltz.builders.BuilderReports; -import com.powsybl.dynawaltz.builders.EventModelInfo; +import com.powsybl.dynawo.builders.BuilderEquipment; +import com.powsybl.dynawo.builders.BuilderReports; +import com.powsybl.dynawo.builders.EventModelInfo; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/AbstractFrequencySynchronizer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/AbstractFrequencySynchronizer.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/AbstractFrequencySynchronizer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/AbstractFrequencySynchronizer.java index c3a69a07e..6e0d5e1ec 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/AbstractFrequencySynchronizer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/AbstractFrequencySynchronizer.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.frequencysynchronizers; +package com.powsybl.dynawo.models.frequencysynchronizers; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.AbstractPureDynamicBlackBoxModel; import java.util.List; @@ -32,7 +32,7 @@ public boolean isEmpty() { } @Override - public String getParFile(DynaWaltzContext context) { + public String getParFile(DynawoSimulationContext context) { return context.getSimulationParFile(); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizedModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizedModel.java similarity index 79% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizedModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizedModel.java index 666da6bdf..e90e6b3ce 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizedModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizedModel.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.frequencysynchronizers; +package com.powsybl.dynawo.models.frequencysynchronizers; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.VarConnection; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.VarConnection; import com.powsybl.iidm.network.Bus; import java.util.List; @@ -32,7 +32,7 @@ default List getSetPointVarConnections() { ); } - default double getWeightGen(DynaWaltzParameters dynaWaltzParameters) { + default double getWeightGen(DynawoSimulationParameters dynawoSimulationParameters) { return 0; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizerModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizerModel.java similarity index 81% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizerModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizerModel.java index ca5979e13..19fb886cf 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/FrequencySynchronizerModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizerModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.frequencysynchronizers; +package com.powsybl.dynawo.models.frequencysynchronizers; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.BlackBoxModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/OmegaRef.java similarity index 75% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/OmegaRef.java index 37b791fba..a631dfecd 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/OmegaRef.java @@ -4,23 +4,23 @@ * 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/. */ -package com.powsybl.dynawaltz.models.frequencysynchronizers; +package com.powsybl.dynawo.models.frequencysynchronizers; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.BusOfFrequencySynchronizedModel; -import com.powsybl.dynawaltz.models.buses.DefaultBusOfFrequencySynchronized; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.BusOfFrequencySynchronizedModel; +import com.powsybl.dynawo.models.buses.DefaultBusOfFrequencySynchronized; +import com.powsybl.dynawo.models.macroconnections.MacroConnectAttribute; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.parameters.ParametersSet; import java.util.List; import java.util.function.Consumer; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; -import static com.powsybl.dynawaltz.parameters.ParameterType.INT; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.INT; /** * OmegaRef is a special model: its role is to synchronize the generators' frequency. The corresponding black @@ -39,14 +39,14 @@ public OmegaRef(List synchronizedEquipments) { } @Override - public void createDynamicModelParameters(DynaWaltzContext context, Consumer parametersAdder) { + public void createDynamicModelParameters(DynawoSimulationContext context, Consumer parametersAdder) { ParametersSet paramSet = new ParametersSet(getParameterSetId()); - DynaWaltzParameters dynaWaltzParameters = context.getDynaWaltzParameters(); + DynawoSimulationParameters dynawoSimulationParameters = context.getDynawoSimulationParameters(); // The dynamic models are declared in the DYD following the order of dynamic models' supplier. // The OmegaRef parameters index the weight of each generator according to that declaration order. int index = 0; for (FrequencySynchronizedModel eq : synchronizedEquipments) { - paramSet.addParameter("weight_gen_" + index, DOUBLE, Double.toString(eq.getWeightGen(dynaWaltzParameters))); + paramSet.addParameter("weight_gen_" + index, DOUBLE, Double.toString(eq.getWeightGen(dynawoSimulationParameters))); index++; } paramSet.addParameter("nbGen", INT, Long.toString(synchronizedEquipments.size())); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/SetPoint.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/SetPoint.java similarity index 75% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/SetPoint.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/SetPoint.java index 9e347aa34..2f156c1de 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/SetPoint.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/frequencysynchronizers/SetPoint.java @@ -5,18 +5,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.frequencysynchronizers; +package com.powsybl.dynawo.models.frequencysynchronizers; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.parameters.ParametersSet; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.parameters.ParametersSet; import java.util.List; import java.util.function.Consumer; -import static com.powsybl.dynawaltz.parameters.ParameterType.DOUBLE; +import static com.powsybl.dynawo.parameters.ParameterType.DOUBLE; /** * Special generators' frequency synchronizer used when an Infinite Bus is present in the model. @@ -30,7 +30,7 @@ public SetPoint(List synchronizedEquipments) { } @Override - public void createDynamicModelParameters(DynaWaltzContext context, Consumer parametersAdder) { + public void createDynamicModelParameters(DynawoSimulationContext context, Consumer parametersAdder) { ParametersSet paramSet = new ParametersSet(getParameterSetId()); paramSet.addParameter("setPoint_Value0", DOUBLE, Double.toString(1)); parametersAdder.accept(paramSet); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGenerator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGenerator.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGenerator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGenerator.java index ed7c5dce3..f7327ceb9 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGenerator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGenerator.java @@ -4,13 +4,13 @@ * 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/. */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Generator; import java.util.ArrayList; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGeneratorBuilder.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGeneratorBuilder.java index 404386ff5..7604bad3d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/AbstractGeneratorBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/AbstractGeneratorBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.AbstractEquipmentModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfig; +import com.powsybl.dynawo.builders.AbstractEquipmentModelBuilder; +import com.powsybl.dynawo.builders.ModelConfig; import com.powsybl.iidm.network.Generator; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/DefaultGenerator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/DefaultGenerator.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/DefaultGenerator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/DefaultGenerator.java index 8a70d8f12..54d001179 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/DefaultGenerator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/DefaultGenerator.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractInjectionDefaultModel; -import com.powsybl.dynawaltz.models.events.ControllableEquipment; +import com.powsybl.dynawo.models.defaultmodels.AbstractInjectionDefaultModel; +import com.powsybl.dynawo.models.events.ControllableEquipment; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/EnumGeneratorComponent.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/EnumGeneratorComponent.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/EnumGeneratorComponent.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/EnumGeneratorComponent.java index 5887b60e9..faeeaedab 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/EnumGeneratorComponent.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/EnumGeneratorComponent.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitious.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitious.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitious.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitious.java index 855040ae1..b9986e0b7 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitious.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitious.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.iidm.network.Generator; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitiousBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitiousBuilder.java index 3b11f0766..63087e054 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorFictitiousBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorModel.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorModel.java index cd6d7a809..a0a6c5150 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GeneratorModel.java @@ -4,9 +4,9 @@ * 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/. */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.InjectionModel; +import com.powsybl.dynawo.models.InjectionModel; /** * @author Florian Dupuy {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverter.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverter.java similarity index 76% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverter.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverter.java index 0371ca6e7..d5c77eab0 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverter.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverter.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizedModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.BusUtils; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.frequencysynchronizers.FrequencySynchronizedModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.utils.BusUtils; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.Generator; @@ -68,8 +68,8 @@ public List getOmegaRefVarConnections() { } @Override - public double getWeightGen(DynaWaltzParameters dynaWaltzParameters) { - return dynaWaltzParameters.getModelParameters(getParameterSetId()).getDouble("converter_SNom"); + public double getWeightGen(DynawoSimulationParameters dynawoSimulationParameters) { + return dynawoSimulationParameters.getModelParameters(getParameterSetId()).getDouble("converter_SNom"); } @Override diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverterBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverterBuilder.java index 1c610267f..b78733637 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverterBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGenerator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGenerator.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGenerator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGenerator.java index 4e1acc243..1d425c3e9 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGenerator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGenerator.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizedModel; -import com.powsybl.dynawaltz.models.utils.BusUtils; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.frequencysynchronizers.FrequencySynchronizedModel; +import com.powsybl.dynawo.models.utils.BusUtils; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.Generator; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorBuilder.java index d3e81a99b..961ddcd38 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorControllable.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorControllable.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorControllable.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorControllable.java index 5b56342e9..a1ac5e984 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorControllable.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedGeneratorControllable.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.events.ControllableEquipment; +import com.powsybl.dynawo.models.events.ControllableEquipment; import com.powsybl.iidm.network.Generator; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedWeccGen.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedWeccGen.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedWeccGen.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedWeccGen.java index a01f27cd5..98bddc15f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedWeccGen.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedWeccGen.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizedModel; -import com.powsybl.dynawaltz.models.utils.BusUtils; +import com.powsybl.dynawo.models.frequencysynchronizers.FrequencySynchronizedModel; +import com.powsybl.dynawo.models.utils.BusUtils; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.Generator; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGenerator.java similarity index 76% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGenerator.java index 129d83eed..e61d3f524 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGenerator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGenerator.java @@ -4,10 +4,10 @@ * 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/. */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.VarConnection; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.VarConnection; import com.powsybl.iidm.network.Generator; import java.util.Arrays; @@ -45,9 +45,9 @@ public List getOmegaRefVarConnections() { } @Override - public double getWeightGen(DynaWaltzParameters dynaWaltzParameters) { - double h = dynaWaltzParameters.getModelParameters(getParameterSetId()).getDouble("generator_H"); - double sNom = dynaWaltzParameters.getModelParameters(getParameterSetId()).getDouble("generator_SNom"); + public double getWeightGen(DynawoSimulationParameters dynawoSimulationParameters) { + double h = dynawoSimulationParameters.getModelParameters(getParameterSetId()).getDouble("generator_H"); + double sNom = dynawoSimulationParameters.getModelParameters(getParameterSetId()).getDouble("generator_SNom"); return h * sNom; } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorBuilder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorBuilder.java index ece59bd80..7cc7f2ceb 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorControllable.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorControllable.java index b1645394f..53dea8a81 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorControllable.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronousGeneratorControllable.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.events.ControllableEquipment; +import com.powsybl.dynawo.models.events.ControllableEquipment; import com.powsybl.iidm.network.Generator; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccBuilder.java index 5818e16e0..6b317ad03 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccGen.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccGen.java similarity index 82% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccGen.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccGen.java index 0ca4b64a3..b56068fb9 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccGen.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/generators/WeccGen.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.generators; +package com.powsybl.dynawo.models.generators; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Generator; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdc.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdc.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdc.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdc.java index c2eaedd05..e3c96cf6d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdc.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdc.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.HvdcConverterStation; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdcBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdcBuilder.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdcBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdcBuilder.java index cc5516997..59a7f8bc6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/AbstractHvdcBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/AbstractHvdcBuilder.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.AbstractEquipmentModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfig; -import com.powsybl.dynawaltz.builders.BuilderReports; +import com.powsybl.dynawo.builders.AbstractEquipmentModelBuilder; +import com.powsybl.dynawo.builders.ModelConfig; +import com.powsybl.dynawo.builders.BuilderReports; import com.powsybl.iidm.network.*; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DanglingSide.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DanglingSide.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DanglingSide.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DanglingSide.java index c4a7e1e48..04868cb8f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DanglingSide.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DanglingSide.java @@ -1,8 +1,8 @@ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.TwoSides; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdc.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DefaultHvdc.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdc.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DefaultHvdc.java index 6e2b4a339..76b9740ec 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdc.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/DefaultHvdc.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel; +import com.powsybl.dynawo.models.defaultmodels.AbstractDefaultModel; import com.powsybl.iidm.network.TwoSides; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcModel.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcModel.java index 82104b67e..351ca20d5 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; -import com.powsybl.dynawaltz.models.Model; +import com.powsybl.dynawo.models.Model; import com.powsybl.iidm.network.TwoSides; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcP.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcP.java index d3b230211..559768623 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcP.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcP.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPBuilder.java index 0cd8014ee..d3406f388 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPDangling.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPDangling.java index 48fad3653..9d732a737 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPDangling.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcPDangling.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; import com.powsybl.iidm.network.HvdcConverterStation; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVsc.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVsc.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVsc.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVsc.java index d7757a35d..f7467ef10 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVsc.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVsc.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscBuilder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscBuilder.java index 0d9b84351..45f2bbb0d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.*; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscDangling.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscDangling.java index 3291d4370..e2431331d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/hvdc/HvdcVscDangling.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.hvdc; +package com.powsybl.dynawo.models.hvdc; import com.powsybl.commons.PowsyblException; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; import com.powsybl.iidm.network.HvdcConverterStation; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLine.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/DefaultLine.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLine.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/DefaultLine.java index bd42d9628..c6b9b55a3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLine.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/DefaultLine.java @@ -4,10 +4,10 @@ * 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/. */ -package com.powsybl.dynawaltz.models.lines; +package com.powsybl.dynawo.models.lines; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.defaultmodels.AbstractDefaultModel; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.TwoSides; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineBuilder.java index 61fcf17d4..2b33e36af 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.lines; +package com.powsybl.dynawo.models.lines; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Line; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineModel.java similarity index 79% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineModel.java index 38c2eb769..d8c4ec0f6 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/LineModel.java @@ -4,9 +4,9 @@ * 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/. */ -package com.powsybl.dynawaltz.models.lines; +package com.powsybl.dynawo.models.lines; -import com.powsybl.dynawaltz.models.automationsystems.BranchModel; +import com.powsybl.dynawo.models.automationsystems.BranchModel; /** * @author Florian Dupuy {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/StandardLine.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/StandardLine.java index b68563fc2..f13c46fba 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/StandardLine.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/lines/StandardLine.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.lines; +package com.powsybl.dynawo.models.lines; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Line; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoad.java similarity index 79% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoad.java index d51bee59c..c7366b59b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoad.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoad.java @@ -4,13 +4,13 @@ * 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/. */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.InjectionModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.InjectionModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Load; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoadModelBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoadModelBuilder.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoadModelBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoadModelBuilder.java index bf7ff2695..abe8211df 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/AbstractLoadModelBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/AbstractLoadModelBuilder.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.AbstractEquipmentModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfig; +import com.powsybl.dynawo.builders.AbstractEquipmentModelBuilder; +import com.powsybl.dynawo.builders.ModelConfig; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Load; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoad.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoad.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoad.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoad.java index 464b4c5db..4975a531e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoad.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoad.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Load; import java.util.ArrayList; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadBuilder.java index 8e92607bb..443bedfba 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadControllable.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadControllable.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadControllable.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadControllable.java index b78da598d..2b4fb4772 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadControllable.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/BaseLoadControllable.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; -import com.powsybl.dynawaltz.models.events.ControllableEquipment; +import com.powsybl.dynawo.models.events.ControllableEquipment; import com.powsybl.iidm.network.Load; /** diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/DefaultLoad.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/DefaultLoad.java similarity index 79% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/DefaultLoad.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/DefaultLoad.java index e7d14b433..1384a52da 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/DefaultLoad.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/DefaultLoad.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractInjectionDefaultModel; -import com.powsybl.dynawaltz.models.events.ControllableEquipment; +import com.powsybl.dynawo.models.defaultmodels.AbstractInjectionDefaultModel; +import com.powsybl.dynawo.models.events.ControllableEquipment; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformer.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformer.java index 973ba7812..3eb8fd265 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformer.java @@ -4,20 +4,20 @@ * 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/. */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Load; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.NONE; +import static com.powsybl.dynawo.models.TransformerSide.NONE; /** * @author Marcos de Miguel {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerBuilder.java index 754ad4b7e..528d2d910 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChanger.java similarity index 82% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChanger.java index ae3602fd8..94b405d78 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChanger.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChanger.java @@ -5,18 +5,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.transformers.TapChangerModel; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.transformers.TapChangerModel; import com.powsybl.iidm.network.Load; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.NONE; +import static com.powsybl.dynawo.models.TransformerSide.NONE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChangerBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChangerBuilder.java index ebeeedd69..1db15ec25 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadOneTransformerTapChangerBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformers.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformers.java index 46f790774..9b8d3f3d4 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformers.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformers.java @@ -5,20 +5,20 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.Load; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.*; +import static com.powsybl.dynawo.models.TransformerSide.*; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersBuilder.java index 5e378983b..30b6124ee 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangers.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangers.java index a1fab28d9..d533b6609 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangers.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangers.java @@ -5,19 +5,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.transformers.TapChangerModel; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.transformers.TapChangerModel; import com.powsybl.iidm.network.Load; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.HIGH_VOLTAGE; -import static com.powsybl.dynawaltz.models.TransformerSide.LOW_VOLTAGE; +import static com.powsybl.dynawo.models.TransformerSide.HIGH_VOLTAGE; +import static com.powsybl.dynawo.models.TransformerSide.LOW_VOLTAGE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangersBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangersBuilder.java index 67591e9f6..57a62b980 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadTwoTransformersTapChangersBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.Network; import java.util.Collection; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadWithTransformers.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadWithTransformers.java similarity index 74% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadWithTransformers.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadWithTransformers.java index b0268af80..36e43fd03 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadWithTransformers.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/loads/LoadWithTransformers.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.loads; +package com.powsybl.dynawo.models.loads; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnect.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnect.java index 66e5f53b4..f96896df2 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnect.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.macroconnections; +package com.powsybl.dynawo.models.macroconnections; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.util.List; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectAttribute.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectAttribute.java index 4a8b0341c..fb9af65d9 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectAttribute.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.macroconnections; +package com.powsybl.dynawo.models.macroconnections; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionSuffix.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionSuffix.java index d77c2ab21..a148e811e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionSuffix.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.macroconnections; +package com.powsybl.dynawo.models.macroconnections; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionsAdder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionsAdder.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionsAdder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionsAdder.java index dc20c5a81..5c53fcac2 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionsAdder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnectionsAdder.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.macroconnections; +package com.powsybl.dynawo.models.macroconnections; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.automationsystems.ConnectionStatefulModel; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.utils.BusUtils; +import com.powsybl.dynawo.models.automationsystems.ConnectionStatefulModel; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.utils.BusUtils; import com.powsybl.iidm.network.*; import java.util.Arrays; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnector.java similarity index 86% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnector.java index 44b7b3255..d0538bda8 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/macroconnections/MacroConnector.java @@ -4,18 +4,18 @@ * 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/. */ -package com.powsybl.dynawaltz.models.macroconnections; +package com.powsybl.dynawo.models.macroconnections; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.TwoSides; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.util.List; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.MACRO_CONNECTOR_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.MACRO_CONNECTOR_PREFIX; /** * @author Marcos de Miguel {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShunt.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShunt.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShunt.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShunt.java index bef1810db..8f5d18ae9 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShunt.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShunt.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.shunts; +package com.powsybl.dynawo.models.shunts; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; import com.powsybl.iidm.network.ShuntCompensator; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShuntBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShuntBuilder.java index dae17fda4..d9dec9f18 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/BaseShuntBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/BaseShuntBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.shunts; +package com.powsybl.dynawo.models.shunts; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.ShuntCompensator; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/DefaultShunt.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/DefaultShunt.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/DefaultShunt.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/DefaultShunt.java index 3664d786c..f08600c92 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/DefaultShunt.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/DefaultShunt.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.shunts; +package com.powsybl.dynawo.models.shunts; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractInjectionDefaultModel; +import com.powsybl.dynawo.models.defaultmodels.AbstractInjectionDefaultModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/ShuntModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/ShuntModel.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/ShuntModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/ShuntModel.java index 87f33d71f..57baf5cf0 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/shunts/ShuntModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/shunts/ShuntModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.shunts; +package com.powsybl.dynawo.models.shunts; -import com.powsybl.dynawaltz.models.InjectionModel; +import com.powsybl.dynawo.models.InjectionModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensator.java similarity index 84% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensator.java index 7877f35c1..e9db958bf 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensator.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.svarcs; - -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.InjectionModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.VarMapping; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; +package com.powsybl.dynawo.models.svarcs; + +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.InjectionModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.VarMapping; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; import com.powsybl.iidm.network.StaticVarCompensator; import com.powsybl.iidm.network.extensions.StandbyAutomaton; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensatorBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensatorBuilder.java index 03fb3ae30..7300b701a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/BaseStaticVarCompensatorBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.svarcs; +package com.powsybl.dynawo.models.svarcs; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.StaticVarCompensator; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/DefaultStaticVarCompensator.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/DefaultStaticVarCompensator.java similarity index 83% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/DefaultStaticVarCompensator.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/DefaultStaticVarCompensator.java index ea0b5be15..26bf55367 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/DefaultStaticVarCompensator.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/svarcs/DefaultStaticVarCompensator.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.svarcs; +package com.powsybl.dynawo.models.svarcs; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractInjectionDefaultModel; +import com.powsybl.dynawo.models.defaultmodels.AbstractInjectionDefaultModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/DefaultTransformer.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/DefaultTransformer.java index d55b89f49..6bd63a11d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/DefaultTransformer.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.transformers; +package com.powsybl.dynawo.models.transformers; -import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.defaultmodels.AbstractDefaultModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.TwoSides; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.NONE; +import static com.powsybl.dynawo.models.TransformerSide.NONE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TapChangerModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TapChangerModel.java similarity index 68% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TapChangerModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TapChangerModel.java index 6128c848d..437ebbeda 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TapChangerModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TapChangerModel.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.transformers; +package com.powsybl.dynawo.models.transformers; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.VarConnection; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.VarConnection; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.HIGH_VOLTAGE; -import static com.powsybl.dynawaltz.models.TransformerSide.NONE; +import static com.powsybl.dynawo.models.TransformerSide.HIGH_VOLTAGE; +import static com.powsybl.dynawo.models.TransformerSide.NONE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatio.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatio.java index e12e0a4f0..a765bba42 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatio.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatio.java @@ -5,19 +5,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.transformers; +package com.powsybl.dynawo.models.transformers; -import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel; -import com.powsybl.dynawaltz.models.VarConnection; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionsAdder; -import com.powsybl.dynawaltz.models.utils.SideUtils; +import com.powsybl.dynawo.models.macroconnections.MacroConnectionsAdder; +import com.powsybl.dynawo.models.AbstractEquipmentBlackBoxModel; +import com.powsybl.dynawo.models.VarConnection; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.utils.SideUtils; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.TwoWindingsTransformer; import java.util.List; -import static com.powsybl.dynawaltz.models.TransformerSide.NONE; +import static com.powsybl.dynawo.models.TransformerSide.NONE; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatioBuilder.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatioBuilder.java index 7f955fd35..704017e1e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerFixedRatioBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.transformers; +package com.powsybl.dynawo.models.transformers; import com.powsybl.commons.report.ReportNode; -import com.powsybl.dynawaltz.builders.*; +import com.powsybl.dynawo.builders.*; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoWindingsTransformer; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerModel.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerModel.java similarity index 84% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerModel.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerModel.java index 9c0c16480..e3bc61b96 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerModel.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/transformers/TransformerModel.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.transformers; +package com.powsybl.dynawo.models.transformers; -import com.powsybl.dynawaltz.models.automationsystems.BranchModel; +import com.powsybl.dynawo.models.automationsystems.BranchModel; /** * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BlackBoxSupplierUtils.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BlackBoxSupplierUtils.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BlackBoxSupplierUtils.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BlackBoxSupplierUtils.java index 277ef399c..80d47995a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BlackBoxSupplierUtils.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BlackBoxSupplierUtils.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.utils; +package com.powsybl.dynawo.models.utils; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModelsSupplier; import com.powsybl.dynamicsimulation.EventModelsSupplier; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BusUtils.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BusUtils.java similarity index 94% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BusUtils.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BusUtils.java index c05c622cf..1572934fe 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/BusUtils.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/BusUtils.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.utils; +package com.powsybl.dynawo.models.utils; import com.powsybl.iidm.network.*; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/ImmutableLateInit.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/ImmutableLateInit.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/ImmutableLateInit.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/ImmutableLateInit.java index 3b29b2f05..1ce0ea975 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/ImmutableLateInit.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/ImmutableLateInit.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.utils; +package com.powsybl.dynawo.models.utils; import com.powsybl.commons.PowsyblException; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideUtils.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/SideUtils.java similarity index 95% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideUtils.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/SideUtils.java index 671d700b7..ce7ff9aed 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideUtils.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/models/utils/SideUtils.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.utils; +package com.powsybl.dynawo.models.utils; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Parameter.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Parameter.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Parameter.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Parameter.java index cd4f1c0a2..fe1792462 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Parameter.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Parameter.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.parameters; +package com.powsybl.dynawo.parameters; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParameterType.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParameterType.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParameterType.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParameterType.java index d057f90ff..ef0c0059a 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParameterType.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParameterType.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.parameters; +package com.powsybl.dynawo.parameters; /** * @author Marcos de Miguel {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParametersSet.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParametersSet.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParametersSet.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParametersSet.java index 39c968bf4..c47995ca3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/ParametersSet.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/ParametersSet.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.parameters; +package com.powsybl.dynawo.parameters; import com.fasterxml.jackson.annotation.JsonProperty; import com.powsybl.commons.PowsyblException; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Reference.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Reference.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Reference.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Reference.java index ba34c5c05..74291c149 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/parameters/Reference.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/parameters/Reference.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.parameters; +package com.powsybl.dynawo.parameters; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/Property.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/Property.java similarity index 59% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/Property.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/Property.java index 73e383e67..d69314abe 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/Property.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/Property.java @@ -5,12 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; +import com.powsybl.dynawo.builders.ModelBuilder; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynamicModelConfig; +import com.powsybl.dynawo.suppliers.events.EventModelConfig; /** - * {@link com.powsybl.dynawaltz.suppliers.dynamicmodels.DynamicModelConfig} and {@link com.powsybl.dynawaltz.suppliers.events.EventModelConfig} property - * @param name property name corresponding to {@link com.powsybl.dynawaltz.builders.ModelBuilder} method name + * {@link DynamicModelConfig} and {@link EventModelConfig} property + * @param name property name corresponding to {@link ModelBuilder} method name * @param value property value * @param propertyClass {@link #value} class * @author Laurent Issertial {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyBuilder.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyBuilder.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyBuilder.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyBuilder.java index b15b689d3..16c5e6f5e 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyBuilder.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyBuilder.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; -import com.powsybl.dynawaltz.suppliers.dynamicmodels.DynamicModelConfigsJsonDeserializer; -import com.powsybl.dynawaltz.suppliers.events.EventModelConfigsJsonDeserializer; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynamicModelConfigsJsonDeserializer; +import com.powsybl.dynawo.suppliers.events.EventModelConfigsJsonDeserializer; import java.util.Collection; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyParserUtils.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyParserUtils.java similarity index 98% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyParserUtils.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyParserUtils.java index b610ef1b3..497f2fe8b 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyParserUtils.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyParserUtils.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyType.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyType.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyType.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyType.java index 9b03f5995..5a084bdf7 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/PropertyType.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/PropertyType.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SetGroupType.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SetGroupType.java similarity index 74% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SetGroupType.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SetGroupType.java index 5e10323fd..184ef5697 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SetGroupType.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SetGroupType.java @@ -5,12 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; -import com.powsybl.dynawaltz.suppliers.dynamicmodels.DynawoModelsSupplier; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynawoModelsSupplier; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynamicModelConfig; /** - * Configures {@link com.powsybl.dynawaltz.suppliers.dynamicmodels.DynamicModelConfig#group()} processing in {@link DynawoModelsSupplier} + * Configures {@link DynamicModelConfig#group()} processing in {@link DynawoModelsSupplier} * @author Laurent Issertial {@literal } */ public enum SetGroupType { diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializer.java similarity index 97% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializer.java index efc2f481e..213531fef 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializer.java @@ -1,4 +1,4 @@ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/curves/CurvesJsonDeserializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/curves/CurvesJsonDeserializer.java similarity index 96% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/curves/CurvesJsonDeserializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/curves/CurvesJsonDeserializer.java index a1b3d63e8..5f131b9d1 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/curves/CurvesJsonDeserializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/curves/CurvesJsonDeserializer.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.curves; +package com.powsybl.dynawo.suppliers.curves; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.powsybl.commons.json.JsonUtil; import com.powsybl.dynamicsimulation.Curve; -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder; +import com.powsybl.dynawo.curves.DynawoCurvesBuilder; import java.util.ArrayList; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfig.java similarity index 87% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfig.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfig.java index b053b6756..65d3cf331 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfig.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfig.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.dynamicmodels; +package com.powsybl.dynawo.suppliers.dynamicmodels; -import com.powsybl.dynawaltz.suppliers.Property; -import com.powsybl.dynawaltz.suppliers.SetGroupType; +import com.powsybl.dynawo.suppliers.Property; +import com.powsybl.dynawo.suppliers.SetGroupType; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java similarity index 91% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java index b9b4ba5c4..38db0bd71 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynamicModelConfigsJsonDeserializer.java @@ -5,15 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.dynamicmodels; +package com.powsybl.dynawo.suppliers.dynamicmodels; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.powsybl.commons.json.JsonUtil; -import com.powsybl.dynawaltz.suppliers.Property; -import com.powsybl.dynawaltz.suppliers.PropertyParserUtils; -import com.powsybl.dynawaltz.suppliers.SetGroupType; +import com.powsybl.dynawo.suppliers.Property; +import com.powsybl.dynawo.suppliers.PropertyParserUtils; +import com.powsybl.dynawo.suppliers.SetGroupType; import java.util.ArrayList; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynawoModelsSupplier.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynawoModelsSupplier.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynawoModelsSupplier.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynawoModelsSupplier.java index ceee9be81..0807d300f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/dynamicmodels/DynawoModelsSupplier.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/dynamicmodels/DynawoModelsSupplier.java @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.dynamicmodels; +package com.powsybl.dynawo.suppliers.dynamicmodels; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModel; import com.powsybl.dynamicsimulation.DynamicModelsSupplier; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.builders.ModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfigsHandler; -import com.powsybl.dynawaltz.suppliers.Property; -import com.powsybl.dynawaltz.suppliers.SupplierJsonDeserializer; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.builders.ModelBuilder; +import com.powsybl.dynawo.builders.ModelConfigsHandler; +import com.powsybl.dynawo.suppliers.Property; +import com.powsybl.dynawo.suppliers.SupplierJsonDeserializer; import com.powsybl.iidm.network.Network; import java.io.InputStream; @@ -48,7 +48,7 @@ public DynawoModelsSupplier(List dynamicModelConfigs) { @Override public String getName() { - return DynaWaltzProvider.NAME; + return DynawoSimulationProvider.NAME; } @Override diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/DynawoEventModelsSupplier.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/DynawoEventModelsSupplier.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/DynawoEventModelsSupplier.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/DynawoEventModelsSupplier.java index 62d66555c..3be15590f 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/DynawoEventModelsSupplier.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/DynawoEventModelsSupplier.java @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.events; +package com.powsybl.dynawo.suppliers.events; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.EventModel; import com.powsybl.dynamicsimulation.EventModelsSupplier; -import com.powsybl.dynawaltz.DynaWaltzProvider; -import com.powsybl.dynawaltz.builders.ModelBuilder; -import com.powsybl.dynawaltz.builders.ModelConfigsHandler; -import com.powsybl.dynawaltz.suppliers.Property; -import com.powsybl.dynawaltz.suppliers.SupplierJsonDeserializer; +import com.powsybl.dynawo.DynawoSimulationProvider; +import com.powsybl.dynawo.builders.ModelBuilder; +import com.powsybl.dynawo.builders.ModelConfigsHandler; +import com.powsybl.dynawo.suppliers.Property; +import com.powsybl.dynawo.suppliers.SupplierJsonDeserializer; import com.powsybl.iidm.network.Network; import java.io.InputStream; @@ -46,7 +46,7 @@ public DynawoEventModelsSupplier(List eventModelConfigs) { @Override public String getName() { - return DynaWaltzProvider.NAME; + return DynawoSimulationProvider.NAME; } @Override diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfig.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfig.java similarity index 88% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfig.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfig.java index 79dbf701b..536c88b39 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfig.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfig.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.events; +package com.powsybl.dynawo.suppliers.events; -import com.powsybl.dynawaltz.suppliers.Property; +import com.powsybl.dynawo.suppliers.Property; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfigsJsonDeserializer.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfigsJsonDeserializer.java similarity index 93% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfigsJsonDeserializer.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfigsJsonDeserializer.java index 781c17f1e..e564dbe96 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/suppliers/events/EventModelConfigsJsonDeserializer.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/suppliers/events/EventModelConfigsJsonDeserializer.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers.events; +package com.powsybl.dynawo.suppliers.events; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.powsybl.commons.json.JsonUtil; -import com.powsybl.dynawaltz.suppliers.Property; -import com.powsybl.dynawaltz.suppliers.PropertyParserUtils; +import com.powsybl.dynawo.suppliers.Property; +import com.powsybl.dynawo.suppliers.PropertyParserUtils; import java.util.ArrayList; import java.util.List; diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/AbstractXmlDynawaltzWriter.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/AbstractXmlDynawoSimulationWriter.java similarity index 73% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/AbstractXmlDynawaltzWriter.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/AbstractXmlDynawoSimulationWriter.java index 281ce2ff4..e3c2478cd 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/AbstractXmlDynawaltzWriter.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/AbstractXmlDynawoSimulationWriter.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.exceptions.UncheckedXmlStreamException; -import com.powsybl.dynawaltz.DynaWaltzContext; +import com.powsybl.dynawo.DynawoSimulationContext; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -19,24 +19,24 @@ import java.nio.file.Path; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_PREFIX; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Florian Dupuy {@literal } */ -public abstract class AbstractXmlDynawaltzWriter implements XmlDynawaltzWriter { +public abstract class AbstractXmlDynawoSimulationWriter implements XmlDynawoSimulationWriter { private final String xmlFileName; private final String xmlRootName; - protected AbstractXmlDynawaltzWriter(String xmlFileName, String xmlRootName) { + protected AbstractXmlDynawoSimulationWriter(String xmlFileName, String xmlRootName) { this.xmlFileName = Objects.requireNonNull(xmlFileName); this.xmlRootName = Objects.requireNonNull(xmlRootName); } @Override - public void createXmlFileFromContext(Path workingDir, DynaWaltzContext context) throws IOException { + public void createXmlFileFromContext(Path workingDir, DynawoSimulationContext context) throws IOException { Objects.requireNonNull(workingDir); Objects.requireNonNull(context); Path file = workingDir.resolve(xmlFileName); @@ -61,5 +61,5 @@ public void createXmlFileFromContext(Path workingDir, DynaWaltzContext context) } } - abstract void write(XMLStreamWriter writer, DynaWaltzContext dynaWaltzContext) throws XMLStreamException; + abstract void write(XMLStreamWriter writer, DynawoSimulationContext dynawoSimulationContext) throws XMLStreamException; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/CurvesXml.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/CurvesXml.java similarity index 62% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/CurvesXml.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/CurvesXml.java index 29d22f363..bb45bee41 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/CurvesXml.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/CurvesXml.java @@ -4,34 +4,34 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.curves.DynawoCurve; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.curves.DynawoCurve; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.io.IOException; import java.nio.file.Path; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.CRV_FILENAME; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.CRV_FILENAME; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Marcos de Miguel {@literal } */ -public final class CurvesXml extends AbstractXmlDynawaltzWriter { +public final class CurvesXml extends AbstractXmlDynawoSimulationWriter { private CurvesXml() { super(CRV_FILENAME, "curvesInput"); } - public static void write(Path workingDir, DynaWaltzContext context) throws IOException { + public static void write(Path workingDir, DynawoSimulationContext context) throws IOException { new CurvesXml().createXmlFileFromContext(workingDir, context); } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { for (DynawoCurve dynCurve : context.getCurves()) { writer.writeEmptyElement(DYN_URI, "curve"); writer.writeAttribute("model", dynCurve.getModelId()); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DydXml.java similarity index 70% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DydXml.java index 6774e22e6..79ede7cd3 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DydXml.java @@ -5,35 +5,35 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnect; -import com.powsybl.dynawaltz.models.macroconnections.MacroConnector; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.macroconnections.MacroConnect; +import com.powsybl.dynawo.models.macroconnections.MacroConnector; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.io.IOException; import java.nio.file.Path; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.DYD_FILENAME; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.DYD_FILENAME; /** * @author Mathieu Bague {@literal } */ -public final class DydXml extends AbstractXmlDynawaltzWriter { +public final class DydXml extends AbstractXmlDynawoSimulationWriter { private DydXml() { super(DYD_FILENAME, "dynamicModelsArchitecture"); } - public static void write(Path workingDir, DynaWaltzContext context) throws IOException { + public static void write(Path workingDir, DynawoSimulationContext context) throws IOException { new DydXml().createXmlFileFromContext(workingDir, context); } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { // loop over the values of the map indexed by dynamicIds to write only once objects with the same dynamicId for (BlackBoxModel model : context.getBlackBoxDynamicModels()) { model.write(writer, context); diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzConstants.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationConstants.java similarity index 67% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzConstants.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationConstants.java index 497a5fa79..e9f5c1e38 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzConstants.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationConstants.java @@ -4,20 +4,20 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; /** * @author Marcos de Miguel {@literal } */ -public final class DynaWaltzConstants { +public final class DynawoSimulationConstants { - public static final String JOBS_FILENAME = "powsybl_dynawaltz.jobs"; + public static final String JOBS_FILENAME = "powsybl_dynawo.jobs"; - public static final String NETWORK_FILENAME = "powsybl_dynawaltz.xiidm"; + public static final String NETWORK_FILENAME = "powsybl_dynawo.xiidm"; - public static final String DYD_FILENAME = "powsybl_dynawaltz.dyd"; + public static final String DYD_FILENAME = "powsybl_dynawo.dyd"; - public static final String CRV_FILENAME = "powsybl_dynawaltz.crv"; + public static final String CRV_FILENAME = "powsybl_dynawo.crv"; public static final String CURVES_OUTPUT_PATH = "outputs/curves"; @@ -27,6 +27,6 @@ public final class DynaWaltzConstants { public static final String AGGREGATED_RESULTS = "aggregatedResults.xml"; - private DynaWaltzConstants() { + private DynawoSimulationConstants() { } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzXmlConstants.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationXmlConstants.java similarity index 85% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzXmlConstants.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationXmlConstants.java index 70988dded..c29e95f8d 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DynaWaltzXmlConstants.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/DynawoSimulationXmlConstants.java @@ -4,12 +4,12 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; /** * @author Marcos de Miguel {@literal } */ -public final class DynaWaltzXmlConstants { +public final class DynawoSimulationXmlConstants { public static final String DYN_BASE_URI = "http://www.rte-france.com/dynawo"; @@ -24,6 +24,6 @@ public final class DynaWaltzXmlConstants { public static final String MACRO_STATIC_REFERENCE_PREFIX = "MSR_"; public static final String MACRO_CONNECTOR_PREFIX = "MC_"; - private DynaWaltzXmlConstants() { + private DynawoSimulationXmlConstants() { } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/JobsXml.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/JobsXml.java similarity index 68% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/JobsXml.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/JobsXml.java index a0a09c6cf..fc1e185de 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/JobsXml.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/JobsXml.java @@ -4,36 +4,36 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.DumpFileParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.DynaWaltzParameters.SolverType; +import com.powsybl.dynawo.DumpFileParameters; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.DynawoSimulationParameters.SolverType; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.io.IOException; import java.nio.file.Path; -import static com.powsybl.dynawaltz.xml.DynaWaltzConstants.*; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationConstants.*; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Marcos de Miguel {@literal } */ -public final class JobsXml extends AbstractXmlDynawaltzWriter { +public final class JobsXml extends AbstractXmlDynawoSimulationWriter { private JobsXml() { super(JOBS_FILENAME, "jobs"); } - public static void write(Path workingDir, DynaWaltzContext context) throws IOException { + public static void write(Path workingDir, DynawoSimulationContext context) throws IOException { new JobsXml().createXmlFileFromContext(workingDir, context); } @Override - public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + public void write(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { writer.writeStartElement(DYN_URI, "job"); writer.writeAttribute("name", "Job"); writeSolver(writer, context); @@ -43,22 +43,22 @@ public void write(XMLStreamWriter writer, DynaWaltzContext context) throws XMLSt writer.writeEndElement(); } - private static void writeSolver(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { - DynaWaltzParameters parameters = context.getDynaWaltzParameters(); + private static void writeSolver(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { + DynawoSimulationParameters parameters = context.getDynawoSimulationParameters(); writer.writeEmptyElement(DYN_URI, "solver"); writer.writeAttribute("lib", parameters.getSolverType().equals(SolverType.IDA) ? "dynawo_SolverIDA" : "dynawo_SolverSIM"); - writer.writeAttribute("parFile", DynaWaltzParameters.SOLVER_OUTPUT_PARAMETERS_FILE); + writer.writeAttribute("parFile", DynawoSimulationParameters.SOLVER_OUTPUT_PARAMETERS_FILE); writer.writeAttribute("parId", parameters.getSolverParameters().getId()); } - private static void writeModeler(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { - DynaWaltzParameters parameters = context.getDynaWaltzParameters(); + private static void writeModeler(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { + DynawoSimulationParameters parameters = context.getDynawoSimulationParameters(); writer.writeStartElement(DYN_URI, "modeler"); writer.writeAttribute("compileDir", "outputs/compilation"); writer.writeEmptyElement(DYN_URI, "network"); writer.writeAttribute("iidmFile", NETWORK_FILENAME); - writer.writeAttribute("parFile", DynaWaltzParameters.NETWORK_OUTPUT_PARAMETERS_FILE); + writer.writeAttribute("parFile", DynawoSimulationParameters.NETWORK_OUTPUT_PARAMETERS_FILE); writer.writeAttribute("parId", parameters.getNetworkParameters().getId()); writer.writeEmptyElement(DYN_URI, "dynModels"); @@ -79,15 +79,15 @@ private static void writeModeler(XMLStreamWriter writer, DynaWaltzContext contex writer.writeEndElement(); } - private static void writeSimulation(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { + private static void writeSimulation(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { writer.writeEmptyElement(DYN_URI, "simulation"); writer.writeAttribute("startTime", Double.toString(context.getParameters().getStartTime())); writer.writeAttribute("stopTime", Double.toString(context.getParameters().getStopTime())); - writer.writeAttribute("precision", Double.toString(context.getDynaWaltzParameters().getPrecision())); + writer.writeAttribute("precision", Double.toString(context.getDynawoSimulationParameters().getPrecision())); } - private static void writeOutput(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException { - DynaWaltzParameters parameters = context.getDynaWaltzParameters(); + private static void writeOutput(XMLStreamWriter writer, DynawoSimulationContext context) throws XMLStreamException { + DynawoSimulationParameters parameters = context.getDynawoSimulationParameters(); writer.writeStartElement(DYN_URI, "outputs"); writer.writeAttribute("directory", "outputs"); @@ -104,8 +104,8 @@ private static void writeOutput(XMLStreamWriter writer, DynaWaltzContext context if (context.withCurves()) { writer.writeEmptyElement(DYN_URI, "curves"); - writer.writeAttribute("inputFile", DynaWaltzConstants.CRV_FILENAME); - writer.writeAttribute("exportMode", DynaWaltzParameters.ExportMode.CSV.toString()); + writer.writeAttribute("inputFile", DynawoSimulationConstants.CRV_FILENAME); + writer.writeAttribute("exportMode", DynawoSimulationParameters.ExportMode.CSV.toString()); } writer.writeStartElement(DYN_URI, "logs"); @@ -115,20 +115,20 @@ private static void writeOutput(XMLStreamWriter writer, DynaWaltzContext context writer.writeEndElement(); } - private static void writeAppender(XMLStreamWriter writer, DynaWaltzParameters parameters) throws XMLStreamException { + private static void writeAppender(XMLStreamWriter writer, DynawoSimulationParameters parameters) throws XMLStreamException { writer.writeEmptyElement(DYN_URI, "appender"); writer.writeAttribute("tag", ""); - writer.writeAttribute("file", "dynawaltz.log"); + writer.writeAttribute("file", "dynawo.log"); writer.writeAttribute("lvlFilter", parameters.getLogLevelFilter().toString()); - for (DynaWaltzParameters.SpecificLog log : parameters.getSpecificLogs()) { + for (DynawoSimulationParameters.SpecificLog log : parameters.getSpecificLogs()) { writeSpecificAppender(writer, log); } } - private static void writeSpecificAppender(XMLStreamWriter writer, DynaWaltzParameters.SpecificLog log) throws XMLStreamException { + private static void writeSpecificAppender(XMLStreamWriter writer, DynawoSimulationParameters.SpecificLog log) throws XMLStreamException { writer.writeEmptyElement(DYN_URI, "appender"); writer.writeAttribute("tag", log.toString()); writer.writeAttribute("file", log.getFileName()); - writer.writeAttribute("lvlFilter", DynaWaltzParameters.LogLevel.DEBUG.toString()); + writer.writeAttribute("lvlFilter", DynawoSimulationParameters.LogLevel.DEBUG.toString()); } } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/MacroStaticReference.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/MacroStaticReference.java similarity index 89% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/MacroStaticReference.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/MacroStaticReference.java index 96639ef01..c6ad14e6c 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/MacroStaticReference.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/MacroStaticReference.java @@ -4,17 +4,17 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.VarMapping; +import com.powsybl.dynawo.models.VarMapping; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import java.util.List; import java.util.Objects; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.MACRO_STATIC_REFERENCE_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.MACRO_STATIC_REFERENCE_PREFIX; /** * @author Marcos de Miguel {@literal } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/ParametersXml.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/ParametersXml.java similarity index 90% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/ParametersXml.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/ParametersXml.java index 77b1265e4..e6ca3d449 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/ParametersXml.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/ParametersXml.java @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.exceptions.UncheckedXmlStreamException; import com.powsybl.commons.xml.XmlUtil; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.parameters.Parameter; -import com.powsybl.dynawaltz.parameters.ParameterType; -import com.powsybl.dynawaltz.parameters.ParametersSet; -import com.powsybl.dynawaltz.parameters.Reference; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.parameters.Parameter; +import com.powsybl.dynawo.parameters.ParameterType; +import com.powsybl.dynawo.parameters.ParametersSet; +import com.powsybl.dynawo.parameters.Reference; import javax.xml.XMLConstants; import javax.xml.stream.*; @@ -29,8 +29,8 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_PREFIX; -import static com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants.DYN_URI; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_PREFIX; +import static com.powsybl.dynawo.xml.DynawoSimulationXmlConstants.DYN_URI; /** * @author Marcos de Miguel {@literal } @@ -178,14 +178,14 @@ private static void closeAndThrowException(XMLStreamReader xmlReader, String une throw new PowsyblException("Unexpected element: " + unexpectedElement); } - public static void write(Path workingDir, DynaWaltzContext context) { + public static void write(Path workingDir, DynawoSimulationContext context) { Objects.requireNonNull(workingDir); write(context.getDynamicModelsParameters(), context.getSimulationParFile(), workingDir, DYN_PREFIX); - DynaWaltzParameters parameters = context.getDynaWaltzParameters(); - write(parameters.getModelParameters(), DynaWaltzParameters.MODELS_OUTPUT_PARAMETERS_FILE, workingDir, ""); - write(List.of(parameters.getNetworkParameters()), DynaWaltzParameters.NETWORK_OUTPUT_PARAMETERS_FILE, workingDir, ""); - write(List.of(parameters.getSolverParameters()), DynaWaltzParameters.SOLVER_OUTPUT_PARAMETERS_FILE, workingDir, ""); + DynawoSimulationParameters parameters = context.getDynawoSimulationParameters(); + write(parameters.getModelParameters(), DynawoSimulationParameters.MODELS_OUTPUT_PARAMETERS_FILE, workingDir, ""); + write(List.of(parameters.getNetworkParameters()), DynawoSimulationParameters.NETWORK_OUTPUT_PARAMETERS_FILE, workingDir, ""); + write(List.of(parameters.getSolverParameters()), DynawoSimulationParameters.SOLVER_OUTPUT_PARAMETERS_FILE, workingDir, ""); } public static void write(Collection parametersSets, String filename, Path workingDir, String dynPrefix) { diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlDynawaltzWriter.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlDynawoSimulationWriter.java similarity index 66% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlDynawaltzWriter.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlDynawoSimulationWriter.java index 4668e8f06..34d10b845 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlDynawaltzWriter.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlDynawoSimulationWriter.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.DynaWaltzContext; +import com.powsybl.dynawo.DynawoSimulationContext; import java.io.IOException; import java.nio.file.Path; @@ -16,6 +16,6 @@ * @author Florian Dupuy {@literal } */ @FunctionalInterface -public interface XmlDynawaltzWriter { - void createXmlFileFromContext(Path workingDir, DynaWaltzContext context) throws IOException; +public interface XmlDynawoSimulationWriter { + void createXmlFileFromContext(Path workingDir, DynawoSimulationContext context) throws IOException; } diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlStreamWriterFactory.java b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlStreamWriterFactory.java similarity index 92% rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlStreamWriterFactory.java rename to dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlStreamWriterFactory.java index c8acdeb96..b6e400616 100644 --- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/XmlStreamWriterFactory.java +++ b/dynawo-simulation/src/main/java/com/powsybl/dynawo/xml/XmlStreamWriterFactory.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import javanet.staxutils.IndentingXMLStreamWriter; @@ -31,7 +31,7 @@ public static XMLStreamWriter newInstance(Writer writer, boolean indent) throws XMLStreamWriter xmlStreamWriter = factory.createXMLStreamWriter(writer); if (indent) { IndentingXMLStreamWriter indentingWriter = new IndentingXMLStreamWriter(xmlStreamWriter); - indentingWriter.setIndent(DynaWaltzXmlConstants.INDENT); + indentingWriter.setIndent(DynawoSimulationXmlConstants.INDENT); xmlStreamWriter = indentingWriter; } return xmlStreamWriter; diff --git a/dynawaltz/src/main/resources/models.json b/dynawo-simulation/src/main/resources/models.json similarity index 100% rename from dynawaltz/src/main/resources/models.json rename to dynawo-simulation/src/main/resources/models.json diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/AbstractLocalCommandExecutor.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/AbstractLocalCommandExecutor.java similarity index 97% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/AbstractLocalCommandExecutor.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/AbstractLocalCommandExecutor.java index 3112d62aa..3b31b8e09 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/AbstractLocalCommandExecutor.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/AbstractLocalCommandExecutor.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.computation.local.LocalCommandExecutor; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzConfigTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoConfigTest.java similarity index 90% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzConfigTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoConfigTest.java index 235c2d43f..b0352fddc 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzConfigTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoConfigTest.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; @@ -22,7 +22,7 @@ /** * @author Marcos de Miguel {@literal } */ -class DynaWaltzConfigTest { +class DynawoConfigTest { private InMemoryPlatformConfig platformConfig; private FileSystem fileSystem; @@ -43,10 +43,10 @@ void checkConfig() { String homeDir = "homeDir"; boolean debug = true; - MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawaltz"); + MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawo"); moduleConfig.setStringProperty("homeDir", homeDir); moduleConfig.setStringProperty("debug", Boolean.toString(debug)); - DynaWaltzConfig config = DynaWaltzConfig.load(platformConfig); + DynawoSimulationConfig config = DynawoSimulationConfig.load(platformConfig); assertEquals(homeDir, config.getHomeDir().toString()); assertEquals(debug, config.isDebug()); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersDatabaseTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersDatabaseTest.java similarity index 89% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersDatabaseTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersDatabaseTest.java index 58ac7497f..7ec668eb2 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersDatabaseTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersDatabaseTest.java @@ -4,14 +4,14 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.parameters.ParameterType; -import com.powsybl.dynawaltz.parameters.ParametersSet; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.parameters.ParameterType; +import com.powsybl.dynawo.parameters.ParametersSet; +import com.powsybl.dynawo.xml.ParametersXml; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ /** * @author Marcos de Miguel {@literal } */ -class DynaWaltzParametersDatabaseTest { +class DynawoParametersDatabaseTest { private FileSystem fileSystem; @@ -47,7 +47,7 @@ void tearDown() throws IOException { @Test void checkParameters() { List setsMap = ParametersXml.load(fileSystem.getPath("/models.par")); - DynaWaltzParameters dParameters = new DynaWaltzParameters().setModelsParameters(setsMap); + DynawoSimulationParameters dParameters = new DynawoSimulationParameters().setModelsParameters(setsMap); ParametersSet set1 = dParameters.getModelParameters("LoadAlphaBeta"); assertEquals(1.5, set1.getDouble("load_alpha"), 1e-6); @@ -80,7 +80,7 @@ void checkParametersNotFound() { @Test void addParametersSet() { - DynaWaltzParameters dParameters = new DynaWaltzParameters(); + DynawoSimulationParameters dParameters = new DynawoSimulationParameters(); ParametersSet set = new ParametersSet("test"); dParameters.addModelParameters(set); assertEquals(1, dParameters.getModelParameters().size()); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersTest.java similarity index 73% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersTest.java index df03b710f..fcf8e9b5e 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzParametersTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoParametersTest.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.config.InMemoryPlatformConfig; @@ -12,13 +12,13 @@ import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; import com.powsybl.dynamicsimulation.json.JsonDynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzParameters.ExportMode; -import com.powsybl.dynawaltz.DynaWaltzParameters.LogLevel; -import com.powsybl.dynawaltz.DynaWaltzParameters.SolverType; -import com.powsybl.dynawaltz.DynaWaltzParameters.SpecificLog; -import com.powsybl.dynawaltz.parameters.Parameter; -import com.powsybl.dynawaltz.parameters.ParameterType; -import com.powsybl.dynawaltz.xml.ParametersXml; +import com.powsybl.dynawo.DynawoSimulationParameters.ExportMode; +import com.powsybl.dynawo.DynawoSimulationParameters.LogLevel; +import com.powsybl.dynawo.DynawoSimulationParameters.SolverType; +import com.powsybl.dynawo.DynawoSimulationParameters.SpecificLog; +import com.powsybl.dynawo.parameters.Parameter; +import com.powsybl.dynawo.parameters.ParameterType; +import com.powsybl.dynawo.xml.ParametersXml; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -33,13 +33,14 @@ /** * @author Marcos de Miguel {@literal } */ -class DynaWaltzParametersTest extends AbstractSerDeTest { +class DynawoParametersTest extends AbstractSerDeTest { public static final String USER_HOME = "/home/user/"; private InMemoryPlatformConfig platformConfig; @BeforeEach + @Override public void setUp() throws IOException { super.setUp(); platformConfig = new InMemoryPlatformConfig(fileSystem); @@ -66,7 +67,7 @@ void checkParameters() throws IOException { Set specificLogs = EnumSet.of(SpecificLog.MODELER, SpecificLog.EQUATIONS); initPlatformConfig(networkParametersId, solverType, solverParametersId, mergeLoads, useModelSimplifiers, precision, timelinExportMode, logLevel, specificLogs); - DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem); + DynawoSimulationParameters parameters = DynawoSimulationParameters.load(platformConfig, fileSystem); checkModelParameters(parameters); @@ -106,7 +107,7 @@ void checkDumpFileParameters() throws IOException { String folderProperty = USER_HOME + "dumpFiles"; String fileProperty = "dumpFile.dmp"; initDumpFilePlatformConfig(folderProperty, fileProperty); - DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem); + DynawoSimulationParameters parameters = DynawoSimulationParameters.load(platformConfig, fileSystem); DumpFileParameters dumpFileParameters = parameters.getDumpFileParameters(); assertTrue(dumpFileParameters.exportDumpFile()); @@ -126,10 +127,10 @@ void roundTripParametersSerializing() throws IOException { DynamicSimulationParameters dynamicSimulationParameters = new DynamicSimulationParameters() .setStartTime(0) .setStopTime(3600); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(platformConfig); - dynamicSimulationParameters.addExtension(DynaWaltzParameters.class, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(platformConfig); + dynamicSimulationParameters.addExtension(DynawoSimulationParameters.class, dynawoParameters); roundTripTest(dynamicSimulationParameters, JsonDynamicSimulationParameters::write, - JsonDynamicSimulationParameters::read, "/DynaWaltzParameters.json"); + JsonDynamicSimulationParameters::read, "/DynawoSimulationParameters.json"); } private void initPlatformConfig(String networkParametersId, SolverType solverType, String solverParametersId, @@ -139,7 +140,7 @@ private void initPlatformConfig(String networkParametersId, SolverType solverTyp String networkParametersFile = USER_HOME + "networkParametersFile"; String solverParametersFile = USER_HOME + "solverParametersFile"; - MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawaltz-default-parameters"); + MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawo-simulation-default-parameters"); moduleConfig.setStringProperty("parametersFile", parametersFile); moduleConfig.setStringProperty("network.parametersFile", networkParametersFile); moduleConfig.setStringProperty("solver.parametersFile", solverParametersFile); @@ -161,17 +162,17 @@ private void initPlatformConfig(String networkParametersId, SolverType solverTyp private void initDumpFilePlatformConfig(String folderProperty, String fileProperty) throws IOException { Files.createDirectories(fileSystem.getPath(USER_HOME)); - copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE); - copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); - copyFile("/parametersSet/solvers.par", DynaWaltzParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); + copyFile("/parametersSet/models.par", DynawoSimulationParameters.DEFAULT_INPUT_PARAMETERS_FILE); + copyFile("/parametersSet/network.par", DynawoSimulationParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); + copyFile("/parametersSet/solvers.par", DynawoSimulationParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); String folderName = USER_HOME + "dumpFiles"; Files.createDirectories(fileSystem.getPath(folderName)); String fileName = "dumpFile.dmp"; Files.createFile(fileSystem.getPath(folderName, fileName)); - MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawaltz-default-parameters"); - moduleConfig.setStringProperty("parametersFile", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE); - moduleConfig.setStringProperty("network.parametersFile", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); + MapModuleConfig moduleConfig = platformConfig.createModuleConfig("dynawo-simulation-default-parameters"); + moduleConfig.setStringProperty("parametersFile", DynawoSimulationParameters.DEFAULT_INPUT_PARAMETERS_FILE); + moduleConfig.setStringProperty("network.parametersFile", DynawoSimulationParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); moduleConfig.setStringProperty("dump.export", Boolean.toString(true)); moduleConfig.setStringProperty("dump.useAsInput", Boolean.toString(true)); moduleConfig.setStringProperty("dump.exportFolder", folderProperty); @@ -182,34 +183,34 @@ private void initDumpFilePlatformConfig(String folderProperty, String fileProper @Test void checkDefaultParameters() throws IOException { Files.createDirectories(fileSystem.getPath(USER_HOME)); - copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE); - copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); - copyFile("/parametersSet/solvers.par", DynaWaltzParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); + copyFile("/parametersSet/models.par", DynawoSimulationParameters.DEFAULT_INPUT_PARAMETERS_FILE); + copyFile("/parametersSet/network.par", DynawoSimulationParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); + copyFile("/parametersSet/solvers.par", DynawoSimulationParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); - DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem); + DynawoSimulationParameters parameters = DynawoSimulationParameters.load(platformConfig, fileSystem); checkModelParameters(parameters); - assertEquals(DynaWaltzParameters.DEFAULT_NETWORK_PAR_ID, parameters.getNetworkParameters().getId()); + assertEquals(DynawoSimulationParameters.DEFAULT_NETWORK_PAR_ID, parameters.getNetworkParameters().getId()); assertTrue(parameters.getNetworkParameters().getParameters().isEmpty()); assertTrue(parameters.getNetworkParameters().getReferences().isEmpty()); - assertEquals(DynaWaltzParameters.DEFAULT_SOLVER_TYPE, parameters.getSolverType()); - assertEquals(DynaWaltzParameters.DEFAULT_SOLVER_PAR_ID, parameters.getSolverParameters().getId()); + assertEquals(DynawoSimulationParameters.DEFAULT_SOLVER_TYPE, parameters.getSolverType()); + assertEquals(DynawoSimulationParameters.DEFAULT_SOLVER_PAR_ID, parameters.getSolverParameters().getId()); assertEquals("1", parameters.getSolverParameters().getId()); - assertEquals(DynaWaltzParameters.DEFAULT_MERGE_LOADS, parameters.isMergeLoads()); - assertEquals(DynaWaltzParameters.DEFAULT_USE_MODEL_SIMPLIFIERS, parameters.isUseModelSimplifiers()); - assertEquals(DynaWaltzParameters.DEFAULT_TIMELINE_EXPORT_MODE, parameters.getTimelineExportMode()); + assertEquals(DynawoSimulationParameters.DEFAULT_MERGE_LOADS, parameters.isMergeLoads()); + assertEquals(DynawoSimulationParameters.DEFAULT_USE_MODEL_SIMPLIFIERS, parameters.isUseModelSimplifiers()); + assertEquals(DynawoSimulationParameters.DEFAULT_TIMELINE_EXPORT_MODE, parameters.getTimelineExportMode()); } @Test void checkDefaultDumpParameters() throws IOException { Files.createDirectories(fileSystem.getPath(USER_HOME)); - copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE); - copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); - copyFile("/parametersSet/solvers.par", DynaWaltzParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); + copyFile("/parametersSet/models.par", DynawoSimulationParameters.DEFAULT_INPUT_PARAMETERS_FILE); + copyFile("/parametersSet/network.par", DynawoSimulationParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); + copyFile("/parametersSet/solvers.par", DynawoSimulationParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); - DynaWaltzParameters parameters = DynaWaltzParameters.load(platformConfig, fileSystem); + DynawoSimulationParameters parameters = DynawoSimulationParameters.load(platformConfig, fileSystem); DumpFileParameters dumpFileParameters = parameters.getDumpFileParameters(); assertEquals(DumpFileParameters.DEFAULT_EXPORT_DUMP, dumpFileParameters.exportDumpFile()); assertEquals(DumpFileParameters.DEFAULT_USE_DUMP, dumpFileParameters.useDumpFile()); @@ -220,11 +221,11 @@ void checkDefaultDumpParameters() throws IOException { @Test void checkException() throws IOException { Files.createDirectories(fileSystem.getPath(USER_HOME)); - copyFile("/parametersSet/models.par", DynaWaltzParameters.DEFAULT_INPUT_PARAMETERS_FILE); - copyFile("/parametersSet/network.par", DynaWaltzParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); - copyFile("/parametersSet/solversMissingDefault.par", DynaWaltzParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); + copyFile("/parametersSet/models.par", DynawoSimulationParameters.DEFAULT_INPUT_PARAMETERS_FILE); + copyFile("/parametersSet/network.par", DynawoSimulationParameters.DEFAULT_INPUT_NETWORK_PARAMETERS_FILE); + copyFile("/parametersSet/solversMissingDefault.par", DynawoSimulationParameters.DEFAULT_INPUT_SOLVER_PARAMETERS_FILE); - PowsyblException e1 = assertThrows(PowsyblException.class, () -> DynaWaltzParameters.load(platformConfig, fileSystem)); + PowsyblException e1 = assertThrows(PowsyblException.class, () -> DynawoSimulationParameters.load(platformConfig, fileSystem)); assertEquals("Could not find parameters set with id='1' in file '/work/inmemory/solvers.par'", e1.getMessage()); try (InputStream is = getClass().getResourceAsStream("/parametersSet/solvers.par")) { @@ -238,7 +239,7 @@ void dumpFilesFolderNotFound() throws IOException { String folderProperty = USER_HOME + "wrongFolder"; String fileProperty = "dumpFile.dmp"; initDumpFilePlatformConfig(folderProperty, fileProperty); - PowsyblException e = assertThrows(PowsyblException.class, () -> DynaWaltzParameters.load(platformConfig, fileSystem)); + PowsyblException e = assertThrows(PowsyblException.class, () -> DynawoSimulationParameters.load(platformConfig, fileSystem)); assertEquals("Folder /home/user/wrongFolder set in 'dumpFileFolder' property cannot be found", e.getMessage()); } @@ -247,16 +248,16 @@ void dumpFileNotFound() throws IOException { String folderProperty = USER_HOME + "dumpFiles"; String fileProperty = "wrongFile.dmp"; initDumpFilePlatformConfig(folderProperty, fileProperty); - PowsyblException e = assertThrows(PowsyblException.class, () -> DynaWaltzParameters.load(platformConfig, fileSystem)); + PowsyblException e = assertThrows(PowsyblException.class, () -> DynawoSimulationParameters.load(platformConfig, fileSystem)); assertEquals("File wrongFile.dmp set in 'dumpFile' property cannot be found", e.getMessage()); } - private static void checkModelParameters(DynaWaltzParameters dynaWaltzParameters) { - Parameter booleanParameter = dynaWaltzParameters.getModelParameters("test").getParameters().get("boolean"); + private static void checkModelParameters(DynawoSimulationParameters dynawoSimulationParameters) { + Parameter booleanParameter = dynawoSimulationParameters.getModelParameters("test").getParameters().get("boolean"); assertEquals("true", booleanParameter.value()); assertEquals("boolean", booleanParameter.name()); assertEquals(ParameterType.BOOL, booleanParameter.type()); - Parameter stringParameter = dynaWaltzParameters.getModelParameters("test").getParameters().get("string"); + Parameter stringParameter = dynawoSimulationParameters.getModelParameters("test").getParameters().get("string"); assertEquals("aString", stringParameter.value()); assertEquals("string", stringParameter.name()); assertEquals(ParameterType.STRING, stringParameter.type()); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzProviderTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoProviderTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzProviderTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoProviderTest.java index 31ecd3ccc..e9e57124d 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/DynaWaltzProviderTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/DynawoProviderTest.java @@ -4,7 +4,7 @@ * 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/. */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; @@ -14,7 +14,7 @@ import com.powsybl.computation.local.LocalComputationConfig; import com.powsybl.computation.local.LocalComputationManager; import com.powsybl.dynamicsimulation.*; -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder; +import com.powsybl.dynawo.curves.DynawoCurvesBuilder; import com.powsybl.dynawo.commons.DynawoConstants; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.Substation; @@ -41,16 +41,16 @@ * @author Florian Dupuy {@literal } * @author Marcos de Miguel {@literal } */ -class DynaWaltzProviderTest extends AbstractSerDeTest { +class DynawoProviderTest extends AbstractSerDeTest { private static final String OUTPUT_IIDM_FILENAME = "outputIIDM.xml"; - private DynaWaltzConfig config; + private DynawoSimulationConfig config; @BeforeEach @Override public void setUp() throws IOException { super.setUp(); - config = DynaWaltzConfig.load(); + config = DynawoSimulationConfig.load(); } public static class CurvesSupplierMock implements CurvesSupplier { @@ -89,7 +89,7 @@ void testWithMergeLoads() throws Exception { LocalCommandExecutor commandExecutor = new LocalCommandExecutorMock("/dynawo_version.out", "/mergedLoads.xiidm"); ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicSimulationResult result = dynawoSimulation.run(network, (n, r) -> Collections.emptyList(), EventModelsSupplier.empty(), CurvesSupplier.empty(), network.getVariantManager().getWorkingVariantId(), computationManager, DynamicSimulationParameters.load(), NO_OP); @@ -103,11 +103,11 @@ void testWithoutMergeLoads() throws Exception { ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); DynamicSimulationParameters dynamicSimulationParameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynaWaltzParameters = DynaWaltzParameters.load(); - dynaWaltzParameters.setMergeLoads(false); - dynamicSimulationParameters.addExtension(DynaWaltzParameters.class, dynaWaltzParameters); + DynawoSimulationParameters dynawoSimulationParameters = DynawoSimulationParameters.load(); + dynawoSimulationParameters.setMergeLoads(false); + dynamicSimulationParameters.addExtension(DynawoSimulationParameters.class, dynawoSimulationParameters); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicSimulationResult result = dynawoSimulation.run(network, (n, r) -> Collections.emptyList(), EventModelsSupplier.empty(), CurvesSupplier.empty(), network.getVariantManager().getWorkingVariantId(), computationManager, dynamicSimulationParameters, NO_OP); @@ -126,12 +126,12 @@ void testWithDump() throws Exception { ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); DynamicSimulationParameters dynamicSimulationParameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynaWaltzParameters = DynaWaltzParameters.load() + DynawoSimulationParameters dynawoSimulationParameters = DynawoSimulationParameters.load() .setMergeLoads(false) .setDumpFileParameters(DumpFileParameters.createImportExportDumpFileParameters(folderPath, fileProperty)); - dynamicSimulationParameters.addExtension(DynaWaltzParameters.class, dynaWaltzParameters); + dynamicSimulationParameters.addExtension(DynawoSimulationParameters.class, dynawoSimulationParameters); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicSimulationResult result = dynawoSimulation.run(network, (n, r) -> Collections.emptyList(), EventModelsSupplier.empty(), CurvesSupplier.empty(), network.getVariantManager().getWorkingVariantId(), computationManager, dynamicSimulationParameters, NO_OP); @@ -144,7 +144,7 @@ void testFail() throws Exception { LocalCommandExecutor commandExecutor = new LocalCommandExecutorMock("/dynawo_version.out", null); ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicSimulationResult result = dynawoSimulation.run(network, (n, r) -> Collections.emptyList(), EventModelsSupplier.empty(), CurvesSupplier.empty(), network.getVariantManager().getWorkingVariantId(), computationManager, DynamicSimulationParameters.load(), NO_OP); @@ -158,7 +158,7 @@ void testWithoutCurves() throws Exception { LocalCommandExecutor commandExecutor = new LocalCommandExecutorMock("/dynawo_version.out", "/test.xiidm"); ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicSimulationResult result = dynawoSimulation.run(network, (n, r) -> Collections.emptyList(), EventModelsSupplier.empty(), new CurvesSupplierMock(), network.getVariantManager().getWorkingVariantId(), computationManager, DynamicSimulationParameters.load(), NO_OP); @@ -168,21 +168,21 @@ void testWithoutCurves() throws Exception { @Test void checkVersionCommand() { - String versionCommand = DynaWaltzProvider.getVersionCommand(config).toString(0); + String versionCommand = DynawoSimulationProvider.getVersionCommand(config).toString(0); if (SystemUtils.IS_OS_WINDOWS) { - assertEquals("[/home/dynawaltz/dynawo.cmd, version]", versionCommand); + assertEquals("[/home/dynawo/dynawo.cmd, version]", versionCommand); } else { - assertEquals("[/home/dynawaltz/dynawo.sh, version]", versionCommand); + assertEquals("[/home/dynawo/dynawo.sh, version]", versionCommand); } } @Test void checkExecutionCommand() { - String versionCommand = DynaWaltzProvider.getCommand(config).toString(0); + String versionCommand = DynawoSimulationProvider.getCommand(config).toString(0); if (SystemUtils.IS_OS_WINDOWS) { - assertEquals("[[/home/dynawaltz/dynawo.cmd, jobs, powsybl_dynawaltz.jobs]]", versionCommand); + assertEquals("[[/home/dynawo/dynawo.cmd, jobs, powsybl_dynawo.jobs]]", versionCommand); } else { - assertEquals("[[/home/dynawaltz/dynawo.sh, jobs, powsybl_dynawaltz.jobs]]", versionCommand); + assertEquals("[[/home/dynawo/dynawo.sh, jobs, powsybl_dynawo.jobs]]", versionCommand); } } @@ -192,7 +192,7 @@ void testCallingBadVersionDynawo() throws Exception { LocalCommandExecutor commandExecutor = new LocalCommandExecutorMock("/dynawo_bad_version.out", null); ComputationManager computationManager = new LocalComputationManager(new LocalComputationConfig(tmpDir, 1), commandExecutor, ForkJoinPool.commonPool()); DynamicSimulation.Runner dynawoSimulation = DynamicSimulation.find(); - assertEquals(DynaWaltzProvider.NAME, dynawoSimulation.getName()); + assertEquals(DynawoSimulationProvider.NAME, dynawoSimulation.getName()); DynamicModelsSupplier dms = (n, r) -> Collections.emptyList(); EventModelsSupplier ems = EventModelsSupplier.empty(); CurvesSupplier cs = CurvesSupplier.empty(); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/ModelsSimplifierTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/ModelsSimplifierTest.java similarity index 82% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/ModelsSimplifierTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/ModelsSimplifierTest.java index ec4cab7aa..85dd1509e 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/ModelsSimplifierTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/ModelsSimplifierTest.java @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz; +package com.powsybl.dynawo; import com.google.auto.service.AutoService; import com.google.common.collect.Lists; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.models.generators.AbstractGenerator; -import com.powsybl.dynawaltz.models.generators.GeneratorFictitiousBuilder; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.generators.AbstractGenerator; +import com.powsybl.dynawo.models.generators.GeneratorFictitiousBuilder; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ void loadSubstitutionSimplifiers() { void simplifyModels() { Network network = EurostagTutorialExample1Factory.create(); DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load().setUseModelSimplifiers(true); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load().setUseModelSimplifiers(true); List dynamicModels = List.of( GeneratorFictitiousBuilder.of(network) .dynamicModelId("BBM_GEN") @@ -66,7 +66,7 @@ void simplifyModels() { .staticId("NGEN_NHV1") .parameterSetId("TR") .build()); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, Collections.emptyList(), Collections.emptyList(), parameters, dynawoParameters); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, Collections.emptyList(), Collections.emptyList(), parameters, dynawoParameters); assertEquals(2, context.getBlackBoxDynamicModels().size()); assertFalse(context.getBlackBoxDynamicModelStream().anyMatch(bbm -> bbm.getDynamicModelId().equalsIgnoreCase("BBM_LOAD"))); assertTrue(context.getBlackBoxDynamicModelStream().anyMatch(bbm -> bbm.getDynamicModelId().equalsIgnoreCase("newModel"))); @@ -83,7 +83,7 @@ public Predicate getModelRemovalPredicate(ReportNode reportNode) @AutoService(ModelsSubstitutionSimplifier.class) public static class ModelsSimplifierSubstitution implements ModelsSubstitutionSimplifier { @Override - public Function getModelSubstitutionFunction(Network network, DynaWaltzParameters dynaWaltzParameters, ReportNode reportNode) { + public Function getModelSubstitutionFunction(Network network, DynawoSimulationParameters dynawoSimulationParameters, ReportNode reportNode) { return m -> { if ("BBM_GEN".equalsIgnoreCase(m.getDynamicModelId()) && m instanceof AbstractGenerator gen) { return GeneratorFictitiousBuilder.of(network) diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/BuilderConfigTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/BuilderConfigTest.java similarity index 62% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/BuilderConfigTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/BuilderConfigTest.java index f123f4d71..a5f5c2ad8 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/BuilderConfigTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/BuilderConfigTest.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModel; @@ -22,21 +22,21 @@ */ class BuilderConfigTest { - private static Network NETWORK; - private static ModelConfigsHandler MODEL_CONFIGS_HANDLER; + private static Network network; + private static ModelConfigsHandler modelConfigsHandler; @BeforeAll static void setup() { - NETWORK = EurostagTutorialExample1Factory.create(); - MODEL_CONFIGS_HANDLER = ModelConfigsHandler.getInstance(); + network = EurostagTutorialExample1Factory.create(); + modelConfigsHandler = ModelConfigsHandler.getInstance(); } @Test void testModelBuilders() { - for (BuilderConfig builderConfig : MODEL_CONFIGS_HANDLER.getBuilderConfigs()) { + for (BuilderConfig builderConfig : modelConfigsHandler.getBuilderConfigs()) { String modelName = builderConfig.getModelInfos().iterator().next().name(); - ModelBuilder handlerBuilder = MODEL_CONFIGS_HANDLER.getModelBuilder(NETWORK, modelName, ReportNode.NO_OP); - ModelBuilder configBuilder = builderConfig.getBuilderConstructor().createBuilder(NETWORK, modelName, ReportNode.NO_OP); + ModelBuilder handlerBuilder = modelConfigsHandler.getModelBuilder(network, modelName, ReportNode.NO_OP); + ModelBuilder configBuilder = builderConfig.getBuilderConstructor().createBuilder(network, modelName, ReportNode.NO_OP); assertNotNull(handlerBuilder); assertEquals(handlerBuilder.getClass(), configBuilder.getClass()); } @@ -44,9 +44,9 @@ void testModelBuilders() { @Test void testEventBuilders() { - for (EventBuilderConfig eventBuilderConfig : MODEL_CONFIGS_HANDLER.getEventBuilderConfigs()) { - ModelBuilder handlerBuilder = MODEL_CONFIGS_HANDLER.getEventModelBuilder(NETWORK, eventBuilderConfig.getEventModelInfo().name(), ReportNode.NO_OP); - ModelBuilder configBuilder = eventBuilderConfig.getBuilderConstructor().createBuilder(NETWORK, ReportNode.NO_OP); + for (EventBuilderConfig eventBuilderConfig : modelConfigsHandler.getEventBuilderConfigs()) { + ModelBuilder handlerBuilder = modelConfigsHandler.getEventModelBuilder(network, eventBuilderConfig.getEventModelInfo().name(), ReportNode.NO_OP); + ModelBuilder configBuilder = eventBuilderConfig.getBuilderConstructor().createBuilder(network, ReportNode.NO_OP); assertNotNull(handlerBuilder); assertEquals(handlerBuilder.getClass(), configBuilder.getClass()); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/CurvesBuilderTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/CurvesBuilderTest.java similarity index 96% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/CurvesBuilderTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/CurvesBuilderTest.java index 189862a8e..0d4eddf57 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/CurvesBuilderTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/CurvesBuilderTest.java @@ -1,10 +1,10 @@ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.TestUtil; import com.powsybl.dynamicsimulation.Curve; -import com.powsybl.dynawaltz.curves.DynawoCurve; -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder; +import com.powsybl.dynawo.curves.DynawoCurve; +import com.powsybl.dynawo.curves.DynawoCurvesBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/DefaultLibBuilderTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/DefaultLibBuilderTest.java similarity index 76% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/DefaultLibBuilderTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/DefaultLibBuilderTest.java index 1bab6e406..3f5bdc6c4 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/DefaultLibBuilderTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/DefaultLibBuilderTest.java @@ -5,26 +5,26 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.UnderVoltageAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.buses.InfiniteBusBuilder; -import com.powsybl.dynawaltz.models.buses.StandardBusBuilder; -import com.powsybl.dynawaltz.models.generators.*; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; -import com.powsybl.dynawaltz.models.lines.LineBuilder; -import com.powsybl.dynawaltz.models.loads.*; -import com.powsybl.dynawaltz.models.shunts.BaseShuntBuilder; -import com.powsybl.dynawaltz.models.svarcs.BaseStaticVarCompensatorBuilder; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.UnderVoltageAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; +import com.powsybl.dynawo.models.buses.InfiniteBusBuilder; +import com.powsybl.dynawo.models.buses.StandardBusBuilder; +import com.powsybl.dynawo.models.generators.*; +import com.powsybl.dynawo.models.loads.*; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.lines.LineBuilder; +import com.powsybl.dynawo.models.shunts.BaseShuntBuilder; +import com.powsybl.dynawo.models.svarcs.BaseStaticVarCompensatorBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.SvcTestCaseFactory; import org.junit.jupiter.api.Test; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/ModelConfigLoaderTest.java similarity index 99% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/ModelConfigLoaderTest.java index c8f12d254..3280f74c6 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/builders/ModelConfigLoaderTest.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.builders; +package com.powsybl.dynawo.builders; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/ActionConnectionPointTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/ActionConnectionPointTest.java similarity index 92% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/ActionConnectionPointTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/ActionConnectionPointTest.java index 724616312..27d83f72c 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/ActionConnectionPointTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/ActionConnectionPointTest.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.builders.BuildersUtil; +import com.powsybl.dynawo.builders.BuildersUtil; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import com.powsybl.iidm.network.test.HvdcTestNetwork; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/BuilderEquipmentSetterTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/BuilderEquipmentSetterTest.java similarity index 95% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/BuilderEquipmentSetterTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/BuilderEquipmentSetterTest.java index 95e61ee9f..3307f753e 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/BuilderEquipmentSetterTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/BuilderEquipmentSetterTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.TestUtil; -import com.powsybl.dynawaltz.models.lines.LineBuilder; +import com.powsybl.dynawo.models.lines.LineBuilder; import com.powsybl.iidm.network.Line; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.PhaseShifterTestCaseFactory; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/HvdcTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/HvdcTest.java similarity index 90% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/HvdcTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/HvdcTest.java index ce94b9aa9..8c402c93a 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/HvdcTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/HvdcTest.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcP; -import com.powsybl.dynawaltz.models.hvdc.HvdcVsc; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcP; +import com.powsybl.dynawo.models.hvdc.HvdcVsc; import com.powsybl.iidm.network.HvdcLine; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/LoadTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/LoadTest.java similarity index 92% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/LoadTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/LoadTest.java index 0db1eab23..e159df914 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/LoadTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/LoadTest.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models; +package com.powsybl.dynawo.models; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.NoEquipmentNetworkFactory; import org.junit.jupiter.api.Test; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/buses/StandardBusTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/buses/StandardBusTest.java similarity index 82% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/buses/StandardBusTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/buses/StandardBusTest.java index 80fe00051..7f3f1ac11 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/buses/StandardBusTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/buses/StandardBusTest.java @@ -6,14 +6,14 @@ * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.buses; +package com.powsybl.dynawo.models.buses; import com.powsybl.commons.PowsyblException; import com.powsybl.dynamicsimulation.Curve; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.NetworkFactory; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; @@ -42,11 +42,11 @@ void connectionToModelWithoutDynamicModelException() { .parameterSetId("SB") .build()); DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); String workingVariantId = network.getVariantManager().getWorkingVariantId(); List events = Collections.emptyList(); List curves = Collections.emptyList(); - PowsyblException e = assertThrows(PowsyblException.class, () -> new DynaWaltzContext(network, workingVariantId, dynamicModels, events, curves, parameters, dynawoParameters)); + PowsyblException e = assertThrows(PowsyblException.class, () -> new DynawoSimulationContext(network, workingVariantId, dynamicModels, events, curves, parameters, dynawoParameters)); assertEquals("The equipment NHV1_NHV2_1 linked to the StandardBus NHV1 does not possess a dynamic model", e.getMessage()); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelHandlerTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelHandlerTest.java similarity index 90% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelHandlerTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelHandlerTest.java index be049b2ab..8829ff332 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/defaultmodels/DefaultModelHandlerTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/defaultmodels/DefaultModelHandlerTest.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.defaultmodels; +package com.powsybl.dynawo.models.defaultmodels; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.Model; -import com.powsybl.dynawaltz.models.buses.EquipmentConnectionPoint; -import com.powsybl.dynawaltz.models.generators.GeneratorModel; -import com.powsybl.dynawaltz.models.shunts.ShuntModel; +import com.powsybl.dynawo.models.Model; +import com.powsybl.dynawo.models.buses.EquipmentConnectionPoint; +import com.powsybl.dynawo.models.generators.GeneratorModel; +import com.powsybl.dynawo.models.shunts.ShuntModel; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.Generator; import com.powsybl.iidm.network.Network; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/lines/StandardLineTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/lines/StandardLineTest.java similarity index 83% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/models/lines/StandardLineTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/models/lines/StandardLineTest.java index 22c7f19da..81e9b2c64 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/models/lines/StandardLineTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/models/lines/StandardLineTest.java @@ -5,14 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.models.lines; +package com.powsybl.dynawo.models.lines; import com.powsybl.dynamicsimulation.Curve; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; import com.powsybl.iidm.network.*; import org.junit.jupiter.api.Test; @@ -49,12 +49,12 @@ void connectionToDynamicOverloadManagementSystemException() { .iMeasurementSide(TwoSides.ONE) .build()); DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); String workingVariantId = network.getVariantManager().getWorkingVariantId(); List events = Collections.emptyList(); List curves = Collections.emptyList(); UnsupportedOperationException e = assertThrows(UnsupportedOperationException.class, - () -> new DynaWaltzContext(network, workingVariantId, dynamicModels, events, curves, parameters, dynawoParameters)); + () -> new DynawoSimulationContext(network, workingVariantId, dynamicModels, events, curves, parameters, dynawoParameters)); assertEquals("i variable not implemented in StandardLine dynawo's model", e.getMessage()); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoCurvesJsonDeserializerTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoCurvesJsonDeserializerTest.java similarity index 91% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoCurvesJsonDeserializerTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoCurvesJsonDeserializerTest.java index 83f3cdd58..e9523a8db 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoCurvesJsonDeserializerTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoCurvesJsonDeserializerTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.powsybl.dynamicsimulation.Curve; -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder; -import com.powsybl.dynawaltz.suppliers.curves.CurvesJsonDeserializer; +import com.powsybl.dynawo.curves.DynawoCurvesBuilder; +import com.powsybl.dynawo.suppliers.curves.CurvesJsonDeserializer; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoEventModelsSupplierTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoEventModelsSupplierTest.java similarity index 93% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoEventModelsSupplierTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoEventModelsSupplierTest.java index e5b914866..9c64ce9d6 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoEventModelsSupplierTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoEventModelsSupplierTest.java @@ -5,14 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.EventModel; -import com.powsybl.dynawaltz.models.events.EventActivePowerVariationBuilder; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.suppliers.events.*; +import com.powsybl.dynawo.models.events.EventActivePowerVariationBuilder; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.suppliers.events.DynawoEventModelsSupplier; +import com.powsybl.dynawo.suppliers.events.EventModelConfig; +import com.powsybl.dynawo.suppliers.events.EventModelConfigsJsonDeserializer; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoModelsSupplierTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoModelsSupplierTest.java similarity index 94% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoModelsSupplierTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoModelsSupplierTest.java index adfe1d171..587dea080 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/DynawoModelsSupplierTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/DynawoModelsSupplierTest.java @@ -5,15 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.powsybl.commons.PowsyblException; import com.powsybl.commons.report.ReportNode; import com.powsybl.dynamicsimulation.DynamicModel; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder; -import com.powsybl.dynawaltz.suppliers.dynamicmodels.DynamicModelConfig; -import com.powsybl.dynawaltz.suppliers.dynamicmodels.*; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynamicModelConfig; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynamicModelConfigsJsonDeserializer; +import com.powsybl.dynawo.suppliers.dynamicmodels.DynawoModelsSupplier; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializerTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializerTest.java similarity index 89% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializerTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializerTest.java index e64dbd19c..3d3c15098 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/suppliers/SupplierJsonDeserializerTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/suppliers/SupplierJsonDeserializerTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.suppliers; +package com.powsybl.dynawo.suppliers; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.suppliers.events.EventModelConfig; -import com.powsybl.dynawaltz.suppliers.events.EventModelConfigsJsonDeserializer; +import com.powsybl.dynawo.suppliers.events.EventModelConfig; +import com.powsybl.dynawo.suppliers.events.EventModelConfigsJsonDeserializer; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractDynamicModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractDynamicModelXmlTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractDynamicModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractDynamicModelXmlTest.java index edeefd6eb..4f86ea48d 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractDynamicModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractDynamicModelXmlTest.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.commons.test.TestUtil; import com.powsybl.dynamicsimulation.Curve; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -47,14 +47,14 @@ public abstract class AbstractDynamicModelXmlTest extends AbstractSerDeTest { protected List dynamicModels = new ArrayList<>(); protected List eventModels = new ArrayList<>(); protected List curves = new ArrayList<>(); - protected DynaWaltzContext context; + protected DynawoSimulationContext context; protected ReportNode reportNode = ReportNode.newRootReportNode().withMessageTemplate("testDyd", "Test DYD").build(); @BeforeEach void setup() { setupNetwork(); addDynamicModels(); - setupDynawaltzContext(); + setupDynawoContext(); } @AfterEach @@ -76,10 +76,10 @@ public void validate(String schemaDefinition, String expectedResourceName, Path assertTxtEquals(expected, actual); } - void setupDynawaltzContext() { + void setupDynawoContext() { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters, reportNode); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters, reportNode); } protected abstract void setupNetwork(); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractParametrizedDynamicModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractParametrizedDynamicModelXmlTest.java similarity index 83% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractParametrizedDynamicModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractParametrizedDynamicModelXmlTest.java index 01ed9f05e..746b98fdd 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/AbstractParametrizedDynamicModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/AbstractParametrizedDynamicModelXmlTest.java @@ -5,16 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.report.ReportNode; import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.commons.test.TestUtil; import com.powsybl.dynamicsimulation.Curve; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import org.xml.sax.SAXException; @@ -45,7 +45,7 @@ public abstract class AbstractParametrizedDynamicModelXmlTest extends AbstractSe protected List dynamicModels = new ArrayList<>(); protected List eventModels = new ArrayList<>(); protected List curves = new ArrayList<>(); - protected DynaWaltzContext context; + protected DynawoSimulationContext context; protected ReportNode reportNode = ReportNode.newRootReportNode().withMessageTemplate("testDyd", "Test DYD").build(); public void validate(String schemaDefinition, String expectedResourceName, Path xmlFile) throws SAXException, IOException { @@ -60,10 +60,10 @@ public void validate(String schemaDefinition, String expectedResourceName, Path assertTxtEquals(expected, actual); } - protected void setupDynawaltzContext() { + protected void setupDynawoContext() { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters, reportNode); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters, reportNode); } protected void checkReport(String report) throws IOException { diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ActivePowerVariationEventXmlTest.java similarity index 87% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ActivePowerVariationEventXmlTest.java index a428134dc..7c962babf 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ActivePowerVariationEventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ActivePowerVariationEventXmlTest.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.events.EventActivePowerVariationBuilder; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorBuilder; +import com.powsybl.dynawo.models.events.EventActivePowerVariationBuilder; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder; +import com.powsybl.dynawo.models.generators.SynchronousGeneratorBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -75,7 +75,7 @@ protected void addDynamicModels() { void writeDisconnectModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "apv_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "apv_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "apv_par.xml", tmpDir.resolve(context.getSimulationParFile())); validate("parameters.xsd", "apv_network_par.xml", tmpDir.resolve("network.par")); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CurvesXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CurvesXmlTest.java similarity index 59% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CurvesXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CurvesXmlTest.java index eecc62f9e..71a55854a 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CurvesXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CurvesXmlTest.java @@ -4,11 +4,11 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -17,16 +17,16 @@ /** * @author Marcos de Miguel {@literal } */ -class CurvesXmlTest extends DynaWaltzTestUtil { +class CurvesXmlTest extends DynawoTestUtil { @Test void writeCurve() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); CurvesXml.write(tmpDir, context); - validate("curvesInput.xsd", "curvesInput.xml", tmpDir.resolve(DynaWaltzConstants.CRV_FILENAME)); + validate("curvesInput.xsd", "curvesInput.xml", tmpDir.resolve(DynawoSimulationConstants.CRV_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CustomParameterResolver.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CustomParameterResolver.java similarity index 99% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CustomParameterResolver.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CustomParameterResolver.java index 9e5e9202b..684ec1cea 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/CustomParameterResolver.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/CustomParameterResolver.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectBranchEventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectBranchEventXmlTest.java similarity index 91% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectBranchEventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectBranchEventXmlTest.java index f2a60880a..d20a59408 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectBranchEventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectBranchEventXmlTest.java @@ -5,9 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ protected void addDynamicModels() { void writeDisconnectModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "disconnect_branch_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "disconnect_branch_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "disconnect_branch_par.xml", tmpDir.resolve(context.getSimulationParFile())); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectEventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectEventXmlTest.java similarity index 90% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectEventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectEventXmlTest.java index a5a5dd348..b50bd6614 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectEventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectEventXmlTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.generators.GeneratorFictitiousBuilder; -import com.powsybl.dynawaltz.models.shunts.BaseShuntBuilder; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.generators.GeneratorFictitiousBuilder; +import com.powsybl.dynawo.models.shunts.BaseShuntBuilder; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.VoltageLevel; import com.powsybl.iidm.network.test.SvcTestCaseFactory; @@ -74,7 +74,7 @@ protected void addDynamicModels() { void writeDisconnectModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "disconnect_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "disconnect_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "disconnect_par.xml", tmpDir.resolve(context.getSimulationParFile())); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectHvdcEventXmlTest.java similarity index 91% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectHvdcEventXmlTest.java index 0f105ca9b..5b5a0f22d 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectHvdcEventXmlTest.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.HvdcTestNetwork; @@ -21,7 +21,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.function.Function; import java.util.stream.Stream; @@ -39,7 +38,7 @@ class DisconnectHvdcEventXmlTest extends AbstractParametrizedDynamicModelXmlTest void setup(String dydName, Function< Network, BlackBoxModel> hvdcConstructor, Function< Network, BlackBoxModel> disconnectConstructor) { setupNetwork(); addDynamicModels(hvdcConstructor, disconnectConstructor); - setupDynawaltzContext(); + setupDynawoContext(); } protected void setupNetwork() { @@ -55,10 +54,10 @@ protected void addDynamicModels(Function< Network, BlackBoxModel> hvdcConstructo @ParameterizedTest(name = "{0}") @MethodSource("provideModels") - void writeModel(String dydName, Function< Network, BlackBoxModel> hvdcConstructor, Function< Network, BlackBoxModel> disconnectConstructor) throws SAXException, IOException, XMLStreamException { + void writeModel(String dydName, Function< Network, BlackBoxModel> hvdcConstructor, Function< Network, BlackBoxModel> disconnectConstructor) throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", dydName, tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "disconnect_hvdc_par.xml", tmpDir.resolve(context.getSimulationParFile())); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectionExceptionXmlTest.java similarity index 91% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectionExceptionXmlTest.java index 86f32da23..a61baa03a 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DisconnectionExceptionXmlTest.java @@ -5,13 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.HvdcTestNetwork; @@ -55,7 +55,7 @@ protected void addDynamicModels(TwoSides side, BiFunction constructor) { - Exception e = assertThrows(PowsyblException.class, this::setupDynawaltzContext); + Exception e = assertThrows(PowsyblException.class, this::setupDynawoContext); assertEquals(exception, e.getMessage()); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicModelsXmlTest.java similarity index 66% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicModelsXmlTest.java index ddce3dfb5..d6e38cb33 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicModelsXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicModelsXmlTest.java @@ -4,16 +4,16 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.PowsyblException; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.generators.GeneratorFictitiousBuilder; -import com.powsybl.dynawaltz.models.lines.LineModel; -import com.powsybl.dynawaltz.models.loads.BaseLoad; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.generators.GeneratorFictitiousBuilder; +import com.powsybl.dynawo.models.lines.LineModel; +import com.powsybl.dynawo.models.loads.BaseLoad; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; import com.powsybl.iidm.network.Identifiable; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -29,22 +29,22 @@ * @author Marcos de Miguel {@literal } * @author Laurent Issertial {@literal } */ -class DynamicModelsXmlTest extends DynaWaltzTestUtil { +class DynamicModelsXmlTest extends DynawoTestUtil { @Test void writeDynamicModel() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, new ArrayList<>(), curves, parameters, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, new ArrayList<>(), curves, parameters, dynawoParameters); DydXml.write(tmpDir, context); - validate("dyd.xsd", "dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } @Test void writeDynamicModelWithLoadsAndOnlyOneFictitiousGenerator() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); dynamicModels.clear(); dynamicModels.add(GeneratorFictitiousBuilder.of(network) .dynamicModelId("BBM_GEN6") @@ -52,10 +52,10 @@ void writeDynamicModelWithLoadsAndOnlyOneFictitiousGenerator() throws SAXExcepti .parameterSetId("GF") .build()); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, new ArrayList<>(), curves, parameters, dynawoParameters); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, new ArrayList<>(), curves, parameters, dynawoParameters); DydXml.write(tmpDir, context); - validate("dyd.xsd", "dyd_fictitious.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "dyd_fictitious.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } @Test @@ -74,7 +74,7 @@ void duplicateStaticId() { dynamicModels.add(load1); dynamicModels.add(load2); String workingVariantId = network.getVariantManager().getWorkingVariantId(); - DynaWaltzContext context = new DynaWaltzContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynaWaltzParameters.load()); + DynawoSimulationContext context = new DynawoSimulationContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynawoSimulationParameters.load()); Assertions.assertThat(context.getBlackBoxDynamicModels()).containsExactly(load1); } @@ -94,13 +94,13 @@ void duplicateDynamicId() { dynamicModels.add(load1); dynamicModels.add(load2); String workingVariantId = network.getVariantManager().getWorkingVariantId(); - DynaWaltzContext context = new DynaWaltzContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynaWaltzParameters.load()); + DynawoSimulationContext context = new DynawoSimulationContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynawoSimulationParameters.load()); Assertions.assertThat(context.getBlackBoxDynamicModels()).containsExactly(load1); } @Test void testIncorrectModelException() { - DynaWaltzContext dc = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynaWaltzParameters.load()); + DynawoSimulationContext dc = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynawoSimulationParameters.load()); Identifiable gen = network.getIdentifiable("GEN5"); Exception e = assertThrows(PowsyblException.class, () -> dc.getDynamicModel(gen, LineModel.class, true)); assertEquals("The model identified by the static id GEN5 does not match the expected model (LineModel)", e.getMessage()); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicOverloadManagementSystemModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicOverloadManagementSystemModelXmlTest.java similarity index 83% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicOverloadManagementSystemModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicOverloadManagementSystemModelXmlTest.java index b4628ab59..86695a7b9 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicOverloadManagementSystemModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicOverloadManagementSystemModelXmlTest.java @@ -5,16 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -58,8 +57,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "cla_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "cla_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java similarity index 82% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java index dc1e4a792..ad05587f0 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynamicTwoLevelsOverloadManagementSystemModelXmlTest.java @@ -5,15 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicTwoLevelsOverloadManagementSystemBuilder; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -40,8 +39,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "cla_tl_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "cla_tl_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynawoTestUtil.java similarity index 92% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynawoTestUtil.java index 47fe34d6c..399d56244 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DynaWaltzTestUtil.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/DynawoTestUtil.java @@ -4,21 +4,21 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.dynamicsimulation.Curve; -import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.generators.GeneratorFictitiousBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorBuilder; -import com.powsybl.dynawaltz.models.lines.LineBuilder; -import com.powsybl.dynawaltz.models.lines.StandardLine; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; -import com.powsybl.dynawaltz.models.loads.LoadOneTransformerBuilder; +import com.powsybl.dynawo.curves.DynawoCurvesBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.generators.GeneratorFictitiousBuilder; +import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder; +import com.powsybl.dynawo.models.generators.SynchronousGeneratorBuilder; +import com.powsybl.dynawo.models.lines.LineBuilder; +import com.powsybl.dynawo.models.lines.StandardLine; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerBuilder; import com.powsybl.iidm.network.*; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.BeforeEach; @@ -42,7 +42,7 @@ /** * @author Marcos de Miguel {@literal } */ -public class DynaWaltzTestUtil extends AbstractSerDeTest { +public class DynawoTestUtil extends AbstractSerDeTest { protected Network network; protected List dynamicModels; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyPhaseShifterBlockingIXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyPhaseShifterBlockingIXmlTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyPhaseShifterBlockingIXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyPhaseShifterBlockingIXmlTest.java index 8b66568b6..3d8bb13a5 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyPhaseShifterBlockingIXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyPhaseShifterBlockingIXmlTest.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -48,14 +48,14 @@ protected void addDynamicModels() { void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "empty_phase_shifter_blocking_i_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "empty_phase_shifter_blocking_i_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); checkReport(""" + Test DYD Model BBM_PS instantiation successful Model BBM_PSB instantiation successful 'phaseShifterId' field is not set Model BBM_PSB2 cannot be instantiated - + Dynawaltz models processing + + Dynawo models processing PhaseShifterBlockingI BBM_PSB equipment WRONG_ID is not a PhaseShifterIModel, the automation system will be skipped """); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerAutomationSystemXmlTest.java similarity index 80% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerAutomationSystemXmlTest.java index b95c16968..c1f4d73d7 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerAutomationSystemXmlTest.java @@ -5,15 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.loads.BaseLoadBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -41,13 +40,13 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "tap_changer_empty_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tap_changer_empty_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); checkReport(""" + Test DYD - + Dynawaltz models processing + + Dynawo models processing TapChangerAutomaton BBM_TC equipment LOAD is not a LoadWithTransformers, the automation system will be skipped """); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java similarity index 82% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java index 9848ed88e..926248298 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EmptyTapChangerBlockingAutomationSystemXmlTest.java @@ -5,16 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.loads.LoadOneTransformerBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -55,13 +54,13 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "tap_changer_blocking_empty_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tap_changer_blocking_empty_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); checkReport(""" + Test DYD - + Dynawaltz models processing + + Dynawo models processing TapChangerAutomaton BBM_TC equipment LOAD2 is not a LoadWithTransformers, the automation system will be skipped None of TapChangerBlockingAutomaton BBM_TapChangerBlocking equipments are TapChangerModel, the automation system will be skipped """); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EventXmlTest.java similarity index 72% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EventXmlTest.java index 1ae1e24c6..d70fbd112 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/EventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/EventXmlTest.java @@ -4,14 +4,14 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorBuilder; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.events.EventDisconnectionBuilder; +import com.powsybl.dynawo.models.generators.SynchronousGeneratorBuilder; import com.powsybl.iidm.network.TwoSides; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ /** * @author Marcos de Miguel {@literal } */ -class EventXmlTest extends DynaWaltzTestUtil { +class EventXmlTest extends DynawoTestUtil { @Test void writeDynamicModel() throws SAXException, IOException { @@ -33,12 +33,12 @@ void writeDynamicModel() throws SAXException, IOException { .parameterSetId("GSFWPR") .build()); DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); DydXml.write(tmpDir, context); - validate("dyd.xsd", "events.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "events.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } @Test @@ -66,7 +66,7 @@ void duplicateEventId() { eventModels.add(event1Duplicate); eventModels.add(event2Duplicate); String workingVariantId = network.getVariantManager().getWorkingVariantId(); - DynaWaltzContext context = new DynaWaltzContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynaWaltzParameters.load()); + DynawoSimulationContext context = new DynawoSimulationContext(network, workingVariantId, dynamicModels, eventModels, curves, DynamicSimulationParameters.load(), DynawoSimulationParameters.load()); Assertions.assertThat(context.getBlackBoxEventModels()).containsExactly(event1, event2); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/HvdcXmlTest.java similarity index 87% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/HvdcXmlTest.java index 68466b3c6..96624d6cf 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/HvdcXmlTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.hvdc.HvdcPBuilder; -import com.powsybl.dynawaltz.models.hvdc.HvdcVscBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; +import com.powsybl.dynawo.models.hvdc.HvdcPBuilder; +import com.powsybl.dynawo.models.hvdc.HvdcVscBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.TwoSides; import com.powsybl.iidm.network.test.HvdcTestNetwork; @@ -20,7 +20,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.function.Function; import java.util.stream.Stream; @@ -38,7 +37,7 @@ class HvdcXmlTest extends AbstractParametrizedDynamicModelXmlTest { void setup(String dydName, Function< Network, BlackBoxModel> constructor) { setupNetwork(); addDynamicModels(constructor); - setupDynawaltzContext(); + setupDynawoContext(); } protected void setupNetwork() { @@ -51,9 +50,9 @@ protected void addDynamicModels(Function< Network, BlackBoxModel> constructor) { @ParameterizedTest(name = "{0}") @MethodSource("provideHvdc") - void writeHvdcModel(String dydName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException { + void writeHvdcModel(String dydName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", dydName, tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } private static Stream provideHvdc() { diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/JobsXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/JobsXmlTest.java similarity index 51% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/JobsXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/JobsXmlTest.java index 034326916..607c0d5f6 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/JobsXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/JobsXmlTest.java @@ -4,12 +4,12 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DumpFileParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DumpFileParameters; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -20,38 +20,38 @@ /** * @author Marcos de Miguel {@literal } */ -class JobsXmlTest extends DynaWaltzTestUtil { +class JobsXmlTest extends DynawoTestUtil { @Test void writeJob() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); JobsXml.write(tmpDir, context); - validate("jobs.xsd", "jobs.xml", tmpDir.resolve(DynaWaltzConstants.JOBS_FILENAME)); + validate("jobs.xsd", "jobs.xml", tmpDir.resolve(DynawoSimulationConstants.JOBS_FILENAME)); } @Test void writeJobWithDumpFile() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load() + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load() .setDumpFileParameters(DumpFileParameters.createImportExportDumpFileParameters(Path.of("/dumpFiles"), "dump.dmp")); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); JobsXml.write(tmpDir, context); - validate("jobs.xsd", "jobsWithDump.xml", tmpDir.resolve(DynaWaltzConstants.JOBS_FILENAME)); + validate("jobs.xsd", "jobsWithDump.xml", tmpDir.resolve(DynawoSimulationConstants.JOBS_FILENAME)); } @Test void writeJobWithSpecificLogs() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load() - .setSpecificLogs(EnumSet.allOf(DynaWaltzParameters.SpecificLog.class)); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load() + .setSpecificLogs(EnumSet.allOf(DynawoSimulationParameters.SpecificLog.class)); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); JobsXml.write(tmpDir, context); - validate("jobs.xsd", "jobsWithSpecificLogs.xml", tmpDir.resolve(DynaWaltzConstants.JOBS_FILENAME)); + validate("jobs.xsd", "jobsWithSpecificLogs.xml", tmpDir.resolve(DynawoSimulationConstants.JOBS_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/LoadsModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/LoadsModelXmlTest.java similarity index 91% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/LoadsModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/LoadsModelXmlTest.java index 42c451e8a..d2ca79429 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/LoadsModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/LoadsModelXmlTest.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.loads.*; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.loads.*; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.BeforeEach; @@ -18,7 +18,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.function.Function; import java.util.stream.Stream; @@ -36,7 +35,7 @@ class LoadsModelXmlTest extends AbstractParametrizedDynamicModelXmlTest { void setup(String dydName, Function< Network, BlackBoxModel> loadConstructor) { setupNetwork(); addDynamicModels(loadConstructor); - setupDynawaltzContext(); + setupDynawoContext(); } protected void setupNetwork() { @@ -49,9 +48,9 @@ protected void addDynamicModels(Function< Network, BlackBoxModel> loadConstructo @ParameterizedTest(name = "{0}") @MethodSource("provideLoads") - void writeLoadModel(String dydName, Function< Network, BlackBoxModel> loadConstructor) throws SAXException, IOException, XMLStreamException { + void writeLoadModel(String dydName, Function< Network, BlackBoxModel> loadConstructor) throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", dydName + ".xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", dydName + ".xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } private static Stream provideLoads() { diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/MappedParameterContext.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/MappedParameterContext.java similarity index 97% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/MappedParameterContext.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/MappedParameterContext.java index d3327c44a..a0b76f5fd 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/MappedParameterContext.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/MappedParameterContext.java @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.platform.commons.util.AnnotationUtils; diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/NodeFaultEventXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/NodeFaultEventXmlTest.java similarity index 84% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/NodeFaultEventXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/NodeFaultEventXmlTest.java index 764b27773..ac34e76be 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/NodeFaultEventXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/NodeFaultEventXmlTest.java @@ -5,14 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.events.NodeFaultEventBuilder; +import com.powsybl.dynawo.models.events.NodeFaultEventBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -37,10 +36,10 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "node_fault_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "node_fault_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "node_fault_par.xml", tmpDir.resolve(context.getSimulationParFile())); validate("parameters.xsd", "node_network_par.xml", tmpDir.resolve("network.par")); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/OmegaRefModelXmlTest.java similarity index 84% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/OmegaRefModelXmlTest.java index 4fd4f0d34..61e8faa6c 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/OmegaRefModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/OmegaRefModelXmlTest.java @@ -5,15 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronousGeneratorBuilder; +import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder; +import com.powsybl.dynawo.models.generators.SynchronousGeneratorBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -46,10 +45,10 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "omega_ref_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "omega_ref_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "omega_ref_par.xml", tmpDir.resolve(context.getSimulationParFile())); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ParametersXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ParametersXmlTest.java similarity index 63% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ParametersXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ParametersXmlTest.java index e71d57ba9..2eccf1ea8 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ParametersXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ParametersXmlTest.java @@ -4,12 +4,12 @@ * 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/. */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.config.PlatformConfig; import com.powsybl.dynamicsimulation.DynamicSimulationParameters; -import com.powsybl.dynawaltz.DynaWaltzContext; -import com.powsybl.dynawaltz.DynaWaltzParameters; +import com.powsybl.dynawo.DynawoSimulationContext; +import com.powsybl.dynawo.DynawoSimulationParameters; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -18,13 +18,13 @@ /** * @author Marcos de Miguel {@literal } */ -class ParametersXmlTest extends DynaWaltzTestUtil { +class ParametersXmlTest extends DynawoTestUtil { @Test void writeOmegaRef() throws SAXException, IOException { DynamicSimulationParameters parameters = DynamicSimulationParameters.load(); - DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load(PlatformConfig.defaultConfig(), fileSystem); - DynaWaltzContext context = new DynaWaltzContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); + DynawoSimulationParameters dynawoParameters = DynawoSimulationParameters.load(PlatformConfig.defaultConfig(), fileSystem); + DynawoSimulationContext context = new DynawoSimulationContext(network, network.getVariantManager().getWorkingVariantId(), dynamicModels, eventModels, curves, parameters, dynawoParameters); DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShifterBlockingIXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShifterBlockingIXmlTest.java similarity index 83% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShifterBlockingIXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShifterBlockingIXmlTest.java index e7ce94a6a..91aef6f4b 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShifterBlockingIXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShifterBlockingIXmlTest.java @@ -5,10 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterBlockingIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; @@ -43,6 +43,6 @@ protected void addDynamicModels() { void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "phase_shifter_blocking_i_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "phase_shifter_blocking_i_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShiftersXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShiftersXmlTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShiftersXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShiftersXmlTest.java index 30e8b79d8..737cbf054 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/PhaseShiftersXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/PhaseShiftersXmlTest.java @@ -5,12 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterIAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.phaseshifters.PhaseShifterPAutomationSystemBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.BeforeEach; @@ -20,7 +20,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.function.Function; import java.util.stream.Stream; @@ -38,7 +37,7 @@ class PhaseShiftersXmlTest extends AbstractParametrizedDynamicModelXmlTest { void setup(String dydName, Function phaseShifterConstructor, boolean dynamicTransformer) { setupNetwork(); addDynamicModels(phaseShifterConstructor, dynamicTransformer); - setupDynawaltzContext(); + setupDynawoContext(); } protected void setupNetwork() { @@ -58,9 +57,9 @@ protected void addDynamicModels(Function phaseShifterCon @ParameterizedTest(name = "{0}") @MethodSource("providePhaseShifter") - void writeLoadModel(String dydName, Function phaseShifterConstructor, boolean dynamicTransformer) throws SAXException, IOException, XMLStreamException { + void writeLoadModel(String dydName, Function phaseShifterConstructor, boolean dynamicTransformer) throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", dydName + ".xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", dydName + ".xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } private static Stream providePhaseShifter() { diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SetPointInfiniteBusModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SetPointInfiniteBusModelXmlTest.java similarity index 80% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SetPointInfiniteBusModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SetPointInfiniteBusModelXmlTest.java index 60262feaa..cc82f66b9 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SetPointInfiniteBusModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SetPointInfiniteBusModelXmlTest.java @@ -5,16 +5,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.buses.InfiniteBusBuilder; -import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.buses.InfiniteBusBuilder; +import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -47,10 +46,10 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "set_point_inf_bus_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "set_point_inf_bus_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); validate("parameters.xsd", "set_point_inf_bus_par.xml", tmpDir.resolve(context.getSimulationParFile())); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ShuntModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ShuntModelXmlTest.java similarity index 81% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ShuntModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ShuntModelXmlTest.java index 72d52e489..68e976969 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/ShuntModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/ShuntModelXmlTest.java @@ -5,14 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.shunts.BaseShuntBuilder; +import com.powsybl.dynawo.models.shunts.BaseShuntBuilder; import com.powsybl.iidm.network.test.ShuntTestCaseFactory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -35,8 +34,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "shunt_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "shunt_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelWithSbaXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelWithSbaXmlTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelWithSbaXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelWithSbaXmlTest.java index 67290b8c7..293daa8aa 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelWithSbaXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelWithSbaXmlTest.java @@ -5,15 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.svarcs.BaseStaticVarCompensatorBuilder; +import com.powsybl.dynawo.models.svarcs.BaseStaticVarCompensatorBuilder; import com.powsybl.iidm.network.extensions.StandbyAutomatonAdder; import com.powsybl.iidm.network.test.SvcTestCaseFactory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -44,8 +43,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "svarc_sba_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "svarc_sba_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelXmlTest.java similarity index 80% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelXmlTest.java index 081c93113..83a747299 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/SvarcModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/SvarcModelXmlTest.java @@ -5,14 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.svarcs.BaseStaticVarCompensatorBuilder; +import com.powsybl.dynawo.models.svarcs.BaseStaticVarCompensatorBuilder; import com.powsybl.iidm.network.test.SvcTestCaseFactory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -35,8 +34,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "svarc_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "svarc_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemExceptionsXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemExceptionsXmlTest.java similarity index 88% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemExceptionsXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemExceptionsXmlTest.java index e8d03f691..c35b3a4d6 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemExceptionsXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemExceptionsXmlTest.java @@ -5,13 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.loads.*; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerTapChangerBuilder; +import com.powsybl.dynawo.models.loads.LoadTwoTransformersBuilder; +import com.powsybl.dynawo.models.loads.LoadTwoTransformersTapChangersBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.BeforeEach; @@ -58,7 +61,7 @@ protected void addDynamicModels(TransformerSide side, Function< Network, BlackBo @ParameterizedTest @MethodSource("provideTapChangers") void testExceptions(TransformerSide side, Function< Network, BlackBoxModel> loadConstructor, String exceptionMessage) { - Exception e = assertThrows(PowsyblException.class, this::setupDynawaltzContext); + Exception e = assertThrows(PowsyblException.class, this::setupDynawoContext); assertEquals(exceptionMessage, e.getMessage()); } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemXmlTest.java similarity index 87% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemXmlTest.java index 16456732a..e04f9dddc 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerAutomationSystemXmlTest.java @@ -5,18 +5,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.TransformerSide; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerAutomationSystemBuilder; -import com.powsybl.dynawaltz.models.loads.*; +import com.powsybl.dynawo.models.TransformerSide; +import com.powsybl.dynawo.models.automationsystems.TapChangerAutomationSystemBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerBuilder; +import com.powsybl.dynawo.models.loads.LoadTwoTransformersBuilder; import com.powsybl.iidm.network.Bus; import com.powsybl.iidm.network.VoltageLevel; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -70,9 +70,9 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "tap_changer_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tap_changer_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingAutomationSystemXmlTest.java similarity index 85% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingAutomationSystemXmlTest.java index 9b313b9c9..aaa1f105e 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingAutomationSystemXmlTest.java @@ -5,18 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; import com.powsybl.commons.PowsyblException; -import com.powsybl.dynawaltz.models.loads.LoadOneTransformerTapChangerBuilder; -import com.powsybl.dynawaltz.models.loads.LoadTwoTransformersTapChangersBuilder; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.loads.LoadOneTransformerTapChangerBuilder; +import com.powsybl.dynawo.models.loads.LoadTwoTransformersTapChangersBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -65,10 +64,10 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "tap_changer_blocking_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tap_changer_blocking_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } @Test diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java similarity index 78% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java index 0c3efbe3e..ec8e3bf3f 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TapChangerBlockingToTapChangerAutomationSystemXmlTest.java @@ -5,13 +5,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.TapChangerBlockingAutomationSystemBuilder; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -31,9 +30,9 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "tap_changer_blocking_tap_changer_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tap_changer_blocking_tap_changer_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TransformerModelXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TransformerModelXmlTest.java similarity index 76% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TransformerModelXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TransformerModelXmlTest.java index 7585b5591..6808221b1 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/TransformerModelXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/TransformerModelXmlTest.java @@ -5,14 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatioBuilder; +import com.powsybl.dynawo.models.transformers.TransformerFixedRatioBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -35,8 +34,8 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); - validate("dyd.xsd", "tfr_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "tfr_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/UnderVoltageAutomationSystemXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/UnderVoltageAutomationSystemXmlTest.java similarity index 80% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/UnderVoltageAutomationSystemXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/UnderVoltageAutomationSystemXmlTest.java index 66a23717c..fd79320f7 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/UnderVoltageAutomationSystemXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/UnderVoltageAutomationSystemXmlTest.java @@ -5,14 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.automationsystems.UnderVoltageAutomationSystemBuilder; +import com.powsybl.dynawo.models.automationsystems.UnderVoltageAutomationSystemBuilder; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; /** @@ -35,9 +34,9 @@ protected void addDynamicModels() { } @Test - void writeModel() throws SAXException, IOException, XMLStreamException { + void writeModel() throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", "under_voltage_dyd.xml", tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", "under_voltage_dyd.xml", tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); } } diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/WeccGenXmlTest.java similarity index 89% rename from dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java rename to dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/WeccGenXmlTest.java index 8a0f65632..ccd88aa58 100644 --- a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java +++ b/dynawo-simulation/src/test/java/com/powsybl/dynawo/xml/WeccGenXmlTest.java @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ -package com.powsybl.dynawaltz.xml; +package com.powsybl.dynawo.xml; -import com.powsybl.dynawaltz.models.generators.GridFormingConverterBuilder; -import com.powsybl.dynawaltz.models.BlackBoxModel; -import com.powsybl.dynawaltz.models.generators.WeccBuilder; +import com.powsybl.dynawo.models.generators.GridFormingConverterBuilder; +import com.powsybl.dynawo.models.BlackBoxModel; +import com.powsybl.dynawo.models.generators.WeccBuilder; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +19,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.xml.sax.SAXException; -import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.function.Function; import java.util.stream.Stream; @@ -37,7 +36,7 @@ class WeccGenXmlTest extends AbstractParametrizedDynamicModelXmlTest { void setup(String dydName, String parName, Function< Network, BlackBoxModel> loadConstructor) { setupNetwork(); addDynamicModels(loadConstructor); - setupDynawaltzContext(); + setupDynawoContext(); } protected void setupNetwork() { @@ -50,10 +49,10 @@ protected void addDynamicModels(Function< Network, BlackBoxModel> constructor) { @ParameterizedTest(name = "{0}") @MethodSource("provideWecc") - void writeModel(String dydName, String parName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException { + void writeModel(String dydName, String parName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException { DydXml.write(tmpDir, context); ParametersXml.write(tmpDir, context); - validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME)); + validate("dyd.xsd", dydName, tmpDir.resolve(DynawoSimulationConstants.DYD_FILENAME)); if (!parName.isEmpty()) { validate("parameters.xsd", parName, tmpDir.resolve(context.getSimulationParFile())); } diff --git a/dynawaltz/src/test/resources/DynaWaltzParameters.json b/dynawo-simulation/src/test/resources/DynawoSimulationParameters.json similarity index 97% rename from dynawaltz/src/test/resources/DynaWaltzParameters.json rename to dynawo-simulation/src/test/resources/DynawoSimulationParameters.json index d3083c91f..c1749bafd 100644 --- a/dynawaltz/src/test/resources/DynaWaltzParameters.json +++ b/dynawo-simulation/src/test/resources/DynawoSimulationParameters.json @@ -3,7 +3,7 @@ "startTime" : 0.0, "stopTime" : 3600.0, "extensions" : { - "DynaWaltzParameters" : { + "DynawoSimulationParameters" : { "networkParameters" : { "id" : "networkParametersId", "parameters" : { diff --git a/dynawaltz/src/test/resources/apv_dyd.xml b/dynawo-simulation/src/test/resources/apv_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/apv_dyd.xml rename to dynawo-simulation/src/test/resources/apv_dyd.xml diff --git a/dynawaltz/src/test/resources/apv_network_par.xml b/dynawo-simulation/src/test/resources/apv_network_par.xml similarity index 100% rename from dynawaltz/src/test/resources/apv_network_par.xml rename to dynawo-simulation/src/test/resources/apv_network_par.xml diff --git a/dynawaltz/src/test/resources/apv_par.xml b/dynawo-simulation/src/test/resources/apv_par.xml similarity index 100% rename from dynawaltz/src/test/resources/apv_par.xml rename to dynawo-simulation/src/test/resources/apv_par.xml diff --git a/dynawaltz/src/test/resources/cla_dyd.xml b/dynawo-simulation/src/test/resources/cla_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/cla_dyd.xml rename to dynawo-simulation/src/test/resources/cla_dyd.xml diff --git a/dynawaltz/src/test/resources/cla_tl_dyd.xml b/dynawo-simulation/src/test/resources/cla_tl_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/cla_tl_dyd.xml rename to dynawo-simulation/src/test/resources/cla_tl_dyd.xml diff --git a/dynawaltz/src/test/resources/com/powsybl/config/test/config.yml b/dynawo-simulation/src/test/resources/com/powsybl/config/test/config.yml similarity index 87% rename from dynawaltz/src/test/resources/com/powsybl/config/test/config.yml rename to dynawo-simulation/src/test/resources/com/powsybl/config/test/config.yml index bc1d37ba4..df742ffa7 100644 --- a/dynawaltz/src/test/resources/com/powsybl/config/test/config.yml +++ b/dynawo-simulation/src/test/resources/com/powsybl/config/test/config.yml @@ -2,8 +2,8 @@ dynamic-simulation-default-parameters: startTime: 1 stopTime: 100 -dynawaltz: - homeDir: /home/dynawaltz +dynawo: + homeDir: /home/dynawo debug: false dynawo-algorithms: @@ -13,7 +13,7 @@ dynawo-algorithms: dynamic-security-analysis-default-parameters: contingencies-start-time: 10 -dynawaltz-default-parameters: +dynawo-simulation-default-parameters: parametersFile: /work/unittests/configModels.par network.parametersFile: /work/unittests/configNetwork.par network.parametersId: "1" diff --git a/dynawaltz/src/test/resources/com/powsybl/config/test/configModels.par b/dynawo-simulation/src/test/resources/com/powsybl/config/test/configModels.par similarity index 100% rename from dynawaltz/src/test/resources/com/powsybl/config/test/configModels.par rename to dynawo-simulation/src/test/resources/com/powsybl/config/test/configModels.par diff --git a/dynawaltz/src/test/resources/com/powsybl/config/test/configNetwork.par b/dynawo-simulation/src/test/resources/com/powsybl/config/test/configNetwork.par similarity index 100% rename from dynawaltz/src/test/resources/com/powsybl/config/test/configNetwork.par rename to dynawo-simulation/src/test/resources/com/powsybl/config/test/configNetwork.par diff --git a/dynawaltz/src/test/resources/com/powsybl/config/test/configSolver.par b/dynawo-simulation/src/test/resources/com/powsybl/config/test/configSolver.par similarity index 100% rename from dynawaltz/src/test/resources/com/powsybl/config/test/configSolver.par rename to dynawo-simulation/src/test/resources/com/powsybl/config/test/configSolver.par diff --git a/dynawaltz/src/test/resources/com/powsybl/config/test/filelist.txt b/dynawo-simulation/src/test/resources/com/powsybl/config/test/filelist.txt similarity index 100% rename from dynawaltz/src/test/resources/com/powsybl/config/test/filelist.txt rename to dynawo-simulation/src/test/resources/com/powsybl/config/test/filelist.txt diff --git a/dynawaltz/src/test/resources/curves.csv b/dynawo-simulation/src/test/resources/curves.csv similarity index 100% rename from dynawaltz/src/test/resources/curves.csv rename to dynawo-simulation/src/test/resources/curves.csv diff --git a/dynawaltz/src/test/resources/curvesInput.xml b/dynawo-simulation/src/test/resources/curvesInput.xml similarity index 100% rename from dynawaltz/src/test/resources/curvesInput.xml rename to dynawo-simulation/src/test/resources/curvesInput.xml diff --git a/dynawaltz/src/test/resources/curvesInput.xsd b/dynawo-simulation/src/test/resources/curvesInput.xsd similarity index 100% rename from dynawaltz/src/test/resources/curvesInput.xsd rename to dynawo-simulation/src/test/resources/curvesInput.xsd diff --git a/dynawaltz/src/test/resources/disconnect_branch_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_branch_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_branch_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_branch_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_branch_par.xml b/dynawo-simulation/src/test/resources/disconnect_branch_par.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_branch_par.xml rename to dynawo-simulation/src/test/resources/disconnect_branch_par.xml diff --git a/dynawaltz/src/test/resources/disconnect_default_hvdc_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_default_hvdc_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_default_hvdc_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_default_hvdc_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_hvdc_par.xml b/dynawo-simulation/src/test/resources/disconnect_hvdc_par.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_hvdc_par.xml rename to dynawo-simulation/src/test/resources/disconnect_hvdc_par.xml diff --git a/dynawaltz/src/test/resources/disconnect_hvdc_pv_dangling_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_hvdc_pv_dangling_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_hvdc_pv_dangling_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_hvdc_pv_dangling_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_hvdc_pv_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_hvdc_pv_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_hvdc_pv_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_hvdc_pv_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_hvdc_vsc_dangling_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_hvdc_vsc_dangling_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_hvdc_vsc_dangling_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_hvdc_vsc_dangling_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_hvdc_vsc_dyd.xml b/dynawo-simulation/src/test/resources/disconnect_hvdc_vsc_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_hvdc_vsc_dyd.xml rename to dynawo-simulation/src/test/resources/disconnect_hvdc_vsc_dyd.xml diff --git a/dynawaltz/src/test/resources/disconnect_par.xml b/dynawo-simulation/src/test/resources/disconnect_par.xml similarity index 100% rename from dynawaltz/src/test/resources/disconnect_par.xml rename to dynawo-simulation/src/test/resources/disconnect_par.xml diff --git a/dynawaltz/src/test/resources/dyd.xml b/dynawo-simulation/src/test/resources/dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/dyd.xml rename to dynawo-simulation/src/test/resources/dyd.xml diff --git a/dynawaltz/src/test/resources/dyd.xsd b/dynawo-simulation/src/test/resources/dyd.xsd similarity index 100% rename from dynawaltz/src/test/resources/dyd.xsd rename to dynawo-simulation/src/test/resources/dyd.xsd diff --git a/dynawaltz/src/test/resources/dyd_fictitious.xml b/dynawo-simulation/src/test/resources/dyd_fictitious.xml similarity index 100% rename from dynawaltz/src/test/resources/dyd_fictitious.xml rename to dynawo-simulation/src/test/resources/dyd_fictitious.xml diff --git a/dynawaltz/src/test/resources/dynawo_bad_version.out b/dynawo-simulation/src/test/resources/dynawo_bad_version.out similarity index 100% rename from dynawaltz/src/test/resources/dynawo_bad_version.out rename to dynawo-simulation/src/test/resources/dynawo_bad_version.out diff --git a/dynawaltz/src/test/resources/dynawo_version.out b/dynawo-simulation/src/test/resources/dynawo_version.out similarity index 100% rename from dynawaltz/src/test/resources/dynawo_version.out rename to dynawo-simulation/src/test/resources/dynawo_version.out diff --git a/dynawaltz/src/test/resources/empty_phase_shifter_blocking_i_dyd.xml b/dynawo-simulation/src/test/resources/empty_phase_shifter_blocking_i_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/empty_phase_shifter_blocking_i_dyd.xml rename to dynawo-simulation/src/test/resources/empty_phase_shifter_blocking_i_dyd.xml diff --git a/dynawaltz/src/test/resources/events.xml b/dynawo-simulation/src/test/resources/events.xml similarity index 100% rename from dynawaltz/src/test/resources/events.xml rename to dynawo-simulation/src/test/resources/events.xml diff --git a/dynawaltz/src/test/resources/grid_forming_converter_dyd.xml b/dynawo-simulation/src/test/resources/grid_forming_converter_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/grid_forming_converter_dyd.xml rename to dynawo-simulation/src/test/resources/grid_forming_converter_dyd.xml diff --git a/dynawaltz/src/test/resources/grid_forming_converter_par.xml b/dynawo-simulation/src/test/resources/grid_forming_converter_par.xml similarity index 100% rename from dynawaltz/src/test/resources/grid_forming_converter_par.xml rename to dynawo-simulation/src/test/resources/grid_forming_converter_par.xml diff --git a/dynawaltz/src/test/resources/hvdc_p_dangling_dyd.xml b/dynawo-simulation/src/test/resources/hvdc_p_dangling_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/hvdc_p_dangling_dyd.xml rename to dynawo-simulation/src/test/resources/hvdc_p_dangling_dyd.xml diff --git a/dynawaltz/src/test/resources/hvdc_p_dyd.xml b/dynawo-simulation/src/test/resources/hvdc_p_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/hvdc_p_dyd.xml rename to dynawo-simulation/src/test/resources/hvdc_p_dyd.xml diff --git a/dynawaltz/src/test/resources/hvdc_vsc_dangling_dyd.xml b/dynawo-simulation/src/test/resources/hvdc_vsc_dangling_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/hvdc_vsc_dangling_dyd.xml rename to dynawo-simulation/src/test/resources/hvdc_vsc_dangling_dyd.xml diff --git a/dynawaltz/src/test/resources/hvdc_vsc_dyd.xml b/dynawo-simulation/src/test/resources/hvdc_vsc_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/hvdc_vsc_dyd.xml rename to dynawo-simulation/src/test/resources/hvdc_vsc_dyd.xml diff --git a/dynawaltz/src/test/resources/jobs.xml b/dynawo-simulation/src/test/resources/jobs.xml similarity index 72% rename from dynawaltz/src/test/resources/jobs.xml rename to dynawo-simulation/src/test/resources/jobs.xml index 608bd9985..fff3b5d5c 100644 --- a/dynawaltz/src/test/resources/jobs.xml +++ b/dynawo-simulation/src/test/resources/jobs.xml @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz/src/test/resources/jobs.xsd b/dynawo-simulation/src/test/resources/jobs.xsd similarity index 100% rename from dynawaltz/src/test/resources/jobs.xsd rename to dynawo-simulation/src/test/resources/jobs.xsd diff --git a/dynawaltz/src/test/resources/jobsWithDump.xml b/dynawo-simulation/src/test/resources/jobsWithDump.xml similarity index 73% rename from dynawaltz/src/test/resources/jobsWithDump.xml rename to dynawo-simulation/src/test/resources/jobsWithDump.xml index 49f23b0f5..969a0554e 100644 --- a/dynawaltz/src/test/resources/jobsWithDump.xml +++ b/dynawo-simulation/src/test/resources/jobsWithDump.xml @@ -3,8 +3,8 @@ - - + + @@ -14,9 +14,9 @@ - + - + diff --git a/dynawaltz/src/test/resources/jobsWithSpecificLogs.xml b/dynawo-simulation/src/test/resources/jobsWithSpecificLogs.xml similarity index 79% rename from dynawaltz/src/test/resources/jobsWithSpecificLogs.xml rename to dynawo-simulation/src/test/resources/jobsWithSpecificLogs.xml index 0f4d928ce..62f9584f8 100644 --- a/dynawaltz/src/test/resources/jobsWithSpecificLogs.xml +++ b/dynawo-simulation/src/test/resources/jobsWithSpecificLogs.xml @@ -3,8 +3,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/dynawaltz/src/test/resources/load_alpha_beta_dyd.xml b/dynawo-simulation/src/test/resources/load_alpha_beta_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/load_alpha_beta_dyd.xml rename to dynawo-simulation/src/test/resources/load_alpha_beta_dyd.xml diff --git a/dynawaltz/src/test/resources/load_one_transformer_dyd.xml b/dynawo-simulation/src/test/resources/load_one_transformer_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/load_one_transformer_dyd.xml rename to dynawo-simulation/src/test/resources/load_one_transformer_dyd.xml diff --git a/dynawaltz/src/test/resources/load_one_transformer_tap_changer_dyd.xml b/dynawo-simulation/src/test/resources/load_one_transformer_tap_changer_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/load_one_transformer_tap_changer_dyd.xml rename to dynawo-simulation/src/test/resources/load_one_transformer_tap_changer_dyd.xml diff --git a/dynawaltz/src/test/resources/load_two_transformers_dyd.xml b/dynawo-simulation/src/test/resources/load_two_transformers_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/load_two_transformers_dyd.xml rename to dynawo-simulation/src/test/resources/load_two_transformers_dyd.xml diff --git a/dynawaltz/src/test/resources/load_two_transformers_tap_changers_dyd.xml b/dynawo-simulation/src/test/resources/load_two_transformers_tap_changers_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/load_two_transformers_tap_changers_dyd.xml rename to dynawo-simulation/src/test/resources/load_two_transformers_tap_changers_dyd.xml diff --git a/dynawaltz/src/test/resources/mergedLoads.xiidm b/dynawo-simulation/src/test/resources/mergedLoads.xiidm similarity index 100% rename from dynawaltz/src/test/resources/mergedLoads.xiidm rename to dynawo-simulation/src/test/resources/mergedLoads.xiidm diff --git a/dynawaltz/src/test/resources/models.par b/dynawo-simulation/src/test/resources/models.par similarity index 100% rename from dynawaltz/src/test/resources/models.par rename to dynawo-simulation/src/test/resources/models.par diff --git a/dynawaltz/src/test/resources/models_misspelled.par b/dynawo-simulation/src/test/resources/models_misspelled.par similarity index 100% rename from dynawaltz/src/test/resources/models_misspelled.par rename to dynawo-simulation/src/test/resources/models_misspelled.par diff --git a/dynawaltz/src/test/resources/noMergedLoads.xiidm b/dynawo-simulation/src/test/resources/noMergedLoads.xiidm similarity index 100% rename from dynawaltz/src/test/resources/noMergedLoads.xiidm rename to dynawo-simulation/src/test/resources/noMergedLoads.xiidm diff --git a/dynawaltz/src/test/resources/node_fault_dyd.xml b/dynawo-simulation/src/test/resources/node_fault_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/node_fault_dyd.xml rename to dynawo-simulation/src/test/resources/node_fault_dyd.xml diff --git a/dynawaltz/src/test/resources/node_fault_par.xml b/dynawo-simulation/src/test/resources/node_fault_par.xml similarity index 100% rename from dynawaltz/src/test/resources/node_fault_par.xml rename to dynawo-simulation/src/test/resources/node_fault_par.xml diff --git a/dynawaltz/src/test/resources/node_network_par.xml b/dynawo-simulation/src/test/resources/node_network_par.xml similarity index 100% rename from dynawaltz/src/test/resources/node_network_par.xml rename to dynawo-simulation/src/test/resources/node_network_par.xml diff --git a/dynawaltz/src/test/resources/omega_ref.xml b/dynawo-simulation/src/test/resources/omega_ref.xml similarity index 100% rename from dynawaltz/src/test/resources/omega_ref.xml rename to dynawo-simulation/src/test/resources/omega_ref.xml diff --git a/dynawaltz/src/test/resources/omega_ref_dyd.xml b/dynawo-simulation/src/test/resources/omega_ref_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/omega_ref_dyd.xml rename to dynawo-simulation/src/test/resources/omega_ref_dyd.xml diff --git a/dynawaltz/src/test/resources/omega_ref_par.xml b/dynawo-simulation/src/test/resources/omega_ref_par.xml similarity index 100% rename from dynawaltz/src/test/resources/omega_ref_par.xml rename to dynawo-simulation/src/test/resources/omega_ref_par.xml diff --git a/dynawaltz/src/test/resources/parameters.xsd b/dynawo-simulation/src/test/resources/parameters.xsd similarity index 100% rename from dynawaltz/src/test/resources/parameters.xsd rename to dynawo-simulation/src/test/resources/parameters.xsd diff --git a/dynawaltz/src/test/resources/parametersSet/models.par b/dynawo-simulation/src/test/resources/parametersSet/models.par similarity index 100% rename from dynawaltz/src/test/resources/parametersSet/models.par rename to dynawo-simulation/src/test/resources/parametersSet/models.par diff --git a/dynawaltz/src/test/resources/parametersSet/network.par b/dynawo-simulation/src/test/resources/parametersSet/network.par similarity index 100% rename from dynawaltz/src/test/resources/parametersSet/network.par rename to dynawo-simulation/src/test/resources/parametersSet/network.par diff --git a/dynawaltz/src/test/resources/parametersSet/solvers.par b/dynawo-simulation/src/test/resources/parametersSet/solvers.par similarity index 100% rename from dynawaltz/src/test/resources/parametersSet/solvers.par rename to dynawo-simulation/src/test/resources/parametersSet/solvers.par diff --git a/dynawaltz/src/test/resources/parametersSet/solversMissingDefault.par b/dynawo-simulation/src/test/resources/parametersSet/solversMissingDefault.par similarity index 100% rename from dynawaltz/src/test/resources/parametersSet/solversMissingDefault.par rename to dynawo-simulation/src/test/resources/parametersSet/solversMissingDefault.par diff --git a/dynawaltz/src/test/resources/phase_shifter_blocking_i_dyd.xml b/dynawo-simulation/src/test/resources/phase_shifter_blocking_i_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/phase_shifter_blocking_i_dyd.xml rename to dynawo-simulation/src/test/resources/phase_shifter_blocking_i_dyd.xml diff --git a/dynawaltz/src/test/resources/phase_shifter_i_dyd.xml b/dynawo-simulation/src/test/resources/phase_shifter_i_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/phase_shifter_i_dyd.xml rename to dynawo-simulation/src/test/resources/phase_shifter_i_dyd.xml diff --git a/dynawaltz/src/test/resources/phase_shifter_p_dyd.xml b/dynawo-simulation/src/test/resources/phase_shifter_p_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/phase_shifter_p_dyd.xml rename to dynawo-simulation/src/test/resources/phase_shifter_p_dyd.xml diff --git a/dynawaltz/src/test/resources/set_point_inf_bus_dyd.xml b/dynawo-simulation/src/test/resources/set_point_inf_bus_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/set_point_inf_bus_dyd.xml rename to dynawo-simulation/src/test/resources/set_point_inf_bus_dyd.xml diff --git a/dynawaltz/src/test/resources/set_point_inf_bus_par.xml b/dynawo-simulation/src/test/resources/set_point_inf_bus_par.xml similarity index 100% rename from dynawaltz/src/test/resources/set_point_inf_bus_par.xml rename to dynawo-simulation/src/test/resources/set_point_inf_bus_par.xml diff --git a/dynawaltz/src/test/resources/shunt_dyd.xml b/dynawo-simulation/src/test/resources/shunt_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/shunt_dyd.xml rename to dynawo-simulation/src/test/resources/shunt_dyd.xml diff --git a/dynawaltz/src/test/resources/suppliers/curves.json b/dynawo-simulation/src/test/resources/suppliers/curves.json similarity index 100% rename from dynawaltz/src/test/resources/suppliers/curves.json rename to dynawo-simulation/src/test/resources/suppliers/curves.json diff --git a/dynawaltz/src/test/resources/suppliers/mappingDynamicModel.json b/dynawo-simulation/src/test/resources/suppliers/mappingDynamicModel.json similarity index 100% rename from dynawaltz/src/test/resources/suppliers/mappingDynamicModel.json rename to dynawo-simulation/src/test/resources/suppliers/mappingDynamicModel.json diff --git a/dynawaltz/src/test/resources/suppliers/mappingEvent.json b/dynawo-simulation/src/test/resources/suppliers/mappingEvent.json similarity index 100% rename from dynawaltz/src/test/resources/suppliers/mappingEvent.json rename to dynawo-simulation/src/test/resources/suppliers/mappingEvent.json diff --git a/dynawaltz/src/test/resources/svarc_dyd.xml b/dynawo-simulation/src/test/resources/svarc_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/svarc_dyd.xml rename to dynawo-simulation/src/test/resources/svarc_dyd.xml diff --git a/dynawaltz/src/test/resources/svarc_sba_dyd.xml b/dynawo-simulation/src/test/resources/svarc_sba_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/svarc_sba_dyd.xml rename to dynawo-simulation/src/test/resources/svarc_sba_dyd.xml diff --git a/dynawaltz/src/test/resources/tap_changer_blocking_dyd.xml b/dynawo-simulation/src/test/resources/tap_changer_blocking_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tap_changer_blocking_dyd.xml rename to dynawo-simulation/src/test/resources/tap_changer_blocking_dyd.xml diff --git a/dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml b/dynawo-simulation/src/test/resources/tap_changer_blocking_empty_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml rename to dynawo-simulation/src/test/resources/tap_changer_blocking_empty_dyd.xml diff --git a/dynawaltz/src/test/resources/tap_changer_blocking_tap_changer_dyd.xml b/dynawo-simulation/src/test/resources/tap_changer_blocking_tap_changer_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tap_changer_blocking_tap_changer_dyd.xml rename to dynawo-simulation/src/test/resources/tap_changer_blocking_tap_changer_dyd.xml diff --git a/dynawaltz/src/test/resources/tap_changer_dyd.xml b/dynawo-simulation/src/test/resources/tap_changer_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tap_changer_dyd.xml rename to dynawo-simulation/src/test/resources/tap_changer_dyd.xml diff --git a/dynawaltz/src/test/resources/tap_changer_empty_dyd.xml b/dynawo-simulation/src/test/resources/tap_changer_empty_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tap_changer_empty_dyd.xml rename to dynawo-simulation/src/test/resources/tap_changer_empty_dyd.xml diff --git a/dynawaltz/src/test/resources/tfr_dyd.xml b/dynawo-simulation/src/test/resources/tfr_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/tfr_dyd.xml rename to dynawo-simulation/src/test/resources/tfr_dyd.xml diff --git a/dynawaltz/src/test/resources/under_voltage_dyd.xml b/dynawo-simulation/src/test/resources/under_voltage_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/under_voltage_dyd.xml rename to dynawo-simulation/src/test/resources/under_voltage_dyd.xml diff --git a/dynawaltz/src/test/resources/wecc_pv_dyd.xml b/dynawo-simulation/src/test/resources/wecc_pv_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/wecc_pv_dyd.xml rename to dynawo-simulation/src/test/resources/wecc_pv_dyd.xml diff --git a/dynawaltz/src/test/resources/wecc_wt_dyd.xml b/dynawo-simulation/src/test/resources/wecc_wt_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/wecc_wt_dyd.xml rename to dynawo-simulation/src/test/resources/wecc_wt_dyd.xml diff --git a/dynawaltz/src/test/resources/wecc_wt_par.xml b/dynawo-simulation/src/test/resources/wecc_wt_par.xml similarity index 100% rename from dynawaltz/src/test/resources/wecc_wt_par.xml rename to dynawo-simulation/src/test/resources/wecc_wt_par.xml diff --git a/dynawaltz/src/test/resources/wecc_wt_synchro_dyd.xml b/dynawo-simulation/src/test/resources/wecc_wt_synchro_dyd.xml similarity index 100% rename from dynawaltz/src/test/resources/wecc_wt_synchro_dyd.xml rename to dynawo-simulation/src/test/resources/wecc_wt_synchro_dyd.xml diff --git a/pom.xml b/pom.xml index a10ed02ab..46401c9b5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ commons dynaflow - dynawaltz - dynawaltz-dsl + dynawo-simulation + dynawo-dsl dynawo-security-analysis distribution @@ -58,7 +58,7 @@ 17 6.4.1 - 4.0.14 + 4.0.14 0.3.2 ../distribution/target/site/jacoco-aggregate/jacoco.xml, @@ -126,19 +126,19 @@ com.powsybl - powsybl-dynawaltz + powsybl-dynawo-simulation ${project.version} ${project.groupId} - powsybl-dynawaltz + powsybl-dynawo-simulation ${project.version} test-jar test com.powsybl - powsybl-dynawaltz-dsl + powsybl-dynawo-dsl ${project.version}