Skip to content

Commit

Permalink
Rename dynawaltz to dynawo
Browse files Browse the repository at this point in the history
Signed-off-by: lisrte <[email protected]>
  • Loading branch information
Lisrte committed Jul 5, 2024
1 parent 019319b commit df3274d
Show file tree
Hide file tree
Showing 510 changed files with 1,531 additions and 1,515 deletions.
4 changes: 2 additions & 2 deletions distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>powsybl-dynawaltz</artifactId>
<artifactId>powsybl-dynawo-simulation</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>powsybl-dynawaltz-dsl</artifactId>
<artifactId>powsybl-dynawo-dsl</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
8 changes: 4 additions & 4 deletions docs/dynamic_simulation/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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`
Expand All @@ -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`
Expand All @@ -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`
Expand Down
43 changes: 0 additions & 43 deletions dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzConfig.java

This file was deleted.

18 changes: 9 additions & 9 deletions dynawaltz-dsl/pom.xml → dynawo-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<version>2.6.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-dynawaltz-dsl</artifactId>
<name>DynaWaltz DSL</name>
<description>DSL for DynaWaltz</description>
<artifactId>powsybl-dynawo-dsl</artifactId>
<name>Dynawo DSL</name>
<description>DSL for Dynawo</description>

<properties>
<groovydoc.attach>true</groovydoc.attach>
Expand Down Expand Up @@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-dynawaltz</artifactId>
<artifactId>powsybl-dynawo-simulation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
Expand Down Expand Up @@ -100,14 +100,14 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>powsybl-dynawaltz</artifactId>
<type>test-jar</type>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-test</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>powsybl-dynawo-simulation</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
/**
Expand All @@ -20,11 +20,11 @@ import java.util.function.Consumer
* @author Mathieu Bague {@literal <[email protected]>}
*/
@AutoService(CurveGroovyExtension.class)
class DynaWaltzCurveGroovyExtension implements CurveGroovyExtension {
class DynawoCurveGroovyExtension implements CurveGroovyExtension {

@Override
String getName() {
DynaWaltzProvider.NAME
DynawoSimulationProvider.NAME
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,17 +23,17 @@ import java.util.function.Consumer
* @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
*/
@AutoService(DynamicModelGroovyExtension.class)
class DynaWaltzDynamicModelGroovyExtension implements DynamicModelGroovyExtension {
class DynawoDynamicModelGroovyExtension implements DynamicModelGroovyExtension {

private final List<BuilderConfig> builderConfigs

DynaWaltzDynamicModelGroovyExtension() {
DynawoDynamicModelGroovyExtension() {
builderConfigs = ModelConfigsHandler.getInstance().getBuilderConfigs()
}

@Override
String getName() {
DynaWaltzProvider.NAME
DynawoSimulationProvider.NAME
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,17 +23,17 @@ import java.util.function.Consumer
* @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
*/
@AutoService(EventModelGroovyExtension.class)
class DynaWaltzEventModelGroovyExtension implements EventModelGroovyExtension {
class DynawoEventModelGroovyExtension implements EventModelGroovyExtension {

private final List<EventBuilderConfig> builderConfigs

DynaWaltzEventModelGroovyExtension() {
DynawoEventModelGroovyExtension() {
builderConfigs = ModelConfigsHandler.getInstance().getEventBuilderConfigs()
}

@Override
String getName() {
DynaWaltzProvider.NAME
DynawoSimulationProvider.NAME
}

List<String> getModelNames() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -35,7 +35,7 @@
/**
* @author Marcos de Miguel {@literal <demiguelm at aia.es>}
*/
class DynaWaltzGroovyCurvesSupplierTest extends AbstractModelSupplierTest {
class CurvesSupplierTest extends AbstractModelSupplierTest {

private FileSystem fileSystem;
private Network network;
Expand Down Expand Up @@ -63,9 +63,9 @@ void test() {
}

private List<CurveGroovyExtension> validateGroovyExtension() {
List<CurveGroovyExtension> extensions = GroovyExtension.find(CurveGroovyExtension.class, DynaWaltzProvider.NAME);
List<CurveGroovyExtension> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -55,7 +54,7 @@
*/
class DynamicModelsSupplierTest extends AbstractModelSupplierTest {

private static final List<DynamicModelGroovyExtension> EXTENSIONS = GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME);
private static final List<DynamicModelGroovyExtension> EXTENSIONS = GroovyExtension.find(DynamicModelGroovyExtension.class, DynawoSimulationProvider.NAME);

@Test
void testLibsInfo() {
Expand Down
Loading

0 comments on commit df3274d

Please sign in to comment.