Fix Wecc and GridForming omega ref connection (#390)

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
powsybl · Oct 9, 2024 · f391e9c · f391e9c
1 parent 3152271
commit f391e9c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/...ain/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizedModel.java b/...ain/java/com/powsybl/dynawo/models/frequencysynchronizers/FrequencySynchronizedModel.java
@@ -19,12 +19,7 @@
  */
 public interface FrequencySynchronizedModel extends Model {
 
-    default List<VarConnection> getOmegaRefVarConnections() {
-        return List.of(
-                new VarConnection("omegaRef_grp_@INDEX@", getOmegaRefPuVarName()),
-                new VarConnection("running_grp_@INDEX@", getRunningVarName())
-        );
-    }
+    List<VarConnection> getOmegaRefVarConnections();
 
     default List<VarConnection> getSetPointVarConnections() {
         return List.of(

diff --git a/...o-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverter.java b/...o-simulation/src/main/java/com/powsybl/dynawo/models/generators/GridFormingConverter.java
@@ -62,8 +62,8 @@ public String getRunningVarName() {
     @Override
     public List<VarConnection> getOmegaRefVarConnections() {
         return List.of(
-                new VarConnection("omega_grp_@INDEX@", getOmegaPuVarName()),
-                new VarConnection("omegaRef_grp_@INDEX@", getOmegaRefPuVarName()),
+                new VarConnection("omega_grp_@INDEX@_value", getOmegaPuVarName()),
+                new VarConnection("omegaRef_grp_@INDEX@_value", getOmegaRefPuVarName()),
                 new VarConnection("running_grp_@INDEX@", getRunningVarName())
         );
     }

diff --git a/...wo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedWeccGen.java b/...wo-simulation/src/main/java/com/powsybl/dynawo/models/generators/SynchronizedWeccGen.java
@@ -8,11 +8,14 @@
 package com.powsybl.dynawo.models.generators;
 
 import com.powsybl.dynawo.builders.ModelConfig;
+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;
 
+import java.util.List;
+
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
@@ -22,6 +25,14 @@ protected SynchronizedWeccGen(String dynamicModelId, Generator generator, String
         super(dynamicModelId, generator, parameterSetId, modelConfig, weccPrefix);
     }
 
+    @Override
+    public List<VarConnection> getOmegaRefVarConnections() {
+        return List.of(
+                new VarConnection("omegaRef_grp_@INDEX@_value", getOmegaRefPuVarName()),
+                new VarConnection("running_grp_@INDEX@", getRunningVarName())
+        );
+    }
+
     @Override
     public String getOmegaRefPuVarName() {
         return weccPrefix + "_omegaRefPu";

diff --git a/dynawo-simulation/src/test/resources/grid_forming_converter_dyd.xml b/dynawo-simulation/src/test/resources/grid_forming_converter_dyd.xml
@@ -8,8 +8,8 @@
         <dyn:connect var1="converter_terminal" var2="@STATIC_ID@@NODE@_ACPIN"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-GridFormingConverterDroopControl">
-        <dyn:connect var1="omega_grp_@INDEX@" var2="converter_omegaPu"/>
-        <dyn:connect var1="omegaRef_grp_@INDEX@" var2="control_omegaRefPu"/>
+        <dyn:connect var1="omega_grp_@INDEX@_value" var2="converter_omegaPu"/>
+        <dyn:connect var1="omegaRef_grp_@INDEX@_value" var2="control_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="converter_running"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">

diff --git a/dynawo-simulation/src/test/resources/wecc_pv_dyd.xml b/dynawo-simulation/src/test/resources/wecc_pv_dyd.xml
@@ -8,7 +8,7 @@
         <dyn:connect var1="photovoltaics_terminal" var2="@STATIC_ID@@NODE@_ACPIN"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-PhotovoltaicsWeccCurrentSource">
-        <dyn:connect var1="omegaRef_grp_@INDEX@" var2="photovoltaics_omegaRefPu"/>
+        <dyn:connect var1="omegaRef_grp_@INDEX@_value" var2="photovoltaics_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="photovoltaics_injector_running"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">

diff --git a/dynawo-simulation/src/test/resources/wecc_wt_synchro_dyd.xml b/dynawo-simulation/src/test/resources/wecc_wt_synchro_dyd.xml
@@ -8,7 +8,7 @@
         <dyn:connect var1="WTG4B_terminal" var2="@STATIC_ID@@NODE@_ACPIN"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-WTG4BWeccCurrentSource">
-        <dyn:connect var1="omegaRef_grp_@INDEX@" var2="WTG4B_omegaRefPu"/>
+        <dyn:connect var1="omegaRef_grp_@INDEX@_value" var2="WTG4B_omegaRefPu"/>
         <dyn:connect var1="running_grp_@INDEX@" var2="WTG4B_injector_running"/>
     </dyn:macroConnector>
     <dyn:macroConnector id="MC_DYNModelOmegaRef-DefaultBusOfFrequencySynchronized">