Skip to content

Commit

Permalink
Rework existing test of transformers with phase angle clock using now…
Browse files Browse the repository at this point in the history 
… a simple network instead of a cgmes conformity modified one

Signed-off-by: Romain Courtier <[email protected]>
  • Loading branch information
@rcourtier
rcourtier committed Nov 8, 2024
1 parent 6bab812 commit be08524
Show file tree
Hide file tree
Showing 11 changed files with 1,093 additions and 5,527 deletions.
45 changes: 0 additions & 45 deletions ...onformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,51 +839,6 @@ public static GridModelReferenceResources miniBusBranchT3xTwoRegulatingControlsE
MINI_GRID_TP));
}

public static GridModelReferenceResources miniBusBranchPhaseAngleClockZero() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/BusBranch/BaseCase_v3_phaseAngleClockZero/";
return new GridModelReferenceResources(
"MiniGrid-BusBranch-PhaseAngleClockZero",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_BUS_BRANCH_BASE,
MINI_GRID_SSH,
MINI_GRID_TP,
MINI_GRID_DL,
MINI_GRID_SV));
}

public static GridModelReferenceResources miniBusBranchT2xPhaseAngleClock1NonZero() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/BusBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/";
return new GridModelReferenceResources(
"MiniGrid-BusBranch-T2xPhaseAngleClock1NonZero",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_BUS_BRANCH_BASE,
MINI_GRID_SSH,
MINI_GRID_TP,
MINI_GRID_DL,
MINI_GRID_SV));
}

public static GridModelReferenceResources miniBusBranchT3xAllPhaseAngleClockNonZero() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/BusBranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/";
return new GridModelReferenceResources(
"MiniGrid-BusBranch-T3xAllPhaseAngleClockNonZero",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_BUS_BRANCH_BASE,
MINI_GRID_SSH,
MINI_GRID_TP,
MINI_GRID_DL,
MINI_GRID_SV));
}

public static GridModelReference miniBusBranchExternalInjectionControl() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/BusBranch/BaseCase_v3_external_injection_control/";
Expand Down
1,814 changes: 0 additions & 1,814 deletions ...sBranch/BaseCase_v3_T2xPhaseAngleClock1NonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml
View file

This file was deleted.

1,814 changes: 0 additions & 1,814 deletions ...ranch/BaseCase_v3_T3xAllPhaseAngleClockNonZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml
View file

This file was deleted.

1,814 changes: 0 additions & 1,814 deletions ...Grid/BusBranch/BaseCase_v3_phaseAngleClockZero/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml
View file

This file was deleted.

93 changes: 53 additions & 40 deletions ...conversion/src/test/java/com/powsybl/cgmes/conversion/test/TransformerConversionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@

import com.powsybl.cgmes.conformity.Cgmes3ModifiedCatalog;
import com.powsybl.cgmes.conformity.CgmesConformity1Catalog;
import com.powsybl.cgmes.conformity.CgmesConformity1ModifiedCatalog;
import com.powsybl.cgmes.conversion.CgmesImportPostProcessor;
import com.powsybl.cgmes.conversion.Conversion;
import com.powsybl.cgmes.conversion.Conversion.*;
import com.powsybl.cgmes.conversion.PhaseAngleClock;
import com.powsybl.cgmes.model.GridModelReference;
import com.powsybl.cgmes.model.GridModelReferenceResources;
import com.powsybl.commons.PowsyblException;
import com.powsybl.commons.datasource.ResourceSet;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.Terminal;
import com.powsybl.iidm.network.ThreeWindingsTransformer;
import com.powsybl.iidm.network.TwoWindingsTransformer;
import com.powsybl.iidm.network.extensions.ThreeWindingsTransformerPhaseAngleClock;
import com.powsybl.iidm.network.extensions.TwoWindingsTransformerPhaseAngleClock;
import com.powsybl.loadflow.LoadFlowParameters;
import com.powsybl.loadflow.validation.ValidationConfig;
import org.junit.jupiter.api.Test;
Expand All @@ -31,8 +34,7 @@
import java.util.Collections;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;

