Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3210 MultiSwitch with for loop, nrt references updated #3278

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#3210 MultiSwitch with for loop, nrt references updated #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
#3210 MultiSwitch with for loop, nrt and OpenModelica references updated 
Signed-off-by: Erwan Guichard <erwan.guichard_externe@rte-france.com>
  • Loading branch information
Erwan Guichard committed Dec 11, 2024
commit 878cacb91ce6bb47b62c3a4e9870fc99a1e4b2ea
3 changes: 1 addition & 2 deletions ...Modelica/Dynawo/Electrical/Controls/IEC/IEC61400/BaseControls/Auxiliaries/Measurements.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ within Dynawo.Electrical.Controls.IEC.IEC61400.BaseControls.Auxiliaries;
*/

model Measurements "Measurement module for wind turbine controls (IEC N°61400-27-1)"

extends Dynawo.Electrical.Controls.IEC.IEC61400.BaseControls.Auxiliaries.MeasurementsPQ;
extends Dynawo.Electrical.Controls.IEC.IEC61400.BaseControls.Auxiliaries.MeasurementsPQ;

//Nominal parameters
parameter Types.Time tS "Integration time step in s";
Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Electrical/Controls/WECC/REEC/REECc.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ within Dynawo.Electrical.Controls.WECC.REEC;
*/

model REECc "WECC Electrical Control type C"
extends Dynawo.Electrical.Controls.WECC.REEC.BaseClasses.BaseREEC;
extends Dynawo.Electrical.Controls.WECC.REEC.BaseClasses.BaseREEC;

// REEC-C parameters
parameter Types.PerUnit SOCMaxPu "Maximum allowable state of charge in pu (base SNom) (typical: 0.8..1)" annotation(
Expand Down
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Examples/BESS/WECC/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ within Dynawo.Examples.BESS;
*/

package WECC "Examples with WECC models for battery energy storage systems "
extends Icons.Package;
extends Icons.Package;
end WECC;
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Examples/BESS/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ within Dynawo.Examples;
*/

package BESS "Battery energy storage systems test cases"
extends Icons.Package;
extends Icons.Package;
end BESS;
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Examples/IEEE118/BaseClasses/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ within Dynawo.Examples.IEEE118;
*/

package BaseClasses
extends Icons.Package;
extends Icons.Package;
end BaseClasses;
21 changes: 11 additions & 10 deletions dynawo/sources/Models/Modelica/Dynawo/Examples/IEEE118/TestCases/IEEE118NoEvent.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ within Dynawo.Examples.IEEE118.TestCases;
* This file is part of Dynawo, an hybrid C++/Modelica open source suite
* of simulation tools for power systems.
*/

model IEEE118NoEvent "Base class for IEEE 118-bus system benchmark formed with 118 buses, 54 generators, 14 shunts, 9 transformers , 177 lines and 99 loads."
extends Dynawo.Examples.IEEE118.BaseClasses.IEEE118Base;
extends Icons.Example;
extends Dynawo.Examples.IEEE118.BaseClasses.IEEE118Base;
extends Icons.Example;

equation
//Switchoffs
//Switchoffs
B1_L1.switchOffSignal1.value = false;
B1_L1.switchOffSignal2.value = false;
B2_L1.switchOffSignal1.value = false;
Expand Down Expand Up @@ -779,7 +780,7 @@ equation
B110_SH1.switchOffSignal1.value = false;
B110_SH1.switchOffSignal2.value = false;

//Loads inputs
//Loads inputs
B1_L1.PRefPu = 0.51;
B1_L1.QRefPu = 0.27;
B1_L1.deltaP = 0;
Expand Down Expand Up @@ -1177,7 +1178,7 @@ equation
B118_L1.deltaP = 0;
B118_L1.deltaQ = 0;

//Generators optional variables
//Generators optional variables
B1_G1.UStatorRefPu = B1_G1.UStatorRef0Pu;
B1_G1.PRefPu = B1_G1.PRef0Pu;
B4_G1.UStatorRefPu = B4_G1.UStatorRef0Pu;
Expand Down Expand Up @@ -1287,9 +1288,9 @@ equation
B116_G1.UStatorRefPu = B116_G1.UStatorRef0Pu;
B116_G1.PRefPu = B116_G1.PRef0Pu;

//Annotations and calculation parameters
annotation(preferredView = "text",
experiment(StartTime = 0, StopTime = 500, Tolerance = 1e-06, Interval = 10),
__OpenModelica_commandLineOptions = "--matchingAlgorithm=PFPlusExt --indexReductionMethod=dynamicStateSelection -d=initialization,NLSanalyticJacobian --daeMode",
__OpenModelica_simulationFlags(ls = "klu", lv = "LOG_STATS", nls = "kinsol", s = "euler"));
annotation(
preferredView = "text",
experiment(StartTime = 0, StopTime = 500, Tolerance = 1e-06, Interval = 10),
__OpenModelica_commandLineOptions = "--matchingAlgorithm=PFPlusExt --indexReductionMethod=dynamicStateSelection -d=initialization,NLSanalyticJacobian --daeMode",
__OpenModelica_simulationFlags(ls = "klu", lv = "LOG_STATS", nls = "kinsol", s = "euler"));
end IEEE118NoEvent;
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Examples/IEEE14/BaseClasses/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ within Dynawo.Examples.IEEE14;
*/

package BaseClasses
extends Icons.Package;
extends Icons.Package;
end BaseClasses;
2 changes: 1 addition & 1 deletion dynawo/sources/Models/Modelica/Dynawo/Examples/Wind/IEC/Neplan/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ within Dynawo.Examples.Wind.IEC;
*/

package Neplan "Neplan test model for type 4 WT"
extends Icons.Package;
extends Icons.Package;
end Neplan;
30,180 changes: 15,090 additions & 15,090 deletions ...els/Modelica/Dynawo/Examples/Wind/IEC/Neplan/reference/WPP4ACurrentSource2020FOCB_res.csv
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading