diff --git a/CHANGELOG.md b/CHANGELOG.md index 41485616d3..e047fdb7d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Refactored method to handle feed in within `ThermalGrid` [#1554](https://github.com/ie3-institute/simona/issues/1554) - Generalize `WeatherSeriesData` to `SecondarySeriesData` [#1584](https://github.com/ie3-institute/simona/issues/1584) - Enhance `EnergyPrice` squants [#1583](https://github.com/ie3-institute/simona/issues/1583) +- Chnaged reactive power of EVs in EvcsModel according to simonaAPI [#1250](https://github.com/ie3-institute/simona/issues/1250) ### Fixed - Fixes in Documentation, ScalaDocs, Code Style and more [#1397](https://github.com/ie3-institute/simona/issues/1397) diff --git a/build.gradle b/build.gradle index 8edb1dcc30..20f9a6e5cc 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ dependencies { exclude group: 'edu.ie3' } - implementation('com.github.ie3-institute:simonaAPI:0.11.0') { + implementation('com.github.ie3-institute:simonaAPI:0.12.0') { exclude group: 'org.apache.logging.log4j' exclude group: 'org.slf4j' /* Exclude our own nested dependencies */ diff --git a/src/main/scala/edu/ie3/simona/model/participant/evcs/EvModelWrapper.scala b/src/main/scala/edu/ie3/simona/model/participant/evcs/EvModelWrapper.scala index 601078bc1d..4c6ed2cbf6 100644 --- a/src/main/scala/edu/ie3/simona/model/participant/evcs/EvModelWrapper.scala +++ b/src/main/scala/edu/ie3/simona/model/participant/evcs/EvModelWrapper.scala @@ -35,7 +35,8 @@ final case class EvModelWrapper( def uuid: UUID = original.getUuid def id: String = original.getId - lazy val pRatedAc: Power = original.getPRatedAC.toSquants + lazy val sRatedAc: Power = original.getSRatedAC.toSquants + lazy val cosPhiRated: Double = original.getCosPhiRated lazy val pRatedDc: Power = original.getPRatedDC.toSquants lazy val eStorage: Energy = original.getEStorage.toSquants diff --git a/src/main/scala/edu/ie3/simona/model/participant/evcs/EvcsChargingProperties.scala b/src/main/scala/edu/ie3/simona/model/participant/evcs/EvcsChargingProperties.scala index 024f847e62..37512814fe 100644 --- a/src/main/scala/edu/ie3/simona/model/participant/evcs/EvcsChargingProperties.scala +++ b/src/main/scala/edu/ie3/simona/model/participant/evcs/EvcsChargingProperties.scala @@ -39,7 +39,7 @@ trait EvcsChargingProperties { ): Power = { val evPower = currentType match { case ElectricCurrentType.AC => - ev.pRatedAc + ev.sRatedAc * ev.cosPhiRated case ElectricCurrentType.DC => ev.pRatedDc }