Skip to content

Commit d457b89

Browse files
danielfeismanndanielfeismann
authored
Merge pull request #573 from ie3-institute/ms/#381-fixing-two-winding-remark
Fixing two winding transformer remark
2 parents ca733d3 + e9288a7 commit d457b89

File tree

15 files changed

+121
-99
lines changed

15 files changed

+121
-99
lines changed

‎docs/readthedocs/models/input/grid/transformer2w.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ As obvious, the parameter can be used in T- as in 𝜋-equivalent circuit repres
2222
+-----------+------+---------------------------------------------------------+
2323
| rSc | Ω | Short circuit resistance |
2424
+-----------+------+---------------------------------------------------------+
25-
| xSc | Ω | Short circuit impedance |
25+
| xSc | Ω | Short circuit reactance |
2626
+-----------+------+---------------------------------------------------------+
2727
| gM | nS | No load conductance |
2828
+-----------+------+---------------------------------------------------------+

‎docs/readthedocs/models/input/grid/transformer3w.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ All impedances and admittances are given with respect to the higher voltage side
3434
+-----------+------+---------------------------------------------------------+
3535
| rScC | Ω | Short circuit resistance in branch C |
3636
+-----------+------+---------------------------------------------------------+
37-
| xScA | Ω | Short circuit impedance in branch A |
37+
| xScA | Ω | Short circuit reactance in branch A |
3838
+-----------+------+---------------------------------------------------------+
39-
| xScB | Ω | Short circuit impedance in branch B |
39+
| xScB | Ω | Short circuit reactance in branch B |
4040
+-----------+------+---------------------------------------------------------+
41-
| xScC | Ω | Short circuit impedance in branch C |
41+
| xScC | Ω | Short circuit reactance in branch C |
4242
+-----------+------+---------------------------------------------------------+
4343
| gM | nS | No load conductance |
4444
+-----------+------+---------------------------------------------------------+

‎src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ protected LineTypeInput buildModel(SimpleEntityData data) {
4242
UUID uuid = data.getUUID(ENTITY_UUID);
4343
String id = data.getField(ENTITY_ID);
4444
ComparableQuantity<SpecificConductance> b =
45-
data.getQuantity(B, StandardUnits.ADMITTANCE_PER_LENGTH);
45+
data.getQuantity(B, StandardUnits.SUSCEPTANCE_PER_LENGTH);
4646
ComparableQuantity<SpecificConductance> g =
47-
data.getQuantity(G, StandardUnits.ADMITTANCE_PER_LENGTH);
47+
data.getQuantity(G, StandardUnits.CONDUCTANCE_PER_LENGTH);
4848
ComparableQuantity<SpecificResistance> r =
49-
data.getQuantity(R, StandardUnits.IMPEDANCE_PER_LENGTH);
49+
data.getQuantity(R, StandardUnits.RESISTANCE_PER_LENGTH);
5050
ComparableQuantity<SpecificResistance> x =
51-
data.getQuantity(X, StandardUnits.IMPEDANCE_PER_LENGTH);
51+
data.getQuantity(X, StandardUnits.REACTANCE_PER_LENGTH);
5252
ComparableQuantity<ElectricCurrent> iMax =
5353
data.getQuantity(I_MAX, StandardUnits.ELECTRIC_CURRENT_MAGNITUDE);
5454
ComparableQuantity<ElectricPotential> vRated =

‎src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ protected List<Set<String>> getFields(SimpleEntityData data) {
6262
protected Transformer2WTypeInput buildModel(SimpleEntityData data) {
6363
UUID uuid = data.getUUID(ENTITY_UUID);
6464
String id = data.getField(ENTITY_ID);
65-
ComparableQuantity<ElectricResistance> rSc = data.getQuantity(R_SC, StandardUnits.IMPEDANCE);
66-
ComparableQuantity<ElectricResistance> xSc = data.getQuantity(X_SC, StandardUnits.IMPEDANCE);
65+
ComparableQuantity<ElectricResistance> rSc = data.getQuantity(R_SC, StandardUnits.RESISTANCE);
66+
ComparableQuantity<ElectricResistance> xSc = data.getQuantity(X_SC, StandardUnits.REACTANCE);
6767
ComparableQuantity<Power> sRated = data.getQuantity(S_RATED, StandardUnits.S_RATED);
6868
ComparableQuantity<ElectricPotential> vRatedA =
6969
data.getQuantity(V_RATED_A, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
7070
ComparableQuantity<ElectricPotential> vRatedB =
7171
data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
72-
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE);
73-
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE);
72+
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE);
73+
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE);
7474
ComparableQuantity<Dimensionless> dV = data.getQuantity(D_V, StandardUnits.DV_TAP);
7575
ComparableQuantity<Angle> dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP);
7676
boolean tapSide = data.getBoolean(TAP_SIDE);

