Adapted to new units in PSU

Author: sebastian-peter

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

@@ -6,9 +6,7 @@
 package edu.ie3.datamodel.models;
 
 import static edu.ie3.util.quantities.PowerSystemUnits.*;
-import static javax.measure.MetricPrefix.NANO;
 
-import edu.ie3.util.quantities.MetricPrefixDouble;
 import edu.ie3.util.quantities.interfaces.*;
 import javax.measure.Unit;
 import javax.measure.quantity.*;
@@ -52,14 +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 =
-      MetricPrefixDouble.prefix(NANO, SIEMENS);
+  public static final Unit<ElectricConductance> CONDUCTANCE = NANOSIEMENS;
   /** Conductance in nS */
-  public static final Unit<ElectricConductance> SUSCEPTANCE =
-      MetricPrefixDouble.prefix(NANO, SIEMENS);
+  public static final Unit<ElectricConductance> SUSCEPTANCE = NANOSIEMENS;
   /** Susceptance in nS */
-  public static final Unit<ElectricConductance> ADMITTANCE =
-      MetricPrefixDouble.prefix(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/test/common/SampleJointGrid.groovy

@@ -23,7 +23,6 @@ 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.MetricPrefixDouble
 import org.locationtech.jts.geom.Point
 import org.locationtech.jts.io.ParseException
 import org.locationtech.jts.io.geojson.GeoJsonReader
@@ -32,7 +31,6 @@ import tech.units.indriya.quantity.Quantities
 import java.util.stream.Collectors
 
 import static edu.ie3.util.quantities.PowerSystemUnits.*
-import static javax.measure.MetricPrefix.MICRO
 
 /**
  * //ToDo: Class Description
@@ -359,8 +357,8 @@ class SampleJointGrid extends SystemParticipantTestData {
   Quantities.getQuantity(630d, KILOVOLTAMPERE),
   Quantities.getQuantity(10d, KILOVOLT),
   Quantities.getQuantity(0.4, KILOVOLT),
-  Quantities.getQuantity(0d, MetricPrefixDouble.prefix(MICRO, SIEMENS)),
-  Quantities.getQuantity(0d, MetricPrefixDouble.prefix(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, MetricPrefixDouble.prefix(MICRO, SIEMENS)),
-  Quantities.getQuantity(0d, MetricPrefixDouble.prefix(MICRO, SIEMENS)),
+  Quantities.getQuantity(0d, MICROSIEMENS),
+  Quantities.getQuantity(0d, MICROSIEMENS),
   Quantities.getQuantity(0.5, PERCENT),
   Quantities.getQuantity(0d, DEGREE_GEOM),
   false,