Merge pull request #706 from ie3-institute/sp/#705-double-converters-psu

Adapted to new double converters in PSU

Author: danielfeismann

CHANGELOG.md

@@ -71,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - Force user to provide time stamp pattern to `CouchbaseWeatherSource` to ensure harmonized querying
 - BREAKING: Updating PowerSystemUtils dependency to 2.0-SNAPSHOT [#595](https://github.com/ie3-institute/PowerSystemDataModel/issues/595)
 - BREAKING: Generified the `LoadInput` attribute `standardLoadProfile` to `loadProfile` as it should also address the newly added `TemperatureDependantLoadProfile`s [#601](https://github.com/ie3-institute/PowerSystemDataModel/issues/601)
+- Adapted to new double converters in PSU [#705](https://github.com/ie3-institute/PowerSystemDataModel/issues/705)
 
 ## [2.1.0] - 2022-01-05
 

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

@@ -8,7 +8,6 @@
 import static edu.ie3.util.quantities.PowerSystemUnits.*;
 
 import edu.ie3.util.quantities.interfaces.*;
-import javax.measure.MetricPrefix;
 import javax.measure.Unit;
 import javax.measure.quantity.*;
 
@@ -31,7 +30,7 @@ public class StandardUnits {
   /** Energy for input purposes in kWh */
   public static final Unit<Energy> ENERGY_IN = KILOWATTHOUR;
   /** Energy for result purposes in MWh */
-  public static final Unit<Energy> ENERGY_RESULT = MetricPrefix.MEGA(WATTHOUR);
+  public static final Unit<Energy> ENERGY_RESULT = MEGAWATTHOUR;
   /** Rated voltage magnitude (mainly for input purposes) in kV */
   public static final Unit<ElectricPotential> RATED_VOLTAGE_MAGNITUDE = KILOVOLT;
   /** Magnitude of an electric current in A */
@@ -51,11 +50,11 @@ public class StandardUnits {
   /** 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);
+  public static final Unit<ElectricConductance> CONDUCTANCE = NANOSIEMENS;
   /** Conductance in nS */
-  public static final Unit<ElectricConductance> SUSCEPTANCE = MetricPrefix.NANO(SIEMENS);
+  public static final Unit<ElectricConductance> SUSCEPTANCE = NANOSIEMENS;
   /** Susceptance in nS */
-  public static final Unit<ElectricConductance> ADMITTANCE = MetricPrefix.NANO(SIEMENS);
+  public static final Unit<ElectricConductance> ADMITTANCE = NANOSIEMENS;
   /** 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 */

src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy

@@ -171,7 +171,7 @@ class ValidationUtilsTest extends Specification {
 
     then:
     InvalidEntityException ex = thrown()
-    ex.message == "Entity is invalid because of: The following quantities have to be zero or positive: -1 μS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=-1 μS/km, g=0 μS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
+    ex.message == "Entity is invalid because of: The following quantities have to be zero or positive: -1 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=-1 µS/km, g=0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
   }
 
   def "The check for zero or negative entities should work as expected"() {
@@ -208,7 +208,7 @@ class ValidationUtilsTest extends Specification {
 
     then:
     InvalidEntityException ex = thrown()
-    ex.message == "Entity is invalid because of: The following quantities have to be positive: 0 μS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=0 μS/km, g=0 μS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
+    ex.message == "Entity is invalid because of: The following quantities have to be positive: 0 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=0 µS/km, g=0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
   }
 
   def "Checking an unsupported asset leads to an exception"() {

src/test/groovy/edu/ie3/test/common/SampleJointGrid.groovy

@@ -23,13 +23,11 @@ import edu.ie3.datamodel.models.input.system.StorageInput
 import edu.ie3.datamodel.models.input.system.characteristic.OlmCharacteristicInput
 import edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils
 import edu.ie3.datamodel.utils.GridAndGeoUtils
-import edu.ie3.util.quantities.PowerSystemUnits
 import org.locationtech.jts.geom.Point
 import org.locationtech.jts.io.ParseException
 import org.locationtech.jts.io.geojson.GeoJsonReader
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.MetricPrefix
 import java.util.stream.Collectors
 
 import static edu.ie3.util.quantities.PowerSystemUnits.*
@@ -249,7 +247,7 @@ class SampleJointGrid extends SystemParticipantTestData {
   "nodeD",
   OperatorInput.NO_OPERATOR_ASSIGNED,
   OperationTime.notLimited(),
-  Quantities.getQuantity(1, PowerSystemUnits.PU),
+  Quantities.getQuantity(1, PU),
   false,
   (Point) geoJsonReader.read(
   "{ \"type\": \"Point\", \"coordinates\": [6.592276813887139, 49.37770599548332] }"),
@@ -359,8 +357,8 @@ class SampleJointGrid extends SystemParticipantTestData {
   Quantities.getQuantity(630d, KILOVOLTAMPERE),
   Quantities.getQuantity(10d, KILOVOLT),
   Quantities.getQuantity(0.4, KILOVOLT),
-  Quantities.getQuantity(0d, MetricPrefix.MICRO(SIEMENS)),
-  Quantities.getQuantity(0d, MetricPrefix.MICRO(SIEMENS)),
+  Quantities.getQuantity(0d, MICROSIEMENS),
+  Quantities.getQuantity(0d, MICROSIEMENS),
   Quantities.getQuantity(0.5, PERCENT),
   Quantities.getQuantity(0d, DEGREE_GEOM),
   false,
@@ -390,8 +388,8 @@ class SampleJointGrid extends SystemParticipantTestData {
   Quantities.getQuantity(800d, KILOVOLTAMPERE),
   Quantities.getQuantity(110d, KILOVOLT),
   Quantities.getQuantity(10d, KILOVOLT),
-  Quantities.getQuantity(0d, MetricPrefix.MICRO(SIEMENS)),
-  Quantities.getQuantity(0d, MetricPrefix.MICRO(SIEMENS)),
+  Quantities.getQuantity(0d, MICROSIEMENS),
+  Quantities.getQuantity(0d, MICROSIEMENS),
   Quantities.getQuantity(0.5, PERCENT),
   Quantities.getQuantity(0d, DEGREE_GEOM),
   false,