add maximum ac and dc charging limits to evtype

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added log warning when using `SwitchInputs` with `parallelDevices` parameter [#840](https://github.com/ie3-institute/PowerSystemDataModel/issues/840)
 - Validation for `EvcsInput` [#1000](https://github.com/ie3-institute/PowerSystemDataModel/issues/1000)
 - Scaling method in system participant copy builders [#1011](https://github.com/ie3-institute/PowerSystemDataModel/issues/1011)
+- Added separate field for maximum power limit for DC to evtype [#876](https://github.com/ie3-institute/PowerSystemDataModel/issues/876)
 
 ### Fixed
 - Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)

docs/readthedocs/models/input/participant/ev.md

@@ -45,12 +45,16 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
 
    * - sRated
      - kVA
-     - Rated apparent power
+     - Rated apparent power for AC
+
+   * - sRatedDC
+     - kW
+     - power for DC
 
    * - cosPhiRated
      - --
      - Rated power factor
-
+     
 ```
 
 ### Entity Model

src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java

@@ -37,7 +37,7 @@ public class SystemParticipantTypeInputFactory
 
   // EvTypeInput
   private static final String E_CONS = "eCons";
-
+  private static final String S_RATEDDC = "sRatedDC";
   // BmTypeInput
   private static final String ACTIVE_POWER_GRADIENT = "activePowerGradient";
 
@@ -144,7 +144,9 @@ private SystemParticipantTypeInput buildEvTypeInput(
     ComparableQuantity<SpecificEnergy> eCons =
         data.getQuantity(E_CONS, StandardUnits.ENERGY_PER_DISTANCE);
 
-    return new EvTypeInput(uuid, id, capEx, opEx, eStorage, eCons, sRated, cosPhi);
+    ComparableQuantity<Power> sRatedDC = data.getQuantity(S_RATEDDC, StandardUnits.ACTIVE_POWER_IN);
+
+    return new EvTypeInput(uuid, id, capEx, opEx, eStorage, eCons, sRated, cosPhi, sRatedDC);
   }
 
   private SystemParticipantTypeInput buildHpTypeInput(

src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java

@@ -21,6 +21,8 @@ public class EvTypeInput extends SystemParticipantTypeInput {
   private final ComparableQuantity<Energy> eStorage;
   /** Consumed electric energy per driven distance (typically in kWh/km) */
   private final ComparableQuantity<SpecificEnergy> eCons;
+  /** power for DC (typically in kW) */
+  private final ComparableQuantity<Power> sRatedDC;
 
   /**
    * @param uuid of the input entity
@@ -29,8 +31,9 @@ public class EvTypeInput extends SystemParticipantTypeInput {
    * @param opex Operating expense for this type of EV (typically in €)
    * @param eStorage Energy capacity of the storage
    * @param eCons Consumed electric energy per driven distance
-   * @param sRated Rated apparent power for this type of EV (typically in kW)
+   * @param sRated Rated apparent power for this type of EV (typically in kVA)
    * @param cosphiRated Power factor for this type of EV
+   * @param sRatedDC power for DC (typically in kW)
    */
   public EvTypeInput(
       UUID uuid,
@@ -40,10 +43,12 @@ public EvTypeInput(
       ComparableQuantity<Energy> eStorage,
       ComparableQuantity<SpecificEnergy> eCons,
       ComparableQuantity<Power> sRated,
-      double cosphiRated) {
+      double cosphiRated,
+      ComparableQuantity<Power> sRatedDC) {
     super(uuid, id, capex, opex, sRated.to(StandardUnits.S_RATED), cosphiRated);
     this.eStorage = eStorage.to(StandardUnits.ENERGY_IN);
     this.eCons = eCons.to(StandardUnits.ENERGY_PER_DISTANCE);
+    this.sRatedDC = sRatedDC.to(StandardUnits.ACTIVE_POWER_IN);
   }
 
   public ComparableQuantity<Energy> geteStorage() {
@@ -54,6 +59,10 @@ public ComparableQuantity<SpecificEnergy> geteCons() {
     return eCons;
   }
 
+  public ComparableQuantity<Power> getsRatedDC() {
+    return sRatedDC;
+  }
+
   @Override
   public EvTypeInputCopyBuilder copy() {
     return new EvTypeInputCopyBuilder(this);
@@ -64,12 +73,14 @@ public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof EvTypeInput that)) return false;
     if (!super.equals(o)) return false;
-    return eStorage.equals(that.eStorage) && eCons.equals(that.eCons);
+    return eStorage.equals(that.eStorage)
+        && eCons.equals(that.eCons)
+        && sRatedDC.equals(that.sRatedDC);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), eStorage, eCons);
+    return Objects.hash(super.hashCode(), eStorage, eCons, sRatedDC);
   }
 
   @Override
@@ -91,6 +102,8 @@ public String toString() {
         + eStorage
         + ", eCons="
         + eCons
+        + ", sRatedDC="
+        + sRatedDC
         + '}';
   }
 
@@ -103,11 +116,13 @@ public static class EvTypeInputCopyBuilder
 
     private ComparableQuantity<Energy> eStorage;
     private ComparableQuantity<SpecificEnergy> eCons;
+    private ComparableQuantity<Power> sRatedDC;
 
     private EvTypeInputCopyBuilder(EvTypeInput entity) {
       super(entity);
       this.eStorage = entity.geteStorage();
       this.eCons = entity.geteCons();
+      this.sRatedDC = entity.getsRatedDC();
     }
 
     public EvTypeInputCopyBuilder seteStorage(ComparableQuantity<Energy> eStorage) {
@@ -120,6 +135,11 @@ public EvTypeInputCopyBuilder seteCons(ComparableQuantity<SpecificEnergy> eCons)
       return this;
     }
 
+    public EvTypeInputCopyBuilder setsRatedDC(ComparableQuantity<Power> sRatedDC) {
+      this.sRatedDC = sRatedDC;
+      return this;
+    }
+
     public ComparableQuantity<Energy> geteStorage() {
       return eStorage;
     }
@@ -128,12 +148,17 @@ public ComparableQuantity<SpecificEnergy> geteCons() {
       return eCons;
     }
 
+    public ComparableQuantity<Power> getsRatedDC() {
+      return sRatedDC;
+    }
+
     @Override
     public EvTypeInput.EvTypeInputCopyBuilder scale(Double factor) {
       setCapex(getCapex().multiply(factor));
       setsRated(getsRated().multiply(factor));
       seteStorage(geteStorage().multiply(factor));
       seteCons(geteCons().multiply(factor));
+      setsRatedDC(getsRatedDC().multiply(factor));
       return this;
     }
 
@@ -147,7 +172,8 @@ public EvTypeInput build() {
           eStorage,
           eCons,
           getsRated(),
-          getCosPhiRated());
+          getCosPhiRated(),
+          getsRatedDC());
     }
 
     @Override

src/main/java/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtils.java

@@ -288,7 +288,10 @@ private static Try<Void, InvalidEntityException> checkEvType(EvTypeInput evTypeI
     return Try.ofVoid(
         () ->
             detectZeroOrNegativeQuantities(
-                new Quantity<?>[] {evTypeInput.geteStorage(), evTypeInput.geteCons()}, evTypeInput),
+                new Quantity<?>[] {
+                  evTypeInput.geteStorage(), evTypeInput.geteCons(),
+                },
+                evTypeInput),
         InvalidEntityException.class);
   }
 

src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy

@@ -52,6 +52,7 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 
       "estorage":	"7",
       "econs":	"8",
+      "srateddc":	"9",
     ]
     def typeInputClass = EvTypeInput
 
@@ -72,6 +73,7 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 
       assert eStorage == getQuant(parameter["estorage"], StandardUnits.ENERGY_IN)
       assert eCons == getQuant(parameter["econs"], StandardUnits.ENERGY_PER_DISTANCE)
+      assert sRatedDC == getQuant(parameter["srateddc"], StandardUnits.ACTIVE_POWER_IN)
     }
   }
 

src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy

@@ -521,7 +521,8 @@ class InputEntityProcessorTest extends Specification {
       "eStorage"   : "100.0",
       "eCons"      : "23.0",
       "sRated"     : "22.0",
-      "cosPhiRated": "0.9"
+      "cosPhiRated": "0.9",
+      "sRatedDC"     : "20.0",
     ]
 
     when:

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTypeSourceTest.groovy

@@ -200,6 +200,7 @@ class CsvTypeSourceTest extends Specification implements CsvTestDataMeta {
       eCons == sptd.evTypeInput.eCons
       sRated == sptd.evTypeInput.sRated
       cosPhiRated == sptd.evTypeInput.cosPhiRated
+      sRatedDC == sptd.evTypeInput.sRatedDC
     }
   }
 }

src/test/groovy/edu/ie3/datamodel/models/input/system/EvInputTest.groovy

@@ -45,6 +45,7 @@ class EvInputTest extends Specification {
       assert id == ev.id
       assert qCharacteristics == ev.qCharacteristics
       assert type.sRated == ev.type.sRated * 2d
+      assert type.sRatedDC == ev.type.sRatedDC * 2d
       assert type.eStorage == ev.type.eStorage * 2d
       assert type.eCons == ev.type.eCons * 2d
       assert em == Optional.of(SystemParticipantTestData.emInput)

src/test/groovy/edu/ie3/datamodel/models/input/system/type/EvTypeInputTest.groovy

@@ -31,6 +31,7 @@ class EvTypeInputTest extends Specification {
       assert eStorage == Quantities.getQuantity(150, ENERGY_IN)
       assert eCons == evTypeInput.eCons
       assert sRated == evTypeInput.sRated
+      assert sRatedDC == evTypeInput.sRatedDC
       assert cosPhiRated == evTypeInput.cosPhiRated
     }
   }
@@ -51,6 +52,7 @@ class EvTypeInputTest extends Specification {
       assert eStorage == evTypeInput.eStorage * 2d
       assert eCons == evTypeInput.eCons * 2d
       assert sRated == evTypeInput.sRated * 2d
+      assert sRatedDC == evTypeInput.sRatedDC * 2d
       assert cosPhiRated == evTypeInput.cosPhiRated
     }
   }

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

@@ -238,8 +238,8 @@ class SystemParticipantValidationUtilsTest extends Specification {
     ex.message == expectedException.message
 
     where:
-    invalidEvType                                                                                                                                     || expectedException
-    new EvTypeInput(uuid, id, capex, opex, Quantities.getQuantity(0, ENERGY_IN), Quantities.getQuantity(0, ENERGY_PER_DISTANCE), sRated, cosPhiRated) || new InvalidEntityException("The following quantities have to be positive: 0 kWh, 0 kWh/km", invalidEvType)
+    invalidEvType                                                                                                                                                                                  || expectedException
+    new EvTypeInput(uuid, id, capex, opex, Quantities.getQuantity(0, ENERGY_IN), Quantities.getQuantity(0, ENERGY_PER_DISTANCE), sRated, cosPhiRated, Quantities.getQuantity(20, ACTIVE_POWER_IN)) || new InvalidEntityException("The following quantities have to be positive: 0 kWh, 0 kWh/km", invalidEvType)
   }
 
   // Fixed Feed In

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

@@ -232,6 +232,7 @@ class SystemParticipantTestData {
   // EV
   private static final ComparableQuantity<Energy> eStorage = Quantities.getQuantity(100, ENERGY_IN)
   private static final ComparableQuantity<SpecificEnergy> eCons = Quantities.getQuantity(5, ENERGY_PER_DISTANCE)
+  private static final ComparableQuantity<Power> sRatedDC = Quantities.getQuantity(20,ACTIVE_POWER_IN )
   public static final EvTypeInput evTypeInput = new EvTypeInput(
   typeUuid,
   "test_evTypeInput",
@@ -240,7 +241,8 @@ class SystemParticipantTestData {
   eStorage,
   eCons,
   sRated,
-  cosPhiRated)
+  cosPhiRated,
+  sRatedDC)
   public static final EvInput evInput = new EvInput(
   UUID.fromString("a17be20f-c7a7-471d-8ffe-015487c9d022"),
   "test_evInput",

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

@@ -45,7 +45,8 @@ class TypeTestData extends GridTestData {
   Quantities.getQuantity(100d, KILOWATTHOUR),
   Quantities.getQuantity(23d, KILOWATTHOUR_PER_KILOMETRE),
   Quantities.getQuantity(22d, KILOWATT),
-  0.9
+  0.9,
+  Quantities.getQuantity(20d, KILOWATT)
   )
 
   public static final HpTypeInput hpType = new HpTypeInput(

src/test/resources/edu/ie3/datamodel/io/source/csv/_types/ev_type_input.csv

@@ -1,2 +1,2 @@
-uuid,capex,cos_phi_rated,e_cons,e_storage,id,opex,s_rated
-5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,100.0,0.95,5.0,100.0,test_evTypeInput,50.0,25.0
+uuid,capex,cos_phi_rated,e_cons,e_storage,id,opex,s_rated,s_rated_dc
+5ebd8f7e-dedb-4017-bb86-6373c4b68eb8,100.0,0.95,5.0,100.0,test_evTypeInput,50.0,25.0,20.0