Skip to content

Commit

Permalink
Replace Network used for default model by Default
Browse files Browse the repository at this point in the history 
Signed-off-by: lisrte <laurent.issertial@rte-france.com>
  • Loading branch information
@Lisrte
Lisrte committed Jun 14, 2023
1 parent f81266c commit 7d95690
Show file tree
Hide file tree
Showing 55 changed files with 342 additions and 338 deletions.
4 changes: 2 additions & 2 deletions commons/src/main/java/com/powsybl/dynawo/commons/NetworkResultsUpdater.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ public static void update(Network targetNetwork, Network sourceNetwork, boolean
// We choose to iterate over BusBreakerView buses instead of BusView buses because they are more stable:
// a use-case when we need to export a node/breaker network to bus/breaker to Dynawo exists,
// and reading the results from Dynawo-exported bus/breaker will end up with different ids at BusView level
Map<String, Bus> targetNetworkBusBreakerViewBusById = targetNetwork.getBusBreakerView().getBusStream()
Map<String, Bus> targetDefaultBusBreakerViewBusById = targetNetwork.getBusBreakerView().getBusStream()
.collect(Collectors.toMap(Identifiable::getId, Function.identity())); // it is needed to pre-index into a map as in network store n.getBusBreakerView().getBus(id) is slow
for (Bus sourceBus : sourceNetwork.getBusBreakerView().getBuses()) {
Bus targetBus = targetNetworkBusBreakerViewBusById.get(sourceBus.getId());
Bus targetBus = targetDefaultBusBreakerViewBusById.get(sourceBus.getId());
if (targetBus == null) {
LOG.error("Source bus {} not found in target network. Voltage not updated ({}, {})", sourceBus.getId(), sourceBus.getV(), sourceBus.getAngle());
} else {
Expand Down
66 changes: 33 additions & 33 deletions ...sl/src/test/resources/ieee14-currentlimitautomaton/dynawaltz-inputs/powsybl_dynawaltz.dyd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,39 +52,39 @@
<dyn:blackBoxModel id="CLA_2_5" lib="CurrentLimitAutomaton" parFile="models.par" parId="CLA_2_5"/>
<dyn:blackBoxModel id="FREQ_SYNC" lib="DYNModelOmegaRef" parFile="ieee14bus.par" parId="FREQ_SYNC_PAR"/>
<dyn:blackBoxModel id="Disconnect__BUS____1-BUS____5-1_AC" lib="EventQuadripoleDisconnection" parFile="ieee14bus.par" parId="Disconnect__BUS____1-BUS____5-1_AC"/>
<dyn:macroConnector id="MC_LoadAlphaBeta-NetworkBus">
<dyn:macroConnector id="MC_LoadAlphaBeta-DefaultBus">
<dyn:connect var1="load_terminal" var2="@NAME@_ACPIN"/>
<dyn:connect var1="load_switchOffSignal1" var2="@NAME@_switchOff"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_GeneratorSynchronousFourWindingsProportionalRegulations-NetworkBus">
<dyn:macroConnector id="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultBus">
<dyn:connect var1="generator_terminal" var2="@NAME@_ACPIN"/>
<dyn:connect var1="generator_switchOffSignal1" var2="@NAME@_switchOff"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-NetworkBus">
<dyn:macroConnector id="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultBus">
<dyn:connect var1="generator_terminal" var2="@NAME@_ACPIN"/>
<dyn:connect var1="generator_switchOffSignal1" var2="@NAME@_switchOff"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_CurrentLimitAutomatonMeasureSide2-NetworkLine">
<dyn:macroConnector id="MC_CurrentLimitAutomatonMeasureSide2-DefaultLine">
<dyn:connect var1="currentLimitAutomaton_IMonitored" var2="@NAME@_iSide2"/>
<dyn:connect var1="currentLimitAutomaton_AutomatonExists" var2="@NAME@_desactivate_currentLimits"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_CurrentLimitAutomatonControl-NetworkLine">
<dyn:macroConnector id="MC_CurrentLimitAutomatonControl-DefaultLine">
<dyn:connect var1="currentLimitAutomaton_order" var2="@NAME@_state"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations">
<dyn:connect var1="omega_grp_@INDEX@" var2="generator_omegaPu"/>
<dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
<dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_DYNModelOmegaRef-NetworkBus">
<dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBus">
<dyn:connect var1="numcc_node_@INDEX@" var2="@NAME@_numcc"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations">
<dyn:connect var1="omega_grp_@INDEX@" var2="generator_omegaPu"/>
<dyn:connect var1="omegaRef_grp_@INDEX@" var2="generator_omegaRefPu"/>
<dyn:connect var1="running_grp_@INDEX@" var2="generator_running"/>
</dyn:macroConnector>
<dyn:macroConnector id="MC_EventQuadripoleDisconnection-NetworkLine">
<dyn:macroConnector id="MC_EventQuadripoleDisconnection-DefaultLine">
<dyn:connect var1="event_state1_value" var2="@NAME@_state_value"/>
</dyn:macroConnector>
<dyn:macroStaticReference id="MSR_LoadAlphaBeta">
Expand All @@ -102,35 +102,35 @@
<dyn:staticRef var="generator_QGenPu" staticVar="q"/>
<dyn:staticRef var="generator_state" staticVar="state"/>
</dyn:macroStaticReference>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD__10_EC" id2="NETWORK" name2="_BUS___10_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD__11_EC" id2="NETWORK" name2="_BUS___11_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD__12_EC" id2="NETWORK" name2="_BUS___12_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD__13_EC" id2="NETWORK" name2="_BUS___13_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD__14_EC" id2="NETWORK" name2="_BUS___14_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___2_EC" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___3_EC" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___9_EC" id2="NETWORK" name2="_BUS____9_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___4_EC" id2="NETWORK" name2="_BUS____4_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___6_EC" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-NetworkBus" id1="_LOAD___5_EC" id2="NETWORK" name2="_BUS____5_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-NetworkBus" id1="_GEN____1_SM" id2="NETWORK" name2="_BUS____1_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-NetworkBus" id1="_GEN____2_SM" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-NetworkBus" id1="_GEN____3_SM" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-NetworkBus" id1="_GEN____6_SM" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-NetworkBus" id1="_GEN____8_SM" id2="NETWORK" name2="_BUS____8_TN"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonMeasureSide2-NetworkLine" id1="CLA_2_4" id2="NETWORK" name2="_BUS____2-BUS____4-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonControl-NetworkLine" id1="CLA_2_4" id2="NETWORK" name2="_BUS____2-BUS____4-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonMeasureSide2-NetworkLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonControl-NetworkLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD__10_EC" id2="NETWORK" name2="_BUS___10_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD__11_EC" id2="NETWORK" name2="_BUS___11_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD__12_EC" id2="NETWORK" name2="_BUS___12_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD__13_EC" id2="NETWORK" name2="_BUS___13_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD__14_EC" id2="NETWORK" name2="_BUS___14_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___2_EC" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___3_EC" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___9_EC" id2="NETWORK" name2="_BUS____9_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___4_EC" id2="NETWORK" name2="_BUS____4_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___6_EC" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="_LOAD___5_EC" id2="NETWORK" name2="_BUS____5_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultBus" id1="_GEN____1_SM" id2="NETWORK" name2="_BUS____1_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultBus" id1="_GEN____2_SM" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousFourWindingsProportionalRegulations-DefaultBus" id1="_GEN____3_SM" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultBus" id1="_GEN____6_SM" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_GeneratorSynchronousThreeWindingsProportionalRegulations-DefaultBus" id1="_GEN____8_SM" id2="NETWORK" name2="_BUS____8_TN"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonMeasureSide2-DefaultLine" id1="CLA_2_4" id2="NETWORK" name2="_BUS____2-BUS____4-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonControl-DefaultLine" id1="CLA_2_4" id2="NETWORK" name2="_BUS____2-BUS____4-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonMeasureSide2-DefaultLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
<dyn:macroConnect connector="MC_CurrentLimitAutomatonControl-DefaultLine" id1="CLA_2_5" id2="NETWORK" name2="_BUS____2-BUS____5-1_AC"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="0" id2="_GEN____1_SM"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-NetworkBus" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_BUS____1_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBus" id1="FREQ_SYNC" index1="0" id2="NETWORK" name2="_BUS____1_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="1" id2="_GEN____2_SM"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-NetworkBus" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBus" id1="FREQ_SYNC" index1="1" id2="NETWORK" name2="_BUS____2_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousFourWindingsProportionalRegulations" id1="FREQ_SYNC" index1="2" id2="_GEN____3_SM"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-NetworkBus" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBus" id1="FREQ_SYNC" index1="2" id2="NETWORK" name2="_BUS____3_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="3" id2="_GEN____6_SM"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-NetworkBus" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBus" id1="FREQ_SYNC" index1="3" id2="NETWORK" name2="_BUS____6_TN"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-GeneratorSynchronousThreeWindingsProportionalRegulations" id1="FREQ_SYNC" index1="4" id2="_GEN____8_SM"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-NetworkBus" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_BUS____8_TN"/>
<dyn:macroConnect connector="MC_EventQuadripoleDisconnection-NetworkLine" id1="Disconnect__BUS____1-BUS____5-1_AC" id2="NETWORK" name2="_BUS____1-BUS____5-1_AC"/>
<dyn:macroConnect connector="MC_DYNModelOmegaRef-DefaultBus" id1="FREQ_SYNC" index1="4" id2="NETWORK" name2="_BUS____8_TN"/>
<dyn:macroConnect connector="MC_EventQuadripoleDisconnection-DefaultLine" id1="Disconnect__BUS____1-BUS____5-1_AC" id2="NETWORK" name2="_BUS____1-BUS____5-1_AC"/>
</dyn:dynamicModelsArchitecture>
Loading

0 comments on commit 7d95690

Please sign in to comment.