diff --git a/docs/readthedocs/models/input/grid/transformer2w.rst b/docs/readthedocs/models/input/grid/transformer2w.rst index 9beaf4933..448e3fc54 100644 --- a/docs/readthedocs/models/input/grid/transformer2w.rst +++ b/docs/readthedocs/models/input/grid/transformer2w.rst @@ -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 | +-----------+------+---------------------------------------------------------+ diff --git a/docs/readthedocs/models/input/grid/transformer3w.rst b/docs/readthedocs/models/input/grid/transformer3w.rst index 5d275431f..1e62a7463 100644 --- a/docs/readthedocs/models/input/grid/transformer3w.rst +++ b/docs/readthedocs/models/input/grid/transformer3w.rst @@ -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 | +-----------+------+---------------------------------------------------------+ diff --git a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java index 88252d537..609a11849 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java @@ -42,13 +42,13 @@ protected LineTypeInput buildModel(SimpleEntityData data) { UUID uuid = data.getUUID(ENTITY_UUID); String id = data.getField(ENTITY_ID); ComparableQuantity b = - data.getQuantity(B, StandardUnits.ADMITTANCE_PER_LENGTH); + data.getQuantity(B, StandardUnits.SUSCEPTANCE_PER_LENGTH); ComparableQuantity g = - data.getQuantity(G, StandardUnits.ADMITTANCE_PER_LENGTH); + data.getQuantity(G, StandardUnits.CONDUCTANCE_PER_LENGTH); ComparableQuantity r = - data.getQuantity(R, StandardUnits.IMPEDANCE_PER_LENGTH); + data.getQuantity(R, StandardUnits.RESISTANCE_PER_LENGTH); ComparableQuantity x = - data.getQuantity(X, StandardUnits.IMPEDANCE_PER_LENGTH); + data.getQuantity(X, StandardUnits.REACTANCE_PER_LENGTH); ComparableQuantity iMax = data.getQuantity(I_MAX, StandardUnits.ELECTRIC_CURRENT_MAGNITUDE); ComparableQuantity vRated = diff --git a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java index d1e93d36f..a79236d49 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java @@ -62,15 +62,15 @@ protected List> getFields(SimpleEntityData data) { protected Transformer2WTypeInput buildModel(SimpleEntityData data) { UUID uuid = data.getUUID(ENTITY_UUID); String id = data.getField(ENTITY_ID); - ComparableQuantity rSc = data.getQuantity(R_SC, StandardUnits.IMPEDANCE); - ComparableQuantity xSc = data.getQuantity(X_SC, StandardUnits.IMPEDANCE); + ComparableQuantity rSc = data.getQuantity(R_SC, StandardUnits.RESISTANCE); + ComparableQuantity xSc = data.getQuantity(X_SC, StandardUnits.REACTANCE); ComparableQuantity sRated = data.getQuantity(S_RATED, StandardUnits.S_RATED); ComparableQuantity vRatedA = data.getQuantity(V_RATED_A, StandardUnits.RATED_VOLTAGE_MAGNITUDE); ComparableQuantity vRatedB = data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE); - ComparableQuantity gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE); - ComparableQuantity bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE); + ComparableQuantity gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE); + ComparableQuantity bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE); ComparableQuantity dV = data.getQuantity(D_V, StandardUnits.DV_TAP); ComparableQuantity dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP); boolean tapSide = data.getBoolean(TAP_SIDE); diff --git a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java index 0a707d75e..a51f2ec7b 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java @@ -83,14 +83,17 @@ protected Transformer3WTypeInput buildModel(SimpleEntityData data) { data.getQuantity(V_RATED_B, StandardUnits.RATED_VOLTAGE_MAGNITUDE); ComparableQuantity vRatedC = data.getQuantity(V_RATED_C, StandardUnits.RATED_VOLTAGE_MAGNITUDE); - ComparableQuantity rScA = data.getQuantity(R_SC_A, StandardUnits.IMPEDANCE); - ComparableQuantity rScB = data.getQuantity(R_SC_B, StandardUnits.IMPEDANCE); - ComparableQuantity rScC = data.getQuantity(R_SC_C, StandardUnits.IMPEDANCE); - ComparableQuantity xScA = data.getQuantity(X_SC_A, StandardUnits.IMPEDANCE); - ComparableQuantity xScB = data.getQuantity(X_SC_B, StandardUnits.IMPEDANCE); - ComparableQuantity xScC = data.getQuantity(X_SC_C, StandardUnits.IMPEDANCE); - ComparableQuantity gM = data.getQuantity(G_M, StandardUnits.ADMITTANCE); - ComparableQuantity bM = data.getQuantity(B_M, StandardUnits.ADMITTANCE); + ComparableQuantity rScA = + data.getQuantity(R_SC_A, StandardUnits.RESISTANCE); + ComparableQuantity rScB = + data.getQuantity(R_SC_B, StandardUnits.RESISTANCE); + ComparableQuantity rScC = + data.getQuantity(R_SC_C, StandardUnits.RESISTANCE); + ComparableQuantity xScA = data.getQuantity(X_SC_A, StandardUnits.REACTANCE); + ComparableQuantity xScB = data.getQuantity(X_SC_B, StandardUnits.REACTANCE); + ComparableQuantity xScC = data.getQuantity(X_SC_C, StandardUnits.REACTANCE); + ComparableQuantity gM = data.getQuantity(G_M, StandardUnits.CONDUCTANCE); + ComparableQuantity bM = data.getQuantity(B_M, StandardUnits.SUSCEPTANCE); ComparableQuantity dV = data.getQuantity(D_V, StandardUnits.DV_TAP); ComparableQuantity dPhi = data.getQuantity(D_PHI, StandardUnits.DPHI_TAP); int tapNeutr = data.getInt(TAP_NEUTR); diff --git a/src/main/java/edu/ie3/datamodel/models/StandardUnits.java b/src/main/java/edu/ie3/datamodel/models/StandardUnits.java index cc793e181..969d64e1b 100644 --- a/src/main/java/edu/ie3/datamodel/models/StandardUnits.java +++ b/src/main/java/edu/ie3/datamodel/models/StandardUnits.java @@ -40,12 +40,30 @@ public class StandardUnits { public static final Unit ELECTRIC_CURRENT_ANGLE = DEGREE_GEOM; /** Impedance in Ω */ public static final Unit IMPEDANCE = OHM; + /** Resistance in Ω */ + public static final Unit RESISTANCE = OHM; + /** Reactance in Ω */ + public static final Unit REACTANCE = OHM; /** Impedance per length (mainly for lines) in Ω/km */ public static final Unit IMPEDANCE_PER_LENGTH = OHM_PER_KILOMETRE; + /** Resistance per length (mainly for lines) in Ω/km */ + public static final Unit RESISTANCE_PER_LENGTH = OHM_PER_KILOMETRE; + /** Reactance per length (mainly for lines) in Ω/km */ + public static final Unit REACTANCE_PER_LENGTH = OHM_PER_KILOMETRE; /** Admittance in nS */ + public static final Unit CONDUCTANCE = MetricPrefix.NANO(SIEMENS); + /** Conductance in nS */ + public static final Unit SUSCEPTANCE = MetricPrefix.NANO(SIEMENS); + /** Susceptance in nS */ public static final Unit ADMITTANCE = MetricPrefix.NANO(SIEMENS); /** Admittance per length (mainly for lines) in µS/km */ public static final Unit ADMITTANCE_PER_LENGTH = MICRO_SIEMENS_PER_KILOMETRE; + /** Conductance per length (mainly for lines) in µS/km */ + public static final Unit CONDUCTANCE_PER_LENGTH = + MICRO_SIEMENS_PER_KILOMETRE; + /** Susceptance per length (mainly for lines) in µS/km */ + public static final Unit SUSCEPTANCE_PER_LENGTH = + MICRO_SIEMENS_PER_KILOMETRE; /** Target voltage magnitude in p.U. */ public static final Unit TARGET_VOLTAGE_MAGNITUDE = PU; /** Voltage magnitude (mainly for result purposes) in p.U. */ diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java index c9584cdca..013403d12 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java @@ -50,10 +50,10 @@ public LineTypeInput( ComparableQuantity iMax, ComparableQuantity 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); } diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java index af0e32ea0..fa2280c5f 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer2WTypeInput.java @@ -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; diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java index cdd9f1407..488e142c6 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java +++ b/src/main/java/edu/ie3/datamodel/models/input/connector/type/Transformer3WTypeInput.java @@ -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; diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy index 24e64963d..1687f38a7 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy @@ -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) } diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactoryTest.groovy index a1605140d..450dab42e 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactoryTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactoryTest.groovy @@ -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" diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy index f3d22b9a7..1c0617260 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy @@ -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"]) diff --git a/src/test/groovy/edu/ie3/datamodel/utils/validation/ConnectorValidationUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/validation/ConnectorValidationUtilsTest.groovy index 0a9a17750..7745c3547 100644 --- a/src/test/groovy/edu/ie3/datamodel/utils/validation/ConnectorValidationUtilsTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/utils/validation/ConnectorValidationUtilsTest.groovy @@ -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 rSc = Quantities.getQuantity(45.375d, IMPEDANCE) - private static final ComparableQuantity xSc = Quantities.getQuantity(102.759d, IMPEDANCE) + private static final ComparableQuantity rSc = Quantities.getQuantity(45.375d, RESISTANCE) + private static final ComparableQuantity xSc = Quantities.getQuantity(102.759d, REACTANCE) private static final ComparableQuantity sRated = Quantities.getQuantity(20000d, ACTIVE_POWER_IN) private static final ComparableQuantity vRatedA = Quantities.getQuantity(110d, RATED_VOLTAGE_MAGNITUDE) private static final ComparableQuantity vRatedB = Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE) - private static final ComparableQuantity gM = Quantities.getQuantity(0d, ADMITTANCE) - private static final ComparableQuantity bM = Quantities.getQuantity(0d, ADMITTANCE) + private static final ComparableQuantity gM = Quantities.getQuantity(0d, CONDUCTANCE) + private static final ComparableQuantity bM = Quantities.getQuantity(0d, SUSCEPTANCE) private static final ComparableQuantity dV = Quantities.getQuantity(1.5d, DV_TAP) private static final ComparableQuantity dPhi = Quantities.getQuantity(0d, DPHI_TAP) private static final boolean tapSide = false @@ -216,12 +216,12 @@ class ConnectorValidationUtilsTest extends Specification { private static final ComparableQuantity sRatedB = Quantities.getQuantity(60000d, ACTIVE_POWER_IN) private static final ComparableQuantity sRatedC = Quantities.getQuantity(40000d, ACTIVE_POWER_IN) private static final ComparableQuantity vRatedC = Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE) - private static final ComparableQuantity rScA = Quantities.getQuantity(0.3d, IMPEDANCE) - private static final ComparableQuantity rScB = Quantities.getQuantity(0.025d, IMPEDANCE) - private static final ComparableQuantity rScC = Quantities.getQuantity(0.0080d, IMPEDANCE) - private static final ComparableQuantity xScA = Quantities.getQuantity(1d, IMPEDANCE) - private static final ComparableQuantity xScB = Quantities.getQuantity(0.08d, IMPEDANCE) - private static final ComparableQuantity xScC = Quantities.getQuantity(0.003d, IMPEDANCE) + private static final ComparableQuantity rScA = Quantities.getQuantity(0.3d, RESISTANCE) + private static final ComparableQuantity rScB = Quantities.getQuantity(0.025d, RESISTANCE) + private static final ComparableQuantity rScC = Quantities.getQuantity(0.0080d, RESISTANCE) + private static final ComparableQuantity xScA = Quantities.getQuantity(1d, REACTANCE) + private static final ComparableQuantity xScB = Quantities.getQuantity(0.08d, REACTANCE) + private static final ComparableQuantity xScC = Quantities.getQuantity(0.003d, REACTANCE) def "ConnectorValidationUtils.checkTransformer3WType recognizes all potential errors for a transformer3W type"() { when: diff --git a/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy index 8e00609e0..dd610bddc 100644 --- a/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy @@ -5,14 +5,15 @@ */ package edu.ie3.datamodel.utils.validation -import edu.ie3.datamodel.exceptions.NotImplementedException - -import static edu.ie3.datamodel.models.StandardUnits.ADMITTANCE_PER_LENGTH +import static edu.ie3.datamodel.models.StandardUnits.CONDUCTANCE_PER_LENGTH import static edu.ie3.datamodel.models.StandardUnits.ELECTRIC_CURRENT_MAGNITUDE import static edu.ie3.datamodel.models.StandardUnits.RATED_VOLTAGE_MAGNITUDE +import static edu.ie3.datamodel.models.StandardUnits.SUSCEPTANCE_PER_LENGTH import static edu.ie3.util.quantities.PowerSystemUnits.OHM_PER_KILOMETRE import static edu.ie3.util.quantities.PowerSystemUnits.PU +import edu.ie3.datamodel.exceptions.NotImplementedException + import edu.ie3.datamodel.exceptions.InvalidEntityException import edu.ie3.datamodel.models.OperationTime import edu.ie3.datamodel.models.input.NodeInput @@ -141,8 +142,8 @@ class ValidationUtilsTest extends Specification { def asset = new LineTypeInput( UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"), "lineType_AtoB", - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), + Quantities.getQuantity(0d, SUSCEPTANCE_PER_LENGTH), + Quantities.getQuantity(0d, CONDUCTANCE_PER_LENGTH), Quantities.getQuantity(0.437d, OHM_PER_KILOMETRE), Quantities.getQuantity(0.356d, OHM_PER_KILOMETRE), Quantities.getQuantity(300d, ELECTRIC_CURRENT_MAGNITUDE), @@ -151,8 +152,8 @@ class ValidationUtilsTest extends Specification { def invalidAsset = new LineTypeInput( UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"), "lineType_AtoB", - Quantities.getQuantity(-1d, ADMITTANCE_PER_LENGTH), // invalid value - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), + Quantities.getQuantity(-1d, SUSCEPTANCE_PER_LENGTH), // invalid value + Quantities.getQuantity(0d, CONDUCTANCE_PER_LENGTH), Quantities.getQuantity(0.437d, OHM_PER_KILOMETRE), Quantities.getQuantity(0.356d, OHM_PER_KILOMETRE), Quantities.getQuantity(300d, ELECTRIC_CURRENT_MAGNITUDE), @@ -178,8 +179,8 @@ class ValidationUtilsTest extends Specification { def asset = new LineTypeInput( UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"), "lineType_AtoB", - Quantities.getQuantity(1d, ADMITTANCE_PER_LENGTH), - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), + Quantities.getQuantity(1d, SUSCEPTANCE_PER_LENGTH), + Quantities.getQuantity(0d, CONDUCTANCE_PER_LENGTH), Quantities.getQuantity(0.437d, OHM_PER_KILOMETRE), Quantities.getQuantity(0.356d, OHM_PER_KILOMETRE), Quantities.getQuantity(300d, ELECTRIC_CURRENT_MAGNITUDE), @@ -188,8 +189,8 @@ class ValidationUtilsTest extends Specification { def invalidAsset = new LineTypeInput( UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"), "lineType_AtoB", - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), // invalid value - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), + Quantities.getQuantity(0d, SUSCEPTANCE_PER_LENGTH), // invalid value + Quantities.getQuantity(0d, CONDUCTANCE_PER_LENGTH), Quantities.getQuantity(0.437d, OHM_PER_KILOMETRE), Quantities.getQuantity(0.356d, OHM_PER_KILOMETRE), Quantities.getQuantity(300d, ELECTRIC_CURRENT_MAGNITUDE), diff --git a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy index ebaa42ba6..fde922cad 100644 --- a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy +++ b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy @@ -50,13 +50,13 @@ class GridTestData { public static final Transformer2WTypeInput transformerTypeBtoD = new Transformer2WTypeInput( UUID.fromString("202069a7-bcf8-422c-837c-273575220c8a"), "HS-MS_1", - Quantities.getQuantity(45.375d, IMPEDANCE), - Quantities.getQuantity(102.759d, IMPEDANCE), + Quantities.getQuantity(45.375d, RESISTANCE), + Quantities.getQuantity(102.759d, REACTANCE), Quantities.getQuantity(20000d, ACTIVE_POWER_IN), Quantities.getQuantity(110d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE), - Quantities.getQuantity(0d, ADMITTANCE), - Quantities.getQuantity(0d, ADMITTANCE), + Quantities.getQuantity(0d, CONDUCTANCE), + Quantities.getQuantity(0d, SUSCEPTANCE), Quantities.getQuantity(1.5d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), false, @@ -67,13 +67,13 @@ class GridTestData { private static final Transformer2WTypeInput transformerTypeBtoE = new Transformer2WTypeInput( UUID.fromString("ac30443b-29e7-4635-b399-1062cfb3ffda"), "transformer_type_gedfi89fc7c895076ff25ec6d3b2e7ab9a1b24b37f73ecf30f895005d766a8d8d2774aa", - Quantities.getQuantity(0d, IMPEDANCE), - Quantities.getQuantity(51.72750115394592d, IMPEDANCE), + Quantities.getQuantity(0d, RESISTANCE), + Quantities.getQuantity(51.72750115394592d, REACTANCE), Quantities.getQuantity(40000d, ACTIVE_POWER_IN), Quantities.getQuantity(110d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(10d, RATED_VOLTAGE_MAGNITUDE), - Quantities.getQuantity(0d, ADMITTANCE), - Quantities.getQuantity(0d, ADMITTANCE), + Quantities.getQuantity(0d, CONDUCTANCE), + Quantities.getQuantity(0d, SUSCEPTANCE), Quantities.getQuantity(1.777780055999756d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), false, @@ -85,13 +85,13 @@ class GridTestData { private static final Transformer2WTypeInput transformerTypeCtoE = new Transformer2WTypeInput( UUID.fromString("8441dd78-c528-4e63-830d-52d341131432"), "no_shunt_elements_mv-mv", - Quantities.getQuantity(1.5d, IMPEDANCE), - Quantities.getQuantity(15.5d, IMPEDANCE), + Quantities.getQuantity(1.5d, RESISTANCE), + Quantities.getQuantity(15.5d, REACTANCE), Quantities.getQuantity(250d, ACTIVE_POWER_IN), Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(10d, RATED_VOLTAGE_MAGNITUDE), - Quantities.getQuantity(0d, ADMITTANCE), - Quantities.getQuantity(0d, ADMITTANCE), + Quantities.getQuantity(0d, CONDUCTANCE), + Quantities.getQuantity(0d, SUSCEPTANCE), Quantities.getQuantity(1.5d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), false, @@ -103,13 +103,13 @@ class GridTestData { private static final Transformer2WTypeInput transformerTypeCtoX = new Transformer2WTypeInput( UUID.fromString("08559390-d7c0-4427-a2dc-97ba312ae0ac"), "MS-NS_1", - Quantities.getQuantity(10.078d, IMPEDANCE), - Quantities.getQuantity(23.312d, IMPEDANCE), + Quantities.getQuantity(10.078d, RESISTANCE), + Quantities.getQuantity(23.312d, REACTANCE), Quantities.getQuantity(630d, ACTIVE_POWER_IN), Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(0.4d, RATED_VOLTAGE_MAGNITUDE), - Quantities.getQuantity(0d, ADMITTANCE), - Quantities.getQuantity(0d, ADMITTANCE), + Quantities.getQuantity(0d, CONDUCTANCE), + Quantities.getQuantity(0d, SUSCEPTANCE), Quantities.getQuantity(0.5d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), false, @@ -127,14 +127,14 @@ class GridTestData { Quantities.getQuantity(380d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(110d, RATED_VOLTAGE_MAGNITUDE), Quantities.getQuantity(20d, RATED_VOLTAGE_MAGNITUDE), - Quantities.getQuantity(0.3d, IMPEDANCE), - Quantities.getQuantity(0.025d, IMPEDANCE), - Quantities.getQuantity(0.0008d, IMPEDANCE), - Quantities.getQuantity(1d, IMPEDANCE), - Quantities.getQuantity(0.08d, IMPEDANCE), - Quantities.getQuantity(0.003d, IMPEDANCE), - Quantities.getQuantity(40000d, ADMITTANCE), - Quantities.getQuantity(-1000d, ADMITTANCE), + Quantities.getQuantity(0.3d, RESISTANCE), + Quantities.getQuantity(0.025d, RESISTANCE), + Quantities.getQuantity(0.0008d, RESISTANCE), + Quantities.getQuantity(1d, REACTANCE), + Quantities.getQuantity(0.08d, REACTANCE), + Quantities.getQuantity(0.003d, REACTANCE), + Quantities.getQuantity(40000d, CONDUCTANCE), + Quantities.getQuantity(-1000d, SUSCEPTANCE), Quantities.getQuantity(1.5d, DV_TAP), Quantities.getQuantity(0d, DPHI_TAP), 0, @@ -319,8 +319,8 @@ class GridTestData { public static final LineTypeInput lineTypeInputCtoD = new LineTypeInput( UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"), "lineType_AtoB", - Quantities.getQuantity(0.00322d, ADMITTANCE_PER_LENGTH), - Quantities.getQuantity(0d, ADMITTANCE_PER_LENGTH), + Quantities.getQuantity(0.00322d, CONDUCTANCE_PER_LENGTH), + Quantities.getQuantity(0d, SUSCEPTANCE_PER_LENGTH), Quantities.getQuantity(0.437d, OHM_PER_KILOMETRE), Quantities.getQuantity(0.356d, OHM_PER_KILOMETRE), Quantities.getQuantity(300d, ELECTRIC_CURRENT_MAGNITUDE),