TwoWindings and ThreeWindings new Cgmes conversion #1066

marqueslanauja · 2019-12-10T08:48:40Z

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)
Current Tx Cgmes conversion is done in two steps. In the first step transformer attributes are assigned to all transformers. In the second step the ratioTapChanger and phaseTapChanger Cgmes conversion is done for all tapChangers.

What is the new behavior (if this is a feature change)?
Cgmes conversion of each transformer (Two and Three windings) is concentrated in one step.

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?)
Both, current and new Cgmes conversion are maintained in the code at the moment and it is possibly to switch between them. Deprecated label has been added to current Cgmes conversion non-private methods.

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

CurrentCgmesConversion is defined in the following four files:

TwoWindingsTransformerConversion.java
ThreeWindingsTransformerConversion.java
RatioTapChangerConversion.java
PhaseTapChangerConversion.java.

At the end of the process the four files will be deleted.

NewCgmesConversion is defined in the next files:

NewTwoWindingsTransformerConversion.java. New Cgmes conversion for two windings transformers.
NewThreeWindingsTransformerConversion.java. New Cgmes conversion for three windings transformers.
AbstractTransformerConversion.java. Common methods used in previous classes.
TapChangerConversion.java. Class to record Cgmes attributes of a tapChanger (ratio or phase)

After deleting the currentCgmesConversion NewTwoWindingsTransformerConversion and NewThreeWindingsTransformerConversion will be renamed TwoWindingsTransformerConversion and ThreeWindingsTransformerConversion

The NewCgmesConversion of each transformer is divided in four steps:

load. Cgmes attributes are collected.
interpret. Cgmes data is interpreted according to the configured alternative.
convert. Cgmes data is converted to IIDM.
set. Transformer IIDM model is set.

Brief description of the changed files:

Context.java ratio and phase tapChanger tables are cached.
Conversion.java. Switch between both Cgmes conversions. Methods to configure the different alternatives supported in the interpretation process.
RegulatingControlMappingForTransformers.java. Extend regulating control to all possible tapChangers in a threeWindingsTransformer.
ConversionTester.java. Temporary modification of the test to compare newCgmesConversion and currentCgmesConversion.
Comparison.java, Differences.java, DifferencesFail.java, DifferencesReport.java. Improve buses comparison to support node breaker models.
CgmesModel.java, CgmesModelTripleStore.java, CIM16.sparql, FakeCgmesModel.java. Add phaseTapChanger tables points
BranchData.java. Add phaseAngleClock.
TwtData.java. Add phaseAngleClock, g and b in all legs and ratedU0.
TwtTestData.java. Adjust g, b in all legs, phaseAngleClock and ratedU0.
ThreeWindingsTransformerImpl.java Extend some methods to all possible tapChangers.
LoadflowValidation and LoadflowResultsCompletion files. Add phaseAngleClock, ratedU0 and g and b in all legs.

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

…(step 1: generators) Signed-off-by: Luma Zamarreño <zamarrenolm@aia.es>

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

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

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

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

…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

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

…rsion_svcRegulatingControl

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

…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

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

marqueslanauja · 2020-01-12T16:52:47Z

For readibility purposes, I think it would be better to really separate CgmesT3xModel, InterpretedT3xModel and ConvertedT3xModel in three separate classes, rather than making them three subclasses in NewThreeWindingsTransformerConversion. This way, each class can have the methods dealing with them and it will be easier to discriminate particularly between interpretation and pure conversion.

Same remark for CgmesT2xModel, InterpretedT2xModel and ConvertedT2xModel.
Once this is done, it is okay for me to merge!

Done

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

miovd

Some minor remarks.
Could you also rename TapChanger, TapChangerBuilder, RatioTapChangerBuilder and PhaseTapChangerBuilder respectively as CgmesTapChanger, CgmesTapChangerBuilder, CgmesRatioTapChangerBuilder and CgmesPhaseTapChangerBuilder?

miovd · 2020-01-13T09:19:34Z

...sion/src/main/java/com/powsybl/cgmes/conversion/elements/transformers/TapChangerBuilder.java

@@ -0,0 +1,54 @@
+package com.powsybl.cgmes.conversion.elements.transformers;


Add copyright (2020)

Done. I have not change TapChanger to CgmesTapChanger as it is used also in interpreted and converted models and will be confusing.

...sion/src/main/java/com/powsybl/cgmes/conversion/elements/transformers/TapChangerBuilder.java

...src/main/java/com/powsybl/cgmes/conversion/elements/transformers/RatioTapChangerBuilder.java

...sion/src/main/java/com/powsybl/cgmes/conversion/elements/transformers/ConvertedT3xModel.java

miovd · 2020-01-13T09:41:12Z

...nversion/src/main/java/com/powsybl/cgmes/conversion/elements/transformers/CgmesT2xModel.java