/**
* @author Luma Zamarreño {@literal <zamarrenolm at aia.es>}
Expand All @@ -41,6 +43,7 @@
class TransformerConversionTest {

private static final String EQUALS_LINE = "======================";
private static final String DIR = "/issues/transformers/";

@Test
void microGridBaseCaseBExfmr2ShuntDefault() {
Expand Down Expand Up @@ -334,55 +337,47 @@ void microGridBaseCaseBExfmr3Ratio0End3() {
}

@Test
void miniBusBranchPhaseAngleClock() {
Conversion.Config config = new Conversion.Config();
List<CgmesImportPostProcessor> postProcessors = new ArrayList<>();
postProcessors.add(new PhaseAngleClock());

Network n = networkModel(CgmesConformity1Catalog.miniBusBranch(), config, postProcessors);
void phaseAngleClockTest() {
// A 2w- and a 3w-transformer with non-null phase angle clock value on respectively 2nd and 3rd winding
Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ.xml"));

boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -318.691633, 1424.484145, 436.204160, 1393.367311);
assertTrue(ok);
ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -7.505045, -1.896561, -288.380946, 1216.566903, 351.090362, 1199.878285);
assertTrue(ok);
}
// Phase angle clock values have been correctly read
assertEquals(5, n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class).getPhaseAngleClock());
assertEquals(0, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg2());
assertEquals(5, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg3());

@Test
void miniBusBranchPhaseAngleClockZero() {
Conversion.Config config = new Conversion.Config();
List<CgmesImportPostProcessor> postProcessors = new ArrayList<>();
postProcessors.add(new PhaseAngleClock());

Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchPhaseAngleClockZero(), config, postProcessors);

boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -0.087780, -0.178561, 0.087782, 0.178613);
assertTrue(ok);
ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -0.000001, -0.000022, 0.000002, 0.000068, -0.000001, -0.000045);
assertTrue(ok);
// Power flows are calculated from SV voltages
assertTrue(t2xCompareFlow(n, "T2W", -318.691633, 1424.484145, 436.204160, 1393.367311));
assertTrue(t3xCompareFlow(n, "T3W", -7.505045, -1.896561, -288.380946, 1216.566903, 351.090362, 1199.878285));
}

@Test
void miniBusBranchT2xPhaseAngleClock1NonZero() {
Conversion.Config config = new Conversion.Config();
List<CgmesImportPostProcessor> postProcessors = new ArrayList<>();
postProcessors.add(new PhaseAngleClock());
void phaseAngleClockAllZeroTest() {
// The same 2w- and a 3w-transformer as in phaseAngleClockTest() but with all phase angle clock equal to 0
Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ_AllZero.xml"));

Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchT2xPhaseAngleClock1NonZero(), config, postProcessors);
// No phase angle clock extension has been created since all values are equal to 0
assertNull(n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class));
assertNull(n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class));

boolean ok = t2xCompareFlow(n, "f1e72854-ec35-46e9-b614-27db354e8dbb", -318.691633, 1424.484145, 436.204160, 1393.367311);
assertTrue(ok);
// Power flows are calculated from SV voltages and differ from the ones in phaseAngleClockTest()
assertTrue(t2xCompareFlow(n, "T2W", -0.087780, -0.178561, 0.087782, 0.178613));
assertTrue(t3xCompareFlow(n, "T3W", -0.000001, -0.000022, 0.000002, 0.000068, -0.000001, -0.000045));
}

@Test
void miniBusBranchT3xAllPhaseAngleClockNonZero() {
Conversion.Config config = new Conversion.Config();
List<CgmesImportPostProcessor> postProcessors = new ArrayList<>();
postProcessors.add(new PhaseAngleClock());
void phaseAngleClockAllNonZeroTest() {
// The same 2w- and a 3w-transformer as in phaseAngleClockTest() but with non-null phase angle clock value on all windings
Network n = networkModelWithPhaseAngleClock(phaseAngleClock("PhaseAngleClock_EQ_AllNonZero.xml"));

Network n = networkModel(CgmesConformity1ModifiedCatalog.miniBusBranchT3xAllPhaseAngleClockNonZero(), config, postProcessors);
// Non-null phase angle clock values on 1st winding are discarded, the other ones are correctly read
assertEquals(5, n.getTwoWindingsTransformer("T2W").getExtension(TwoWindingsTransformerPhaseAngleClock.class).getPhaseAngleClock());
assertEquals(3, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg2());
assertEquals(5, n.getThreeWindingsTransformer("T3W").getExtension(ThreeWindingsTransformerPhaseAngleClock.class).getPhaseAngleClockLeg3());

boolean ok = t3xCompareFlow(n, "5d38b7ed-73fd-405a-9cdb-78425e003773", -1494.636083, 1530.638656, 981.686099, 1826.870720, 562.199867, 309.289551);
assertTrue(ok);
// Power flows are calculated from SV voltages and differ from the ones in phaseAngleClockTest() when the pac values differ (3w-transformer)
assertTrue(t2xCompareFlow(n, "T2W", -318.691633, 1424.484145, 436.204160, 1393.367311));
assertTrue(t3xCompareFlow(n, "T3W", -1494.636083, 1530.638656, 981.686099, 1826.870720, 562.199867, 309.289551));
}

@Test
Expand Down Expand Up @@ -441,6 +436,13 @@ private boolean t3xCompareFlow(Network n, String id, double p1, double q1, doubl
return ok;
}

private Network networkModelWithPhaseAngleClock(GridModelReference gridModelReference) {
List<CgmesImportPostProcessor> postProcessors = new ArrayList<>();
postProcessors.add(new PhaseAngleClock());

return networkModel(gridModelReference, new Conversion.Config(), postProcessors);
}

private Network networkModel(GridModelReference testGridModel, Conversion.Config config) {
return networkModel(testGridModel, config, Collections.emptyList());
}
Expand All @@ -457,6 +459,17 @@ private Network networkModel(GridModelReference testGridModel, Conversion.Config
return n;
}

private GridModelReferenceResources phaseAngleClock(String phaseAngleClockEQ) {
return new GridModelReferenceResources(
"PhaseAngleClock",
null,
new ResourceSet(DIR,
phaseAngleClockEQ,
"PhaseAngleClock_SSH.xml",
"PhaseAngleClock_TP.xml",
"PhaseAngleClock_SV.xml"));
}

private static ValidationConfig loadFlowValidationConfig(double threshold) {
ValidationConfig config = ValidationConfig.load();
config.setVerbose(true);
Expand Down
Loading

0 comments on commit be08524

Please sign in to comment.