‎src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,17 @@ protected Transformer3WTypeInput buildModel(SimpleEntityData data) {
8383
data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
8484
ComparableQuantity<ElectricPotential> vRatedC =
8585
data.getQuantity(V_RATED_C, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
86-
ComparableQuantity<ElectricResistance> rScA = data.getQuantity(R_SC_A, StandardUnits.IMPEDANCE);
87-
ComparableQuantity<ElectricResistance> rScB = data.getQuantity(R_SC_B, StandardUnits.IMPEDANCE);
88-
ComparableQuantity<ElectricResistance> rScC = data.getQuantity(R_SC_C, StandardUnits.IMPEDANCE);
89-
ComparableQuantity<ElectricResistance> xScA = data.getQuantity(X_SC_A, StandardUnits.IMPEDANCE);
90-
ComparableQuantity<ElectricResistance> xScB = data.getQuantity(X_SC_B, StandardUnits.IMPEDANCE);
91-
ComparableQuantity<ElectricResistance> xScC = data.getQuantity(X_SC_C, StandardUnits.IMPEDANCE);
92-
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE);
93-
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE);
86+
ComparableQuantity<ElectricResistance> rScA =
87+
data.getQuantity(R_SC_A, StandardUnits.RESISTANCE);
88+
ComparableQuantity<ElectricResistance> rScB =
89+
data.getQuantity(R_SC_B, StandardUnits.RESISTANCE);
90+
ComparableQuantity<ElectricResistance> rScC =
91+
data.getQuantity(R_SC_C, StandardUnits.RESISTANCE);
92+
ComparableQuantity<ElectricResistance> xScA = data.getQuantity(X_SC_A, StandardUnits.REACTANCE);
93+
ComparableQuantity<ElectricResistance> xScB = data.getQuantity(X_SC_B, StandardUnits.REACTANCE);
94+
ComparableQuantity<ElectricResistance> xScC = data.getQuantity(X_SC_C, StandardUnits.REACTANCE);
95+
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE);
96+
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE);
9497
ComparableQuantity<Dimensionless> dV = data.getQuantity(D_V, StandardUnits.DV_TAP);
9598
ComparableQuantity<Angle> dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP);
9699
int tapNeutr = data.getInt(TAP_NEUTR);

‎src/main/java/edu/ie3/datamodel/models/StandardUnits.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,30 @@ public class StandardUnits {
4040
public static final Unit<Angle> ELECTRIC_CURRENT_ANGLE = DEGREE_GEOM;
4141
/** Impedance in Ω */
4242
public static final Unit<ElectricResistance> IMPEDANCE = OHM;
43+
/** Resistance in Ω */
44+
public static final Unit<ElectricResistance> RESISTANCE = OHM;
45+
/** Reactance in Ω */
46+
public static final Unit<ElectricResistance> REACTANCE = OHM;
4347
/** Impedance per length (mainly for lines) in Ω/km */
4448
public static final Unit<SpecificResistance> IMPEDANCE_PER_LENGTH = OHM_PER_KILOMETRE;
49+
/** Resistance per length (mainly for lines) in Ω/km */
50+
public static final Unit<SpecificResistance> RESISTANCE_PER_LENGTH = OHM_PER_KILOMETRE;
51+
/** Reactance per length (mainly for lines) in Ω/km */
52+
public static final Unit<SpecificResistance> REACTANCE_PER_LENGTH = OHM_PER_KILOMETRE;
4553
/** Admittance in nS */
54+
public static final Unit<ElectricConductance> CONDUCTANCE = MetricPrefix.NANO(SIEMENS);
55+
/** Conductance in nS */
56+
public static final Unit<ElectricConductance> SUSCEPTANCE = MetricPrefix.NANO(SIEMENS);
57+
/** Susceptance in nS */
4658
public static final Unit<ElectricConductance> ADMITTANCE = MetricPrefix.NANO(SIEMENS);
4759
/** Admittance per length (mainly for lines) in µS/km */
4860
public static final Unit<SpecificConductance> ADMITTANCE_PER_LENGTH = MICRO_SIEMENS_PER_KILOMETRE;
61+
/** Conductance per length (mainly for lines) in µS/km */
62+
public static final Unit<SpecificConductance> CONDUCTANCE_PER_LENGTH =
63+
MICRO_SIEMENS_PER_KILOMETRE;
64+
/** Susceptance per length (mainly for lines) in µS/km */
65+
public static final Unit<SpecificConductance> SUSCEPTANCE_PER_LENGTH =
66+
MICRO_SIEMENS_PER_KILOMETRE;
4967
/** Target voltage magnitude in p.U. */
5068
public static final Unit<Dimensionless> TARGET_VOLTAGE_MAGNITUDE = PU;
5169
/** Voltage magnitude (mainly for result purposes) in p.U. */

‎src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public LineTypeInput(
5050
ComparableQuantity<ElectricCurrent> iMax,
5151
ComparableQuantity<ElectricPotential> vRated) {
5252
super(uuid, id);
53-
this.r = r.to(StandardUnits.IMPEDANCE_PER_LENGTH);
54-
this.x = x.to(StandardUnits.IMPEDANCE_PER_LENGTH);
55-
this.b = b.to(StandardUnits.ADMITTANCE_PER_LENGTH);
56-
this.g = g.to(StandardUnits.ADMITTANCE_PER_LENGTH);
53+
this.r = r.to(StandardUnits.RESISTANCE_PER_LENGTH);
54+
this.x = x.to(StandardUnits.REACTANCE_PER_LENGTH);
55+
this.b = b.to(StandardUnits.SUSCEPTANCE_PER_LENGTH);
56+
this.g = g.to(StandardUnits.CONDUCTANCE_PER_LENGTH);
5757
this.iMax = iMax.to(StandardUnits.ELECTRIC_CURRENT_MAGNITUDE);
5858
this.vRated = vRated.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
5959
}

‎src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ public Transformer2WTypeInput(
7575
int tapMin,
7676
int tapMax) {
7777
super(uuid, id);
78-
this.rSc = rSc.to(StandardUnits.IMPEDANCE);
79-
this.xSc = xSc.to(StandardUnits.IMPEDANCE);
78+
this.rSc = rSc.to(StandardUnits.RESISTANCE);
79+
this.xSc = xSc.to(StandardUnits.REACTANCE);
8080
this.sRated = sRated.to(StandardUnits.S_RATED);
8181
this.vRatedA = vRatedA.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
8282
this.vRatedB = vRatedB.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
83-
this.gM = gM.to(StandardUnits.ADMITTANCE);
84-
this.bM = bM.to(StandardUnits.ADMITTANCE);
83+
this.gM = gM.to(StandardUnits.CONDUCTANCE);
84+
this.bM = bM.to(StandardUnits.SUSCEPTANCE);
8585
this.dV = dV.to(StandardUnits.DV_TAP);
8686
this.dPhi = dPhi.to(StandardUnits.DPHI_TAP);
8787
this.tapSide = tapSide;

‎src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ public Transformer3WTypeInput(
105105
this.vRatedA = vRatedA.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
106106
this.vRatedB = vRatedB.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
107107
this.vRatedC = vRatedC.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
108-
this.rScA = rScA.to(StandardUnits.IMPEDANCE);
109-
this.rScB = rScB.to(StandardUnits.IMPEDANCE);
110-
this.rScC = rScC.to(StandardUnits.IMPEDANCE);
111-
this.xScA = xScA.to(StandardUnits.IMPEDANCE);
112-
this.xScB = xScB.to(StandardUnits.IMPEDANCE);
113-
this.xScC = xScC.to(StandardUnits.IMPEDANCE);
114-
this.gM = gM.to(StandardUnits.ADMITTANCE);
115-
this.bM = bM.to(StandardUnits.ADMITTANCE);
108+
this.rScA = rScA.to(StandardUnits.RESISTANCE);
109+
this.rScB = rScB.to(StandardUnits.RESISTANCE);
110+
this.rScC = rScC.to(StandardUnits.RESISTANCE);
111+
this.xScA = xScA.to(StandardUnits.REACTANCE);
112+
this.xScB = xScB.to(StandardUnits.REACTANCE);
113+
this.xScC = xScC.to(StandardUnits.REACTANCE);
114+
this.gM = gM.to(StandardUnits.CONDUCTANCE);
115+
this.bM = bM.to(StandardUnits.SUSCEPTANCE);
116116
this.dV = dV.to(StandardUnits.DV_TAP);
117117
this.dPhi = dPhi.to(StandardUnits.DPHI_TAP);
118118
this.tapNeutr = tapNeutr;

‎src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class LineTypeInputFactoryTest extends Specification implements FactoryTestHelpe
4646
((LineTypeInput) typeInput.get()).with {
4747
assert uuid == UUID.fromString(parameter["uuid"])
4848
assert id == parameter["id"]
49-
assert b == getQuant(parameter["b"], StandardUnits.ADMITTANCE_PER_LENGTH)
50-
assert g == getQuant(parameter["g"], StandardUnits.ADMITTANCE_PER_LENGTH)
51-
assert r == getQuant(parameter["r"], StandardUnits.IMPEDANCE_PER_LENGTH)
52-
assert x == getQuant(parameter["x"], StandardUnits.IMPEDANCE_PER_LENGTH)
49+
assert b == getQuant(parameter["b"], StandardUnits.SUSCEPTANCE_PER_LENGTH)
50+
assert g == getQuant(parameter["g"], StandardUnits.CONDUCTANCE_PER_LENGTH)
51+
assert r == getQuant(parameter["r"], StandardUnits.RESISTANCE_PER_LENGTH)
52+
assert x == getQuant(parameter["x"], StandardUnits.REACTANCE_PER_LENGTH)
5353
assert iMax == getQuant(parameter["imax"], StandardUnits.ELECTRIC_CURRENT_MAGNITUDE)
5454
assert vRated == getQuant(parameter["vrated"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
5555
}

0 commit comments

Comments
 (0)