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

Jump to bottom

#3091 PssIEEE2B -> Pss2b, SCRX -> Scrx, TGOV11… #3272

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

#3091 PssIEEE2B -> Pss2b, SCRX -> Scrx, TGOV11… #3272

wants to merge 1 commit into from

Conversation

ErwanGuichard49
Copy link
Collaborator

… -> TGov1, PSS2A1 -> Pss2a, ExcIEEEST4B -> St4b, ExcIEEEAC1A -> ExAc1 (approximate Ve0Pu), HYGOV1 -> HyGov, IEEET1 extends Dc1c

@ErwanGuichard49 ErwanGuichard49 added this to the v1.7.0 milestone Jun 10, 2024
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch from b5484f9 to 0805cba Compare June 10, 2024 14:28
@joyelfeghali joyelfeghali linked an issue Jun 10, 2024 that may be closed by this pull request
Add standard IEEE regulations #3091
Closed
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 2 times, most recently from 7594bec to 8b0f7f9 Compare June 12, 2024 07:44
@ErwanGuichard49 ErwanGuichard49 marked this pull request as ready for review June 12, 2024 09:49
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 3 times, most recently from 1391cbb to 6e02dd6 Compare June 18, 2024 08:52
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 2 times, most recently from 62b215a to 6900dc2 Compare June 26, 2024 12:35
@ErwanGuichard49 ErwanGuichard49 marked this pull request as draft June 27, 2024 14:53
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch from 6900dc2 to f22db45 Compare June 27, 2024 15:13
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 2 times, most recently from f28fccf to 014fe84 Compare July 5, 2024 16:26
@ErwanGuichard49 ErwanGuichard49 changed the title #3091 PssIEEE2B -> Pss2b, SCRX -> Scrx (distinction UPu/UsPu), TGOV11… #3091 PssIEEE2B -> Pss2b, SCRX -> Scrx, TGOV11… Jul 5, 2024
@ErwanGuichard49 ErwanGuichard49 marked this pull request as ready for review July 5, 2024 16:27
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 4 times, most recently from 04917b5 to b6ad21a Compare July 10, 2024 09:29
joyelfeghali
joyelfeghali requested changes Jul 10, 2024
View reviewed changes
util/updateXML/update1.7.0.0.py
@@ -12,36 +12,96 @@
# of simulation tools for power systems.
from content.Ticket import ticket

# rename IEEEG1 as IEEEG11, SCRX as SCRX1, IEEET1 : UStator0Pu -> Us0Pu, Standard.IEEET1_INIT -> Exciter_INIT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should keep both updateXML and put them by order of how they were merged (even if it is the same ticket)

For example
we keep 1.7.0.0 as it is
IEEET1 : UStator0Pu -> Us0Pu, Standard.IEEET1_INIT -> Exciter_INIT should be put in 1.7.0.5
and
replace PSS2A1 by Pss2a, PssIEEE2B by Pss2b, ExcIEEEAC1A by Ac1a, ExcIEEEST4B by St4b, SCRX by Scrx, HYGOV1 by HyGov, TGOV11 by TGov1 should be put in 1.7.0.6

Also add the name change of :
GovSteam1St4bPss2b1.mo
GovSteam1St4b2.mo
GovSteam1St4bPss2b3.mo
We want to add the change of the names even of the OpenModelica examples

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The goal of updateXML files is to enable a smooth transition between two Dynawo releases. Therefore, what is the point of splitting this updateXML ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added lines for the name changes of the OpenModelica examples.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The goal of updateXML files is to enable a smooth transition between two Dynawo releases. Therefore, what is the point of splitting this updateXML ?

Yes, I agree but it just needs to be put in the order of how the merge was done.
Since we haven't changed anything in between the two developments, it makes sense to put them as you did, in the same folder. I think it won't change the final result
But it's more proper to have them separate to know what was done first.
I will ask to see if the order is important or not

...odels/Modelica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/ExcIEEEST4B.mo Outdated Show resolved Hide resolved
...delica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/BaseClasses/SatChar.mo Outdated Show resolved Hide resolved
...ces/Models/Modelica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/IEEET1.mo Outdated Show resolved Hide resolved
nrt/data/SMIB/Standard/TestCase1ST4B/TestCase1ST4B.par Show resolved Hide resolved
nrt/data/SMIB/Standard/TestCase1ST4B/reference/outputsTestCase1ST4B/curves/curves.csv Outdated Show resolved Hide resolved
...rces/Models/Modelica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/ExAc1.mo Show resolved Hide resolved
dynawo/sources/Models/Modelica/Dynawo/Examples/ENTSOE/TestCase1.mo Show resolved Hide resolved
...rces/Models/Modelica/Dynawo/Electrical/Controls/Machines/Governors/Standard/Steam/IEEEG11.mo Show resolved Hide resolved
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 2 times, most recently from 1ff01f4 to b36d290 Compare July 11, 2024 12:19
joyelfeghali
joyelfeghali requested changes Jul 15, 2024
View reviewed changes
...rces/Models/Modelica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/ExAc1.mo Outdated Show resolved Hide resolved
...rces/Models/Modelica/Dynawo/Electrical/Controls/Machines/VoltageRegulators/Standard/ExAc1.mo Outdated Show resolved Hide resolved
dynawo/sources/Models/Modelica/Dynawo/Examples/ENTSOE/TestCase1.mo Outdated Show resolved Hide resolved
dynawo/sources/Models/Modelica/Dynawo/Examples/ENTSOE/TestCase3.mo Outdated Show resolved Hide resolved
...wo/sources/Models/Modelica/Dynawo/Examples/RVS/Components/GeneratorWithControl/HydroFrame.mo
@@ -138,9 +137,6 @@ model HydroFrame "Model of a hydraulic generator with a governor, a voltage regu
parameter Types.VoltageModulePu U0Pu "Initial voltage amplitude at generator terminal in pu (base UNom)";
parameter Types.Angle UPhase0 "Initial voltage angle at generator terminal in rad";

initial algorithm
scrx.UStator0Pu := generatorSynchronous.UStator0Pu;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you remove it?

...rces/Models/Modelica/PreassembledModels/GeneratorSynchronousThreeWindingsPmConstExAc1Tfo.xml Outdated Show resolved Hide resolved
examples/DynaSwing/ENTSOE/TestCase1/TestCase1.par Outdated Show resolved Hide resolved
examples/DynaSwing/ENTSOE/TestCase3/TestCase3.par Outdated Show resolved Hide resolved
nrt/data/DynaSwing/EntsoeTestCase3PlayBack/TestCase3.par Show resolved Hide resolved
nrt/data/SMIB/Standard/TestCase2ST4B/TestCase2ST4B.par Show resolved Hide resolved
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch 3 times, most recently from 869410c to 0c10566 Compare July 17, 2024 09:43
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch from 0c10566 to 0733942 Compare July 17, 2024 11:44
@ErwanGuichard49
#3091 PssIEEE2B -> Pss2b, SCRX1 -> SCRX, TGOV11 -> TGov1, PSS2A1 -> P…
100e010 
…ss2a, ExcIEEEST4B -> St4b, ExcIEEEAC1A -> ExAc1, HYGOV1 -> HyGov, two .xml transferred to dynawo-rte, Rvs removed from names, indentation standardized, OM test cases' references updated, OM and Dynawo test cases harmonized

Signed-off-by: Erwan Guichard <erwan.guichard_externe@rte-france.com>
@ErwanGuichard49 ErwanGuichard49 force-pushed the 3091_use_new_standard_regulations branch from 0733942 to 100e010 Compare July 19, 2024 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joyelfeghali joyelfeghali joyelfeghali requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Models library
Projects
None yet
Milestone
v1.7.0
Development

Successfully merging this pull request may close these issues.

Add standard IEEE regulations
2 participants
@ErwanGuichard49 @joyelfeghali