+    static class CgmesEnd {
+        final double g;
+        final double b;
+        final TapChanger ratioTapChanger;
+        final TapChanger phaseTapChanger;
+        final double ratedU;
+        final String terminal;
+
+        CgmesEnd(PropertyBag bagEnd, double x, Context context) {
+            this.g = bagEnd.asDouble(CgmesNames.G, 0);
+            this.b = bagEnd.asDouble(CgmesNames.B);
+            this.ratioTapChanger = TapChanger.ratioTapChangerFromEnd(bagEnd, context);
+            this.phaseTapChanger = TapChanger.phaseTapChangerFromEnd(bagEnd, x, context);
+            this.ratedU = bagEnd.asDouble(CgmesNames.RATEDU);
+            this.terminal = bagEnd.getId(CgmesNames.TERMINAL);
+        }
+    }
+}


I think CgmesT2xModel.CgmesEnd and CgmesT3xModel.CgmesEnd could be fused in one unique class CgmesEnd, what do you think?

I prefer to keep them separated since in twoWindingsTransformers to build the phaseTapChanger you need the reactance of the transformer and this reactance is not always the reactante of the CgmesEnd.

...src/main/java/com/powsybl/cgmes/conversion/elements/transformers/PhaseTapChangerBuilder.java

miovd · 2020-01-13T09:52:08Z

I approved this PR since all the comments I made are minor. Regarding the refactoring of CgmesT2xModel.CgmesEnd and CgmesT3xModel.CgmesEnd, it can be done later in another PR, it was just to have your opinion.

annetill

I approve this PR, just a small comment to improve the comment of "conversion.java".

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

Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

sonarcloud · 2020-01-14T10:19:29Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities (and 0 Security Hotspots to review)
19 Code Smells

80.8% Coverage
0.4% Duplication

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 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>

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>

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 added 2 commits January 13, 2020 00:28

Reduce duplicated code

e023f0c

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

Delete unnecessary code

0311627

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

miovd added PR: waiting-for-review and removed PR: conflict-with-main PR: waiting-for-correction labels Jan 13, 2020

miovd self-requested a review January 13, 2020 09:13

miovd reviewed Jan 13, 2020

View reviewed changes

...src/main/java/com/powsybl/cgmes/conversion/elements/transformers/PhaseTapChangerBuilder.java Outdated Show resolved Hide resolved

miovd reviewed Jan 13, 2020

View reviewed changes

...src/main/java/com/powsybl/cgmes/conversion/elements/transformers/PhaseTapChangerBuilder.java Outdated Show resolved Hide resolved

miovd self-requested a review January 13, 2020 09:50

miovd approved these changes Jan 13, 2020

View reviewed changes

miovd added PR: waiting-for-correction PR: waiting-for-info-author and removed PR: waiting-for-review labels Jan 13, 2020

Merge branch 'master' into cgmes_conversion_TxConversion

9caa343

annetill approved these changes Jan 13, 2020

View reviewed changes

marqueslanauja and others added 2 commits January 13, 2020 17:52

Apply reviewer comments

f1d8ae0

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

Fix code smells

f83f3b1

Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

annetill added the PR: ready-to-be-merged label Jan 14, 2020

miovd removed PR: waiting-for-correction PR: waiting-for-info-author labels Jan 14, 2020

miovd added 2 commits January 14, 2020 09:36

Fix code smells (bis)

63b7395

Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

Merge branch 'master' into cgmes_conversion_TxConversion

5589097

miovd merged commit 0b81084 into master Jan 14, 2020

miovd deleted the cgmes_conversion_TxConversion branch January 14, 2020 12:18

miovd mentioned this pull request Feb 5, 2020

CGMES Conversion of Three Windings Transformers #849

Closed

mathbagu mentioned this pull request Mar 3, 2020

[IIDM v1.0] New three windings transformer API powsybl/powsybl-iidm4cpp#22

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TwoWindings and ThreeWindings new Cgmes conversion #1066

TwoWindings and ThreeWindings new Cgmes conversion #1066

marqueslanauja commented Dec 10, 2019 •

edited by miovd

Loading

marqueslanauja commented Jan 12, 2020

miovd left a comment

miovd Jan 13, 2020

marqueslanauja Jan 13, 2020

miovd Jan 13, 2020

marqueslanauja Jan 13, 2020

miovd Jan 14, 2020

miovd commented Jan 13, 2020

annetill left a comment •

edited

Loading

sonarcloud bot commented Jan 14, 2020

		@@ -0,0 +1,54 @@
		package com.powsybl.cgmes.conversion.elements.transformers;

TwoWindings and ThreeWindings new Cgmes conversion #1066

TwoWindings and ThreeWindings new Cgmes conversion #1066

Conversation

marqueslanauja commented Dec 10, 2019 • edited by miovd Loading

marqueslanauja commented Jan 12, 2020

miovd left a comment

Choose a reason for hiding this comment

miovd Jan 13, 2020

Choose a reason for hiding this comment

marqueslanauja Jan 13, 2020

Choose a reason for hiding this comment

miovd Jan 13, 2020

Choose a reason for hiding this comment

marqueslanauja Jan 13, 2020

Choose a reason for hiding this comment

miovd Jan 14, 2020

Choose a reason for hiding this comment

miovd commented Jan 13, 2020

annetill left a comment • edited Loading

Choose a reason for hiding this comment

sonarcloud bot commented Jan 14, 2020

marqueslanauja commented Dec 10, 2019 •

edited by miovd

Loading

annetill left a comment •

edited

Loading