Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/readthedocs/models/input/grid/transformer2w.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ As obvious, the parameter can be used in T- as in 𝜋-equivalent circuit repres
+-----------+------+---------------------------------------------------------+
| rSc | Ω | Short circuit resistance |
+-----------+------+---------------------------------------------------------+
| xSc | Ω | Short circuit impedance |
| xSc | Ω | Short circuit reactance |
+-----------+------+---------------------------------------------------------+
| gM | nS | No load conductance |
+-----------+------+---------------------------------------------------------+
Expand Down
6 changes: 3 additions & 3 deletions docs/readthedocs/models/input/grid/transformer3w.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ All impedances and admittances are given with respect to the higher voltage side
+-----------+------+---------------------------------------------------------+
| rScC | Ω | Short circuit resistance in branch C |
+-----------+------+---------------------------------------------------------+
| xScA | Ω | Short circuit impedance in branch A |
| xScA | Ω | Short circuit reactance in branch A |
+-----------+------+---------------------------------------------------------+
| xScB | Ω | Short circuit impedance in branch B |
| xScB | Ω | Short circuit reactance in branch B |
+-----------+------+---------------------------------------------------------+
| xScC | Ω | Short circuit impedance in branch C |
| xScC | Ω | Short circuit reactance in branch C |
+-----------+------+---------------------------------------------------------+
| gM | nS | No load conductance |
+-----------+------+---------------------------------------------------------+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ protected LineTypeInput buildModel(SimpleEntityData data) {
UUID uuid = data.getUUID(ENTITY_UUID);
String id = data.getField(ENTITY_ID);
ComparableQuantity<SpecificConductance> b =
data.getQuantity(B, StandardUnits.ADMITTANCE_PER_LENGTH);
data.getQuantity(B, StandardUnits.SUSCEPTANCE_PER_LENGTH);
ComparableQuantity<SpecificConductance> g =
data.getQuantity(G, StandardUnits.ADMITTANCE_PER_LENGTH);
data.getQuantity(G, StandardUnits.CONDUCTANCE_PER_LENGTH);
ComparableQuantity<SpecificResistance> r =
data.getQuantity(R, StandardUnits.IMPEDANCE_PER_LENGTH);
data.getQuantity(R, StandardUnits.RESISTANCE_PER_LENGTH);
ComparableQuantity<SpecificResistance> x =
data.getQuantity(X, StandardUnits.IMPEDANCE_PER_LENGTH);
data.getQuantity(X, StandardUnits.REACTANCE_PER_LENGTH);
ComparableQuantity<ElectricCurrent> iMax =
data.getQuantity(I_MAX, StandardUnits.ELECTRIC_CURRENT_MAGNITUDE);
ComparableQuantity<ElectricPotential> vRated =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ protected List<Set<String>> getFields(SimpleEntityData data) {
protected Transformer2WTypeInput buildModel(SimpleEntityData data) {
UUID uuid = data.getUUID(ENTITY_UUID);
String id = data.getField(ENTITY_ID);
ComparableQuantity<ElectricResistance> rSc = data.getQuantity(R_SC, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> xSc = data.getQuantity(X_SC, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> rSc = data.getQuantity(R_SC, StandardUnits.RESISTANCE);
ComparableQuantity<ElectricResistance> xSc = data.getQuantity(X_SC, StandardUnits.REACTANCE);
ComparableQuantity<Power> sRated = data.getQuantity(S_RATED, StandardUnits.S_RATED);
ComparableQuantity<ElectricPotential> vRatedA =
data.getQuantity(V_RATED_A, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
ComparableQuantity<ElectricPotential> vRatedB =
data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE);
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE);
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE);
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE);
ComparableQuantity<Dimensionless> dV = data.getQuantity(D_V, StandardUnits.DV_TAP);
ComparableQuantity<Angle> dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP);
boolean tapSide = data.getBoolean(TAP_SIDE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,17 @@ protected Transformer3WTypeInput buildModel(SimpleEntityData data) {
data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
ComparableQuantity<ElectricPotential> vRatedC =
data.getQuantity(V_RATED_C, StandardUnits.RATED_VOLTAGE_MAGNITUDE);
ComparableQuantity<ElectricResistance> rScA = data.getQuantity(R_SC_A, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> rScB = data.getQuantity(R_SC_B, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> rScC = data.getQuantity(R_SC_C, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> xScA = data.getQuantity(X_SC_A, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> xScB = data.getQuantity(X_SC_B, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricResistance> xScC = data.getQuantity(X_SC_C, StandardUnits.IMPEDANCE);
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE);
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE);
ComparableQuantity<ElectricResistance> rScA =
data.getQuantity(R_SC_A, StandardUnits.RESISTANCE);
ComparableQuantity<ElectricResistance> rScB =
data.getQuantity(R_SC_B, StandardUnits.RESISTANCE);
ComparableQuantity<ElectricResistance> rScC =
data.getQuantity(R_SC_C, StandardUnits.RESISTANCE);
ComparableQuantity<ElectricResistance> xScA = data.getQuantity(X_SC_A, StandardUnits.REACTANCE);
ComparableQuantity<ElectricResistance> xScB = data.getQuantity(X_SC_B, StandardUnits.REACTANCE);
ComparableQuantity<ElectricResistance> xScC = data.getQuantity(X_SC_C, StandardUnits.REACTANCE);
ComparableQuantity<ElectricConductance> gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE);
ComparableQuantity<ElectricConductance> bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE);
ComparableQuantity<Dimensionless> dV = data.getQuantity(D_V, StandardUnits.DV_TAP);
ComparableQuantity<Angle> dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP);
int tapNeutr = data.getInt(TAP_NEUTR);
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/edu/ie3/datamodel/models/StandardUnits.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,30 @@ public class StandardUnits {
public static final Unit<Angle> ELECTRIC_CURRENT_ANGLE = DEGREE_GEOM;
/** Impedance in Ω */
public static final Unit<ElectricResistance> IMPEDANCE = OHM;
/** Resistance in Ω */
public static final Unit<ElectricResistance> RESISTANCE = OHM;
/** Reactance in Ω */
public static final Unit<ElectricResistance> REACTANCE = OHM;
/** Impedance per length (mainly for lines) in Ω/km */
public static final Unit<SpecificResistance> IMPEDANCE_PER_LENGTH = OHM_PER_KILOMETRE;
/** Resistance per length (mainly for lines) in Ω/km */
public static final Unit<SpecificResistance> RESISTANCE_PER_LENGTH = OHM_PER_KILOMETRE;
/** Reactance per length (mainly for lines) in Ω/km */
public static final Unit<SpecificResistance> REACTANCE_PER_LENGTH = OHM_PER_KILOMETRE;
/** Admittance in nS */
public static final Unit<ElectricConductance> CONDUCTANCE = MetricPrefix.NANO(SIEMENS);
/** Conductance in nS */
public static final Unit<ElectricConductance> SUSCEPTANCE = MetricPrefix.NANO(SIEMENS);
/** Susceptance in nS */
public static final Unit<ElectricConductance> ADMITTANCE = MetricPrefix.NANO(SIEMENS);
/** Admittance per length (mainly for lines) in µS/km */
public static final Unit<SpecificConductance> ADMITTANCE_PER_LENGTH = MICRO_SIEMENS_PER_KILOMETRE;
/** Conductance per length (mainly for lines) in µS/km */
public static final Unit<SpecificConductance> CONDUCTANCE_PER_LENGTH =
MICRO_SIEMENS_PER_KILOMETRE;
/** Susceptance per length (mainly for lines) in µS/km */
public static final Unit<SpecificConductance> SUSCEPTANCE_PER_LENGTH =
MICRO_SIEMENS_PER_KILOMETRE;
/** Target voltage magnitude in p.U. */
public static final Unit<Dimensionless> TARGET_VOLTAGE_MAGNITUDE = PU;
/** Voltage magnitude (mainly for result purposes) in p.U. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public LineTypeInput(
ComparableQuantity<ElectricCurrent> iMax,
ComparableQuantity<ElectricPotential> vRated) {
super(uuid, id);
this.r = r.to(StandardUnits.IMPEDANCE_PER_LENGTH);
this.x = x.to(StandardUnits.IMPEDANCE_PER_LENGTH);
this.b = b.to(StandardUnits.ADMITTANCE_PER_LENGTH);
this.g = g.to(StandardUnits.ADMITTANCE_PER_LENGTH);
this.r = r.to(StandardUnits.RESISTANCE_PER_LENGTH);
this.x = x.to(StandardUnits.REACTANCE_PER_LENGTH);
this.b = b.to(StandardUnits.SUSCEPTANCE_PER_LENGTH);
this.g = g.to(StandardUnits.CONDUCTANCE_PER_LENGTH);
this.iMax = iMax.to(StandardUnits.ELECTRIC_CURRENT_MAGNITUDE);
this.vRated = vRated.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ public Transformer2WTypeInput(
int tapMin,
int tapMax) {
super(uuid, id);
this.rSc = rSc.to(StandardUnits.IMPEDANCE);
this.xSc = xSc.to(StandardUnits.IMPEDANCE);
this.rSc = rSc.to(StandardUnits.RESISTANCE);
this.xSc = xSc.to(StandardUnits.REACTANCE);
this.sRated = sRated.to(StandardUnits.S_RATED);
this.vRatedA = vRatedA.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
this.vRatedB = vRatedB.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
this.gM = gM.to(StandardUnits.ADMITTANCE);
this.bM = bM.to(StandardUnits.ADMITTANCE);
this.gM = gM.to(StandardUnits.CONDUCTANCE);
this.bM = bM.to(StandardUnits.SUSCEPTANCE);
this.dV = dV.to(StandardUnits.DV_TAP);
this.dPhi = dPhi.to(StandardUnits.DPHI_TAP);
this.tapSide = tapSide;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ public Transformer3WTypeInput(
this.vRatedA = vRatedA.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
this.vRatedB = vRatedB.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
this.vRatedC = vRatedC.to(StandardUnits.RATED_VOLTAGE_MAGNITUDE);
this.rScA = rScA.to(StandardUnits.IMPEDANCE);
this.rScB = rScB.to(StandardUnits.IMPEDANCE);
this.rScC = rScC.to(StandardUnits.IMPEDANCE);
this.xScA = xScA.to(StandardUnits.IMPEDANCE);
this.xScB = xScB.to(StandardUnits.IMPEDANCE);
this.xScC = xScC.to(StandardUnits.IMPEDANCE);
this.gM = gM.to(StandardUnits.ADMITTANCE);
this.bM = bM.to(StandardUnits.ADMITTANCE);
this.rScA = rScA.to(StandardUnits.RESISTANCE);
this.rScB = rScB.to(StandardUnits.RESISTANCE);
this.rScC = rScC.to(StandardUnits.RESISTANCE);
this.xScA = xScA.to(StandardUnits.REACTANCE);
this.xScB = xScB.to(StandardUnits.REACTANCE);
this.xScC = xScC.to(StandardUnits.REACTANCE);
this.gM = gM.to(StandardUnits.CONDUCTANCE);
this.bM = bM.to(StandardUnits.SUSCEPTANCE);
this.dV = dV.to(StandardUnits.DV_TAP);
this.dPhi = dPhi.to(StandardUnits.DPHI_TAP);
this.tapNeutr = tapNeutr;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ class LineTypeInputFactoryTest extends Specification implements FactoryTestHelpe
((LineTypeInput) typeInput.get()).with {
assert uuid == UUID.fromString(parameter["uuid"])
assert id == parameter["id"]
assert b == getQuant(parameter["b"], StandardUnits.ADMITTANCE_PER_LENGTH)
assert g == getQuant(parameter["g"], StandardUnits.ADMITTANCE_PER_LENGTH)
assert r == getQuant(parameter["r"], StandardUnits.IMPEDANCE_PER_LENGTH)
assert x == getQuant(parameter["x"], StandardUnits.IMPEDANCE_PER_LENGTH)
assert b == getQuant(parameter["b"], StandardUnits.SUSCEPTANCE_PER_LENGTH)
assert g == getQuant(parameter["g"], StandardUnits.CONDUCTANCE_PER_LENGTH)
assert r == getQuant(parameter["r"], StandardUnits.RESISTANCE_PER_LENGTH)
assert x == getQuant(parameter["x"], StandardUnits.REACTANCE_PER_LENGTH)
assert iMax == getQuant(parameter["imax"], StandardUnits.ELECTRIC_CURRENT_MAGNITUDE)
assert vRated == getQuant(parameter["vrated"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ class Transformer2WTypeInputFactoryTest extends Specification implements Factory
typeInput.get().with {
assert uuid == UUID.fromString(parameter["uuid"])
assert id == parameter["id"]
assert rSc == getQuant(parameter["rsc"], StandardUnits.IMPEDANCE)
assert xSc == getQuant(parameter["xsc"], StandardUnits.IMPEDANCE)
assert rSc == getQuant(parameter["rsc"], StandardUnits.RESISTANCE)
assert xSc == getQuant(parameter["xsc"], StandardUnits.REACTANCE)
assert sRated == getQuant(parameter["srated"], StandardUnits.S_RATED)
assert vRatedA == getQuant(parameter["vrateda"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
assert vRatedB == getQuant(parameter["vratedb"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
assert gM == getQuant(parameter["gm"], StandardUnits.ADMITTANCE)
assert bM == getQuant(parameter["bm"], StandardUnits.ADMITTANCE)
assert gM == getQuant(parameter["gm"], StandardUnits.CONDUCTANCE)
assert bM == getQuant(parameter["bm"], StandardUnits.SUSCEPTANCE)
assert dV == getQuant(parameter["dv"], StandardUnits.DV_TAP)
assert dPhi == getQuant(parameter["dphi"], StandardUnits.DPHI_TAP)
assert tapSide == (parameter["tapside"].trim() == "1") || parameter["tapside"].trim() == "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ class Transformer3WTypeInputFactoryTest extends Specification implements Factory
assert vRatedA == getQuant(parameter["vrateda"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
assert vRatedB == getQuant(parameter["vratedb"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
assert vRatedC == getQuant(parameter["vratedc"], StandardUnits.RATED_VOLTAGE_MAGNITUDE)
assert rScA == getQuant(parameter["rsca"], StandardUnits.IMPEDANCE)
assert rScB == getQuant(parameter["rscb"], StandardUnits.IMPEDANCE)
assert rScC == getQuant(parameter["rscc"], StandardUnits.IMPEDANCE)
assert xScA == getQuant(parameter["xsca"], StandardUnits.IMPEDANCE)
assert xScB == getQuant(parameter["xscb"], StandardUnits.IMPEDANCE)
assert xScC == getQuant(parameter["xscc"], StandardUnits.IMPEDANCE)
assert gM == getQuant(parameter["gm"], StandardUnits.ADMITTANCE)
assert bM == getQuant(parameter["bm"], StandardUnits.ADMITTANCE)
assert rScA == getQuant(parameter["rsca"], StandardUnits.RESISTANCE)
assert rScB == getQuant(parameter["rscb"], StandardUnits.RESISTANCE)
assert rScC == getQuant(parameter["rscc"], StandardUnits.RESISTANCE)
assert xScA == getQuant(parameter["xsca"], StandardUnits.REACTANCE)
assert xScB == getQuant(parameter["xscb"], StandardUnits.REACTANCE)
assert xScC == getQuant(parameter["xscc"], StandardUnits.REACTANCE)
assert gM == getQuant(parameter["gm"], StandardUnits.CONDUCTANCE)
assert bM == getQuant(parameter["bm"], StandardUnits.SUSCEPTANCE)
assert dV == getQuant(parameter["dv"], StandardUnits.DV_TAP)
assert dPhi == getQuant(parameter["dphi"], StandardUnits.DPHI_TAP)
assert tapNeutr == Integer.parseInt(parameter["tapneutr"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ class ConnectorValidationUtilsTest extends Specification {
// Data for valid transformer2WType
private static final UUID uuid = UUID.fromString("202069a7-bcf8-422c-837c-273575220c8a")
private static final String id = "HS-MS_1"
private static final ComparableQuantity<ElectricResistance> rSc = Quantities.getQuantity(45.375d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> xSc = Quantities.getQuantity(102.759d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> rSc = Quantities.getQuantity(45.375d, RESISTANCE)
private static final ComparableQuantity<ElectricResistance> xSc = Quantities.getQuantity(102.759d, REACTANCE)
private static final ComparableQuantity<Power> sRated = Quantities.getQuantity(20000d, ACTIVE_POWER_IN)
private static final ComparableQuantity<ElectricPotential> vRatedA = Quantities.getQuantity(110d, RATED_VOLTAGE_MAGNITUDE)
private static final ComparableQuantity<ElectricPotential> vRatedB = Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE)
private static final ComparableQuantity<ElectricConductance> gM = Quantities.getQuantity(0d, ADMITTANCE)
private static final ComparableQuantity<ElectricConductance> bM = Quantities.getQuantity(0d, ADMITTANCE)
private static final ComparableQuantity<ElectricConductance> gM = Quantities.getQuantity(0d, CONDUCTANCE)
private static final ComparableQuantity<ElectricConductance> bM = Quantities.getQuantity(0d, SUSCEPTANCE)
private static final ComparableQuantity<Dimensionless> dV = Quantities.getQuantity(1.5d, DV_TAP)
private static final ComparableQuantity<Angle> dPhi = Quantities.getQuantity(0d, DPHI_TAP)
private static final boolean tapSide = false
Expand Down Expand Up @@ -216,12 +216,12 @@ class ConnectorValidationUtilsTest extends Specification {
private static final ComparableQuantity<Power> sRatedB = Quantities.getQuantity(60000d, ACTIVE_POWER_IN)
private static final ComparableQuantity<Power> sRatedC = Quantities.getQuantity(40000d, ACTIVE_POWER_IN)
private static final ComparableQuantity<ElectricPotential> vRatedC = Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE)
private static final ComparableQuantity<ElectricResistance> rScA = Quantities.getQuantity(0.3d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> rScB = Quantities.getQuantity(0.025d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> rScC = Quantities.getQuantity(0.0080d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> xScA = Quantities.getQuantity(1d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> xScB = Quantities.getQuantity(0.08d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> xScC = Quantities.getQuantity(0.003d, IMPEDANCE)
private static final ComparableQuantity<ElectricResistance> rScA = Quantities.getQuantity(0.3d, RESISTANCE)
private static final ComparableQuantity<ElectricResistance> rScB = Quantities.getQuantity(0.025d, RESISTANCE)
private static final ComparableQuantity<ElectricResistance> rScC = Quantities.getQuantity(0.0080d, RESISTANCE)
private static final ComparableQuantity<ElectricResistance> xScA = Quantities.getQuantity(1d, REACTANCE)
private static final ComparableQuantity<ElectricResistance> xScB = Quantities.getQuantity(0.08d, REACTANCE)
private static final ComparableQuantity<ElectricResistance> xScC = Quantities.getQuantity(0.003d, REACTANCE)

def "ConnectorValidationUtils.checkTransformer3WType recognizes all potential errors for a transformer3W type"() {
when:
Expand Down
Loading