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

PhaseAngleClock as an extension in ThreeWindingsTransformer and CGMES conversion #1041

Merged

miovd merged 110 commits into master from cgmes_conversion_T3xPhaseAngleClock

Dec 3, 2019

Contributor

marqueslanauja commented Dec 2, 2019

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Feature

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?
PhaseAngleClock is added in threeWindingsTransformer as an extension. Only leg2 and leg3 can have phaseAngleClock. PhaseAngleClock is considered at the network side of the leg.

Does this PR introduce a breaking change or deprecate an API? If yes, check the following:

The Breaking Change or Deprecated label has been added
The migration guide has been updated in the github wiki (What changes might users need to make in their application due to this PR?)

Other information:

(if any of the questions/checkboxes don't apply, please delete them entirely)

marqueslanauja and others added 30 commits

October 1, 2019 10:57


          Refact generator regulating control

6abc109

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Refac generator regulating control

d28f317

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'master' into cgmes_conversion_generatorRegulatingControl

c6b668c


          refact generator regulating control

0d63860

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Refact generator regulating control

778f8cf

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          reformatted

f41dfd2

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Organize code in separate modules for regulating controls conversion …

e6e9d3d

…(step 1: generators)

Signed-off-by: Luma Zamarreño <zamarrenolm@aia.es>


          Delete old class

a86c631

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Two windings tranformer regulating control refactoring

490eb67

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Two windings transformer regulating control refactoring

bcbaa19

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Three windings transformers regulating control refactoring

0e1da90

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Static Var Compensator Regulating Control refactoring

fc2aa56

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'master' into cgmes_conversion_T3xRegulatingControl

4d65594

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

# Conflicts:
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/RegulatingControlMapping.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/RegulatingControlMappingForGenerators.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/RegulatingControlMappingForTransformers.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/ExternalNetworkInjectionConversion.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/PhaseTapChangerConversion.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/RatioTapChangerConversion.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SynchronousMachineConversion.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/TwoWindingsTransformerConversion.java


          Merge master into branch T3xRegulatingControl

ef1aeeb

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'master' into cgmes_conversion_T3xRegulatingControl

0bba422


          Warning message

9fcdf8f

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Sonar Fixes

a019a75

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Unitary test: three windings transformer with two regulating controls…

7ce822a

… enabled.

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'cgmes_conversion_T3xRegulatingControl' into cgmes_conve…

4cf92c1

…rsion_svcRegulatingControl

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

# Conflicts:
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/RegulatingControlMapping.java
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/StaticVarCompensatorConversion.java


          Reviewer comments

d92bee3

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'master' into cgmes_conversion_T3xRegulatingControl

93e7a96


          Merge branch 'cgmes_conversion_T3xRegulatingControl' into cgmes_conve…

d85b294

…rsion_svcRegulatingControl


          CorrectlySet adjustments

eaab7bf

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Fix hasCorrectlySet

33680f2

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'cgmes_conversion_svcRegulatingControl' into cgmes_conve…

8df2c40

…rsion_regulatingControlUniformization

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

# Conflicts:
#	cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/RegulatingControlMappingForStaticVarCompensators.java


          Fix correctlySet

2360b88

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          initialize: uniformization

54768bc

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          class names and method names: uniformization

0d9569d

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Reviewer comments, merge some methods

e15f7f8

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          Merge branch 'master' into cgmes_conversion_T3xRegulatingControl

d4f4e4f

marqueslanauja and others added 8 commits

November 26, 2019 12:49


          Merge branch 'master' into cgmes_conversion_T3x

fa25c8b

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

# Conflicts:
#	iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/Leg2or3Adapter.java
#	iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/LegAdapter.java
#	iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/ThreeWindingsTransformerAdapter.java


          Apply reviewer comments

d21bec0

Signed-off-by: José Antonio Marqués <marquesja@aia.es>


          warn if both Ratio and Phase Tap Changer are present in two and three…

fb38345

… windings transformers

Signed-off-by: Luma Zamarreño <zamarrenolm@aia.es>


          Merge branch 'cgmes_conversion_T3x' into cgmes_conversion_T3xPhaseAng…

26d7404

…leClock


          Merge branch 'master' into cgmes_conversion_T3x

6c0cf3e


          Merge branch 'cgmes_conversion_T3x' into cgmes_conversion_T3xPhaseAng…

b009b31

…leClock


          Merge branch 'master' into cgmes_conversion_T3xPhaseAngleClock

3ec7b19

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

# Conflicts:
#	cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/network/compare/Comparison.java


          PhaseAngleClock, resource adjustment

453a88f

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

marqueslanauja added IIDM CGMES labels

marqueslanauja requested review from zamarrenolm and miovd

December 2, 2019 11:44

miovd added the PR: waiting-for-review label

miovd approved these changes

View reviewed changes

miovd added PR: ready-to-be-merged and removed PR: waiting-for-review labels

coveralls commented Dec 2, 2019 •

edited

Loading

Coverage increased (+0.007%) to 84.44% when pulling 79c69bf on cgmes_conversion_T3xPhaseAngleClock into 9f85f08 on master.

Contributor

miovd commented Dec 2, 2019

Note: the Sonarcloud should be ignored, the duplication warning is a false positive in my opinion.

miovd added 2 commits

December 2, 2019 16:40


          Merge branch 'master' into cgmes_conversion_T3xPhaseAngleClock

6aa8de3


          Merge branch 'master' into cgmes_conversion_T3xPhaseAngleClock

79c69bf

miovd changed the title ~~Cgmes conversion phaseAngleClock as an extension in ThreeWindingsTransformer~~ PhaseAngleClock as an extension in ThreeWindingsTransformer

miovd added XIIDM and removed CGMES labels

miovd changed the title ~~PhaseAngleClock as an extension in ThreeWindingsTransformer~~ PhaseAngleClock as an extension in ThreeWindingsTransformer and CGMES conversion

miovd added the CGMES label

zamarrenolm approved these changes

View reviewed changes

miovd merged commit 366f1af into master

miovd deleted the cgmes_conversion_T3xPhaseAngleClock branch

December 3, 2019 13:22

miovd removed the PR: ready-to-be-merged label

mathbagu mentioned this pull request

[IIDM v1.0] Two windings transformer: add phaseAngleClock, only one tap changer regulating powsybl/powsybl-iidm4cpp#18

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment