Merge branch 'master' into 25_IBGclean

dynawo · Jul 21, 2023 · eee050a · eee050a
2 parents 4289698 + 63bab98
commit eee050a
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 3 deletions.
diff --git a/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/DYNBusInterfaceIIDM.cpp b/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/DYNBusInterfaceIIDM.cpp
@@ -142,6 +142,7 @@ BusInterfaceIIDM::importStaticParameters() {
  staticParameters_.insert(std::make_pair("Umax_pu", StaticParameter("Umax_pu", StaticParameter::DOUBLE).setValue(getVMax() / getVNom())));
  staticParameters_.insert(std::make_pair("Umin", StaticParameter("Umin", StaticParameter::DOUBLE).setValue(getVMin())));
  staticParameters_.insert(std::make_pair("Umin_pu", StaticParameter("Umin_pu", StaticParameter::DOUBLE).setValue(getVMin() / getVNom())));
+ staticParameters_.insert(std::make_pair("UNom", StaticParameter("UNom", StaticParameter::DOUBLE).setValue(getVNom())));
 }
 
 } // namespace DYN
diff --git a/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/DYNCalculatedBusInterfaceIIDM.cpp b/dynawo/sources/Modeler/DataInterface/PowSyblIIDM/DYNCalculatedBusInterfaceIIDM.cpp
@@ -169,6 +169,7 @@ CalculatedBusInterfaceIIDM::importStaticParameters() {
  staticParameters_.insert(std::make_pair("Theta", StaticParameter("Theta", StaticParameter::DOUBLE).setValue(getAngle0())));
  staticParameters_.insert(std::make_pair("Upu", StaticParameter("Upu", StaticParameter::DOUBLE).setValue(getV0() / getVNom())));
  staticParameters_.insert(std::make_pair("Theta_pu", StaticParameter("Theta_pu", StaticParameter::DOUBLE).setValue(getAngle0() * M_PI / 180)));
+ staticParameters_.insert(std::make_pair("UNom", StaticParameter("UNom", StaticParameter::DOUBLE).setValue(getVNom())));
 }
 
 bool

diff --git a/dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/Bus.mo b/dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/Bus.mo
@@ -18,16 +18,20 @@ model Bus "Bus"
 
  extends AdditionalIcons.Bus;
 
