Skip to content

Commit

Permalink
HvdcPV renamed into HvdcP (#285)
Browse files Browse the repository at this point in the history 
* Replace HvdcPv with HvdcP in Dsl
* Rename HvdcPv to HvdcP

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
  • Loading branch information
@Lisrte
Lisrte authored Sep 26, 2023
1 parent 7bc168e commit 1c2697c
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 30 deletions.
22 changes: 11 additions & 11 deletions .../models/hvdc/HvdcPvGroovyExtension.groovy → ...l/models/hvdc/HvdcPGroovyExtension.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ import com.powsybl.dynamicsimulation.DynamicModel
import com.powsybl.dynamicsimulation.groovy.DynamicModelGroovyExtension
import com.powsybl.dynawaltz.dsl.AbstractEquipmentGroovyExtension
import com.powsybl.dynawaltz.dsl.EquipmentConfig
import com.powsybl.dynawaltz.models.hvdc.HvdcPv
import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling
import com.powsybl.dynawaltz.models.hvdc.HvdcP
import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling
import com.powsybl.iidm.network.Network

/**
* @author Laurent Issertial <laurent.issertial at rte-france.com>
*/
@AutoService(DynamicModelGroovyExtension.class)
class HvdcPvGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicModel> implements DynamicModelGroovyExtension {
class HvdcPGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicModel> implements DynamicModelGroovyExtension {

protected static final String HVDC_PV = "hvdcPv"
protected static final String HVDC_P = "hvdcP"

HvdcPvGroovyExtension() {
super(HVDC_PV)
HvdcPGroovyExtension() {
super(HVDC_P)
}

protected HvdcPvGroovyExtension(URL config) {
super(HVDC_PV, config)
protected HvdcPGroovyExtension(URL config) {
super(HVDC_P, config)
}

@Override
Expand All @@ -44,12 +44,12 @@ class HvdcPvGroovyExtension extends AbstractEquipmentGroovyExtension<DynamicMode
}

@Override
HvdcPv build() {
HvdcP build() {
checkData()
if (equipmentConfig.isDangling()) {
new HvdcPvDangling(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib, danglingSide)
new HvdcPDangling(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib, danglingSide)
} else {
new HvdcPv(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib)
new HvdcP(dynamicModelId, hvdc, parameterSetId, equipmentConfig.lib)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dynawaltz-dsl/src/main/resources/models.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"lib": "GeneratorPVDiagramPQ"
}
],
"hvdcPv": [
"hvdcP": [
{
"lib": "HvdcPV"
},
Expand Down
8 changes: 4 additions & 4 deletions dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
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.HvdcPv;
import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
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;
Expand Down Expand Up @@ -107,9 +107,9 @@ void assertPureDynamicBlackBoxModel(BlackBoxModel bbm, String dynamicId, String
private static Stream<Arguments> provideEquipmentModelData() {
return Stream.of(
Arguments.of("/dynamicModels/bus.groovy", StandardBus.class, EurostagTutorialExample1Factory.create(), "NGEN", "BBM_NGEN", "SB", "Bus"),
Arguments.of("/dynamicModels/hvdcPv.groovy", HvdcPv.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPV"),
Arguments.of("/dynamicModels/hvdcP.groovy", HvdcP.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPV"),
Arguments.of("/dynamicModels/hvdcVsc.groovy", HvdcVsc.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcVSC"),
Arguments.of("/dynamicModels/hvdcPvDangling.groovy", HvdcPvDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPVDanglingDiagramPQ"),
Arguments.of("/dynamicModels/hvdcPDangling.groovy", HvdcPDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcPVDanglingDiagramPQ"),
Arguments.of("/dynamicModels/hvdcVscDangling.groovy", HvdcVscDangling.class, HvdcTestNetwork.createVsc(), "L", "BBM_HVDC_L", "HVDC", "HvdcVSCDanglingUdc"),
Arguments.of("/dynamicModels/loadAB.groovy", BaseLoad.class, EurostagTutorialExample1Factory.create(), "LOAD", "LOAD", "LAB", "LoadAlphaBetaRestorative"),
Arguments.of("/dynamicModels/loadABControllable.groovy", BaseLoadControllable.class, EurostagTutorialExample1Factory.create(), "LOAD", "LOAD", "LAB", "LoadAlphaBeta"),
Expand Down
0 ...est/resources/dynamicModels/hvdcPv.groovy → ...test/resources/dynamicModels/hvdcP.groovy
View file
File renamed without changes.
0 ...urces/dynamicModels/hvdcPvDangling.groovy → ...ources/dynamicModels/hvdcPDangling.groovy
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...powsybl/dynawaltz/models/hvdc/HvdcPv.java → .../powsybl/dynawaltz/models/hvdc/HvdcP.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
/**
* @author Laurent Issertial <laurent.issertial at rte-france.com>
*/
public class HvdcPv extends AbstractHvdc {
public class HvdcP extends AbstractHvdc {

public HvdcPv(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib) {
public HvdcP(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib) {
super(dynamicModelId, hvdc, parameterSetId, hvdcLib);
}

Expand Down
4 changes: 2 additions & 2 deletions ...dynawaltz/models/hvdc/HvdcPvDangling.java → .../dynawaltz/models/hvdc/HvdcPDangling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
/**
* @author Laurent Issertial <laurent.issertial at rte-france.com>
*/
public class HvdcPvDangling extends HvdcPv {
public class HvdcPDangling extends HvdcP {

private final DanglingSide danglingSide;

public HvdcPvDangling(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib, Side danglingSide) {
public HvdcPDangling(String dynamicModelId, HvdcLine hvdc, String parameterSetId, String hvdcLib, Side danglingSide) {
super(dynamicModelId, hvdc, parameterSetId, hvdcLib);
this.danglingSide = new DanglingSide(TERMINAL_PREFIX, danglingSide);
}
Expand Down
8 changes: 4 additions & 4 deletions dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.powsybl.dynawaltz.models.BlackBoxModel;
import com.powsybl.dynawaltz.models.Side;
import com.powsybl.dynawaltz.models.events.EventHvdcDisconnection;
import com.powsybl.dynawaltz.models.hvdc.HvdcPv;
import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
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.iidm.network.Network;
Expand Down Expand Up @@ -71,13 +71,13 @@ private static Stream<Arguments> provideModels() {
null,
(Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1)),
Arguments.of("disconnect_hvdc_pv_dyd.xml",
(Function<Network, BlackBoxModel>) n -> new HvdcPv(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPV"),
(Function<Network, BlackBoxModel>) n -> new HvdcP(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPV"),
(Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, true, false)),
Arguments.of("disconnect_hvdc_vsc_dyd.xml",
(Function<Network, BlackBoxModel>) n -> new HvdcVsc(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcVsc"),
(Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, false, true)),
Arguments.of("disconnect_hvdc_pv_dangling_dyd.xml",
(Function<Network, BlackBoxModel>) n -> new HvdcPvDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPVDangling", Side.TWO),
(Function<Network, BlackBoxModel>) n -> new HvdcPDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcPVDangling", Side.TWO),
(Function<Network, BlackBoxModel>) n -> new EventHvdcDisconnection(n.getHvdcLine(HVDC_NAME), 1, true, false)),
Arguments.of("disconnect_hvdc_vsc_dangling_dyd.xml",
(Function<Network, BlackBoxModel>) n -> new HvdcVscDangling(DYN_HVDC_NAME, n.getHvdcLine(HVDC_NAME), "hvdc", "HvdcVSCDanglingUdc", Side.ONE),
Expand Down
4 changes: 2 additions & 2 deletions dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectionExceptionXmlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.powsybl.dynawaltz.models.BlackBoxModel;
import com.powsybl.dynawaltz.models.Side;
import com.powsybl.dynawaltz.models.events.EventHvdcDisconnection;
import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
import com.powsybl.dynawaltz.models.hvdc.HvdcPDangling;
import com.powsybl.dynawaltz.models.hvdc.HvdcVscDangling;
import com.powsybl.iidm.network.HvdcLine;
import com.powsybl.iidm.network.test.HvdcTestNetwork;
Expand Down Expand Up @@ -61,7 +61,7 @@ private static Stream<Arguments> provideModels() {
return Stream.of(
Arguments.of("Equipment HvdcPVDangling side 1 is dangling and can't be disconnected with an event",
Side.ONE,
(BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcPvDangling("BBM_L", hvdc, "hvdc", "HvdcPVDangling", side)),
(BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcPDangling("BBM_L", hvdc, "hvdc", "HvdcPVDangling", side)),
Arguments.of("Equipment HvdcVSCDanglingUdc side 2 is dangling and can't be disconnected with an event",
Side.TWO,
(BiFunction<HvdcLine, Side, BlackBoxModel>) (hvdc, side) -> new HvdcVscDangling("BBM_L", hvdc, "hvdc", "HvdcVSCDanglingUdc", side))
Expand Down
8 changes: 4 additions & 4 deletions dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import com.powsybl.dynawaltz.models.BlackBoxModel;
import com.powsybl.dynawaltz.models.Side;
import com.powsybl.dynawaltz.models.hvdc.HvdcPv;
import com.powsybl.dynawaltz.models.hvdc.HvdcPvDangling;
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.iidm.network.Network;
Expand Down Expand Up @@ -60,9 +60,9 @@ void writeHvdcModel(String dydName, Function< Network, BlackBoxModel> constructo

private static Stream<Arguments> provideHvdc() {
return Stream.of(
Arguments.of("hvdc_pv_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPv(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPV")),
Arguments.of("hvdc_p_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcP(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPV")),
Arguments.of("hvdc_vsc_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcVsc(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcVSC")),
Arguments.of("hvdc_pv_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPvDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPVDangling", Side.ONE)),
Arguments.of("hvdc_p_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcPDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcPVDangling", Side.ONE)),
Arguments.of("hvdc_vsc_dangling_dyd.xml", (Function<Network, BlackBoxModel>) n -> new HvdcVscDangling(DYN_NAME, n.getHvdcLine(HVDC_NAME), "hv", "HvdcVSCDanglingP", Side.TWO))
);
}
Expand Down
0 ...c/test/resources/hvdc_pv_dangling_dyd.xml → ...rc/test/resources/hvdc_p_dangling_dyd.xml
View file
File renamed without changes.
0 dynawaltz/src/test/resources/hvdc_pv_dyd.xml → dynawaltz/src/test/resources/hvdc_p_dyd.xml
View file
File renamed without changes.

0 comments on commit 1c2697c

Please sign in to comment.