+ parameter Types.VoltageModule UNom = 1.0 "Nominal voltage in kV";
+
  Connectors.ACPower terminal annotation(
  Placement(visible = true, transformation(origin = {-1.42109e-14, 98}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-1.42109e-14, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
  Types.VoltageModulePu UPu "Voltage amplitude at terminal in pu (base UNom)";
+ Types.VoltageModule U "Voltage amplitude at terminal in kV";
  Types.Angle UPhase "Voltage angle at terminal in rad";
 
 equation
 
  terminal.i = Complex(0);
  UPu = ComplexMath.'abs'(terminal.V);
  UPhase = ComplexMath.arg(terminal.V);
+ U = UPu * UNom;
 
 annotation(preferredView = "text",
  Documentation(info = "<html><head></head><body>The bus model doesn't provide any new equation to the system. It is present into the library for convenience purpose to build network tests.</body></html>"));

diff --git a/dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/InfiniteBus.mo b/dynawo/sources/Models/Modelica/Dynawo/Electrical/Buses/InfiniteBus.mo
@@ -27,15 +27,18 @@ model InfiniteBus "Infinite bus"
 
  parameter Types.PerUnit UPu "Infinite bus constant voltage module";
  parameter Types.Angle UPhase "Infinite bus constant voltage angle";
+ parameter Types.VoltageModule UNom = 1.0 "Nominal voltage in kV";
 
  Types.VoltageModulePu UPuVar "Voltage amplitude at terminal in pu (base UNom)";
  Types.Angle UPhaseVar "Voltage angle at terminal in rad";
+ Types.VoltageModule U "Voltage amplitude at terminal in kV";
 
 equation
 
  terminal.V = UPu * ComplexMath.exp(ComplexMath.j * UPhase);
  UPuVar = UPu;
  UPhaseVar = UPhase;
+ U = UPu * UNom;
 
 annotation(preferredView = "text",
  Documentation(info = "<html><head></head><body>The InfiniteBus model imposes a complex voltage value: the bus voltage magnitude and angle will remain constant throughout the simulation.</body></html>"));

diff --git a/dynawo/sources/Models/Modelica/PreassembledModels/CMakeListsModelsTargets.txt b/dynawo/sources/Models/Modelica/PreassembledModels/CMakeListsModelsTargets.txt
@@ -52,7 +52,10 @@ endforeach()
 ## SMIB
 
 add_custom_target(SMIB_MODELS)
-add_dependencies(SMIB_MODELS InfiniteBus Line TransformerFixedRatio SetPoint NodeFault EventSetPointBoolean Step)
+add_dependencies(SMIB_MODELS InfiniteBus Bus Line TransformerFixedRatio SetPoint NodeFault EventSetPointBoolean Step LoadAlphaBeta)
+
+add_custom_target(SMIB_MODELS_GENERATORS)
+add_dependencies(SMIB_MODELS_GENERATORS GeneratorSynchronousFourWindingsProportionalRegulations GeneratorSynchronousThreeWindingsGoverNordicVRNordic GeneratorSynchronousFourWindingsPmConstVRNordic GeneratorSynchronousThreeWindingsPmConstVRNordic GeneratorSynchronousFourWindingsGovSteam1ExcIEEEST4B GeneratorSynchronousFourWindingsGovSteam1ExcIEEEST4BPssIEEE2B)
 
 ## DYNAFLOW
 

diff --git a/...TestCases/SMIB_1_StepPm/reference/outputs/initValues/globalInit/dumpInitValues-busInf.txt b/...TestCases/SMIB_1_StepPm/reference/outputs/initValues/globalInit/dumpInitValues-busInf.txt
@@ -2,11 +2,13 @@
 infiniteBus_terminal_i_im : y = 0.961526 yp = 0.000000
 infiniteBus_terminal_i_re : y = 22.178985 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+infiniteBus_U : y = 0.900810
 infiniteBus_terminal_V_im : y = 0.000000
 infiniteBus_terminal_V_re : y = 0.900810
 infiniteBus_UPhaseVar : y = 0.000000
 infiniteBus_UPuVar : y = 0.900810
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+infiniteBus_UNom = 1.000000
 infiniteBus_UPhase = 0.000000
 infiniteBus_UPu = 0.900810
diff --git a/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/SMIB.dyd b/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/SMIB.dyd
@@ -16,11 +16,11 @@
  <dyn:staticRef var="infiniteBus_UPuVar" staticVar="v"/>
  <dyn:staticRef var="infiniteBus_UPhaseVar" staticVar="angle"/>
  </dyn:blackBoxModel>
- <dyn:blackBoxModel id="bus1" lib="Bus" staticId="VL2_BUS1">
+ <dyn:blackBoxModel id="bus1" lib="Bus" staticId="VL2_BUS1" parFile="SMIB.par" parId="bus1">
  <dyn:staticRef var="bus_UPu" staticVar="v"/>
  <dyn:staticRef var="bus_UPhase" staticVar="angle"/>
  </dyn:blackBoxModel>
- <dyn:blackBoxModel id="bus2" lib="Bus" staticId="VL3_BUS1">
+ <dyn:blackBoxModel id="bus2" lib="Bus" staticId="VL3_BUS1" parFile="SMIB.par" parId="bus2">
  <dyn:staticRef var="bus_UPu" staticVar="v"/>
  <dyn:staticRef var="bus_UPhase" staticVar="angle"/>
  </dyn:blackBoxModel>

diff --git a/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/SMIB.par b/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/SMIB.par
@@ -16,6 +16,13 @@
  <set id="1">
  <reference type="DOUBLE" name="infiniteBus_UPu" origData="IIDM" origName="Upu"/>
  <reference type="DOUBLE" name="infiniteBus_UPhase" origData="IIDM" origName="Theta_pu"/>
+ <reference type="DOUBLE" name="infiniteBus_UNom" origData="IIDM" origName="UNom"/>
+ </set>
+ <set id="bus1">
+ <reference type="DOUBLE" name="bus_UNom" origData="IIDM" origName="UNom"/>
+ </set>
+ <set id="bus2">
+ <reference type="DOUBLE" name="bus_UNom" origData="IIDM" origName="UNom"/>
  </set>
  <!-- line 1 -->
  <set id="2">

diff --git a/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/curves.crv b/nrt/data/SMIB/SMIB_BasicTestCases/SMIB_1_StepPm_IIDM/curves.crv
@@ -47,4 +47,6 @@
  <curve model="tfo" variable="transformer_terminal1_i_im"/>
  <curve model="tfo" variable="transformer_terminal2_i_re"/>
  <curve model="tfo" variable="transformer_terminal2_i_im"/>
+ <curve model="bus1" variable="bus_U"/>
+ <curve model="busInf" variable="infiniteBus_U"/>
 </curvesInput>
diff --git a/...tCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-bus1.txt b/...tCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-bus1.txt
@@ -2,9 +2,11 @@
 bus_terminal_V_im : y = 0.324855 yp = 0.000000
 bus_terminal_V_re : y = 0.886722 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+bus_U : y = 0.944355
 bus_UPhase : y = 0.351170
 bus_UPu : y = 0.944355
 bus_terminal_i_im : y = 0.000000
 bus_terminal_i_re : y = 0.000000
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+bus_UNom = 1.000000
diff --git a/...tCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-bus2.txt b/...tCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-bus2.txt
@@ -2,9 +2,11 @@
 bus_terminal_V_im : y = 0.474562 yp = 0.000000
 bus_terminal_V_re : y = 0.880230 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+bus_U : y = 1.000007
 bus_UPhase : y = 0.494463
 bus_UPu : y = 1.000007
 bus_terminal_i_im : y = 0.000000
 bus_terminal_i_re : y = 0.000000
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+bus_UNom = 1.000000
diff --git a/...ases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-busInf.txt b/...ases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/globalInit/dumpInitValues-busInf.txt
@@ -2,11 +2,13 @@
 infiniteBus_terminal_i_im : y = 0.961812 yp = 0.000000
 infiniteBus_terminal_i_re : y = 22.178845 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+infiniteBus_U : y = 0.900810
 infiniteBus_terminal_V_im : y = 0.000000
 infiniteBus_terminal_V_re : y = 0.900810
 infiniteBus_UPhaseVar : y = 0.000000
 infiniteBus_UPuVar : y = 0.900810
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+infiniteBus_UNom = 1.000000
 infiniteBus_UPhase = 0.000000
 infiniteBus_UPu = 0.900810
diff --git a/...stCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-bus1.txt b/...stCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-bus1.txt
@@ -2,9 +2,11 @@
 bus_terminal_V_im : y = 0.000000 yp = 0.000000
 bus_terminal_V_re : y = 0.000000 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+bus_U : y = 0.000000
 bus_UPhase : y = 0.000000
 bus_UPu : y = 0.000000
 bus_terminal_i_im : y = 0.000000
 bus_terminal_i_re : y = 0.000000
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+bus_UNom = 1.000000
diff --git a/...stCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-bus2.txt b/...stCases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-bus2.txt
@@ -2,9 +2,11 @@
 bus_terminal_V_im : y = 0.000000 yp = 0.000000
 bus_terminal_V_re : y = 0.000000 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+bus_U : y = 0.000000
 bus_UPhase : y = 0.000000
 bus_UPu : y = 0.000000
 bus_terminal_i_im : y = 0.000000
 bus_terminal_i_re : y = 0.000000
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+bus_UNom = 1.000000
diff --git a/...Cases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-busInf.txt b/...Cases/SMIB_1_StepPm_IIDM/reference/outputs/initValues/localInit/dumpInitValues-busInf.txt
@@ -2,11 +2,13 @@
 infiniteBus_terminal_i_im : y = 0.000000 yp = 0.000000
 infiniteBus_terminal_i_re : y = 0.000000 yp = 0.000000
  ====== INIT CALCULATED VARIABLES VALUES ======
+infiniteBus_U : y = 0.900810
 infiniteBus_terminal_V_im : y = 0.000000
 infiniteBus_terminal_V_re : y = 0.900810
 infiniteBus_UPhaseVar : y = 0.000000
 infiniteBus_UPuVar : y = 0.900810
  ====== INIT DISCRETE VARIABLES VALUES ======
  ====== PARAMETERS VALUES ======
+infiniteBus_UNom = 1.000000
 infiniteBus_UPhase = 0.000000
 infiniteBus_UPu = 0.900810