Merge branch 'dev' into ms/#53-upgrate-to-scala3

# Conflicts:
#	CHANGELOG.md

Author: staudtMarius

CHANGELOG.md

@@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replace `WecModel` with its new implementation [#1154](https://github.com/ie3-institute/simona/issues/1154)
 - Replace `StorageModel` with its new implementation [#1153](https://github.com/ie3-institute/simona/issues/1153)
 - Use ValidationUtils for ThermalGrids [#1117](https://github.com/ie3-institute/simona/issues/1117)
+- Replace `EvcsModel` with its new implementation [#1151](https://github.com/ie3-institute/simona/issues/1151)
 
 ### Changed
 - Adapted to changed data source in PSDM [#435](https://github.com/ie3-institute/simona/issues/435)
@@ -147,6 +148,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Based `PvModel` calculations on irradiance (power per area) instead of irradiation (energy per area) [#1212](https://github.com/ie3-institute/simona/issues/1212)
 - Updated to changes of PSDM release v6.0.0 [#1107](https://github.com/ie3-institute/simona/issues/1107)
 - Refactor external simulation setup [#1136](https://github.com/ie3-institute/simona/issues/1136)
+- Use new tick retrieval methods from PSDM [#920](https://github.com/ie3-institute/simona/issues/920)
 - Upgrated `scala2` to `scala3` [#53](https://github.com/ie3-institute/simona/issues/53)
 
 ### Fixed
@@ -201,6 +203,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix handling of states in `ParticipantModelShell` [#1228](https://github.com/ie3-institute/simona/issues/1228)
 - Fix input data handling in `ParticipantModel` [#1237](https://github.com/ie3-institute/simona/issues/1237)
 - Show full stacktrace of failing tests with `gradle test` [#1245](https://github.com/ie3-institute/simona/issues/1245)
+- Fix copernicus url in readthedocs [#1248](https://github.com/ie3-institute/simona/issues/1248)
 
 ### Removed
 - Removed `SimonaListerner` and related code [#1205](https://github.com/ie3-institute/simona/issues/1205)

docs/readthedocs/howto/weatherDataHowToCopernicusERA5.md

@@ -2,7 +2,7 @@
 
 # How To use Copernicus ERA5 weather data in SIMONA
 
-To use weather data from the past within SIMONA we recommend to use the dataset [ERA5 hourly data on single levels from 1940 to present](https://cds-beta.climate.copernicus.eu/datasets/reanalysis-era5-single-levels?tab=download) of [Copernicus Climate Data Store](https://cds-beta.climate.copernicus.eu/).
+To use weather data from the past within SIMONA we recommend to use the dataset [ERA5 hourly data on single levels from 1940 to present](https://cds.climate.copernicus.eu/datasets/reanalysis-era5-single-levels?tab=download) of [Copernicus Climate Data Store](https://cds.climate.copernicus.eu/).
 
 The following data parameter should be used
 

src/main/scala/edu/ie3/simona/agent/grid/GridAgentController.scala

@@ -12,11 +12,7 @@ import edu.ie3.datamodel.models.input.system._
 import edu.ie3.simona.actor.SimonaActorNaming._
 import edu.ie3.simona.agent.EnvironmentRefs
 import edu.ie3.simona.agent.em.EmAgent
-import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService.{
-  ActorExtEvDataService,
-  ActorWeatherService,
-}
-import edu.ie3.simona.agent.participant.evcs.EvcsAgent
+import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService.ActorWeatherService
 import edu.ie3.simona.agent.participant.hp.HpAgent
 import edu.ie3.simona.agent.participant.statedata.ParticipantStateData.ParticipantInitializeStateData
 import edu.ie3.simona.agent.participant2.ParticipantAgentInit.{
@@ -405,22 +401,15 @@ class GridAgentController(
           maybeControllingEm,
         )
       case input: EvcsInput =>
-        buildEvcs(
+        buildParticipant(
           input,
           participantConfigUtil.getOrDefault[EvcsRuntimeConfig](
             input.getUuid
           ),
-          environmentRefs.primaryServiceProxy,
-          environmentRefs.evDataService.getOrElse(
-            throw new GridAgentInitializationException(
-              "EvMovementsService required for setting up evcs."
-            )
-          ),
-          simulationStartDate,
-          simulationEndDate,
-          resolution,
-          requestVoltageDeviationThreshold,
           outputConfigUtil.getOrDefault(NotifierIdentifier.Evcs),
+          participantRefs,
+          simParams,
+          environmentRefs.scheduler,
           maybeControllingEm,
         )
       case hpInput: HpInput =>
@@ -494,74 +483,6 @@ class GridAgentController(
     participant
   }
 
-  /** Creates an Evcs agent and determines the needed additional information for
-    * later initialization of the agent.
-    *
-    * @param evcsInput
-    *   Evcs input model to derive information from
-    * @param modelConfiguration
-    *   User-provided configuration for this specific load model
-    * @param primaryServiceProxy
-    *   Reference to the primary data service proxy
-    * @param evMovementsService
-    *   Reference to the ev movements service actor
-    * @param simulationStartDate
-    *   The simulation time at which the simulation starts
-    * @param simulationEndDate
-    *   The simulation time at which the simulation ends
-    * @param resolution
-    *   Frequency of power flow calculations
-    * @param requestVoltageDeviationThreshold
-    *   Maximum deviation in p.u. of request voltages to be considered equal
-    * @param outputConfig
-    *   Configuration of the output behavior
-    * @param maybeControllingEm
-    *   The parent EmAgent, if applicable
-    * @return
-    *   The [[EvcsAgent]] 's [[ActorRef]]
-    */
-  private def buildEvcs(
-      evcsInput: EvcsInput,
-      modelConfiguration: EvcsRuntimeConfig,
-      primaryServiceProxy: ClassicRef,
-      evMovementsService: ClassicRef,
-      simulationStartDate: ZonedDateTime,
-      simulationEndDate: ZonedDateTime,
-      resolution: Long,
-      requestVoltageDeviationThreshold: Double,
-      outputConfig: NotifierConfig,
-      maybeControllingEm: Option[ActorRef[FlexResponse]],
-  ): ActorRef[ParticipantAgent.Request] = {
-    val participant = gridAgentContext.toClassic
-      .simonaActorOf(
-        EvcsAgent.props(
-          environmentRefs.scheduler.toClassic,
-          ParticipantInitializeStateData(
-            evcsInput,
-            modelConfiguration,
-            primaryServiceProxy,
-            Iterable(
-              ActorExtEvDataService(
-                evMovementsService
-              )
-            ),
-            simulationStartDate,
-            simulationEndDate,
-            resolution,
-            requestVoltageDeviationThreshold,
-            outputConfig,
-            maybeControllingEm,
-          ),
-          listener.map(_.toClassic),
-        ),
-        evcsInput.getId,
-      )
-      .toTyped
-    introduceAgentToEnvironment(participant)
-
-    participant
-  }
-
   /** Builds an [[HpAgent]] from given input
     *
     * @param hpInput

src/main/scala/edu/ie3/simona/agent/participant/ServiceRegistration.scala

@@ -7,12 +7,11 @@
 package edu.ie3.simona.agent.participant
 
 import org.apache.pekko.actor.ActorRef
-import edu.ie3.datamodel.models.input.system.{EvcsInput, SystemParticipantInput}
+import edu.ie3.datamodel.models.input.system.SystemParticipantInput
 import edu.ie3.simona.agent.participant.data.Data.PrimaryData.PrimaryDataWithComplexPower
 import edu.ie3.simona.agent.participant.data.Data.SecondaryData
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService
 import edu.ie3.simona.agent.participant.data.secondary.SecondaryDataService.{
-  ActorExtEvDataService,
   ActorPriceService,
   ActorWeatherService,
 }
@@ -24,7 +23,6 @@ import edu.ie3.simona.model.participant.{
   ModelState,
   SystemParticipant,
 }
-import edu.ie3.simona.ontology.messages.services.EvMessage.RegisterForEvDataMessage
 import edu.ie3.simona.ontology.messages.services.WeatherMessage.RegisterForWeatherMessage
 
 trait ServiceRegistration[
@@ -89,9 +87,6 @@ trait ServiceRegistration[
     case ActorWeatherService(serviceRef) =>
       registerForWeather(serviceRef, participantRef, inputModel)
       Some(serviceRef)
-    case ActorExtEvDataService(serviceRef) =>
-      registerForEvData(serviceRef, inputModel)
-      Some(serviceRef)
   }
 
   /** Register for the weather service
@@ -125,27 +120,4 @@ trait ServiceRegistration[
     serviceRef ! RegisterForWeatherMessage(participantRef, lat, lon)
   }
 
-  /** Register for the EV movement service
-    *
-    * @param serviceRef
-    *   Actor reference of the EV movements service
-    * @param inputModel
-    *   Input model of the simulation mode
-    * @return
-    */
-  private def registerForEvData(
-      serviceRef: ActorRef,
-      inputModel: I,
-  ): Unit = {
-    inputModel match {
-      case evcsInput: EvcsInput =>
-        serviceRef ! RegisterForEvDataMessage(evcsInput.getUuid)
-      case _ =>
-        throw new ServiceRegistrationException(
-          s"Cannot register for EV movements information at node ${inputModel.getNode.getId} " +
-            s"(${inputModel.getNode.getUuid}) of type ${inputModel.getClass.getName}, because only Evcs can register for this."
-        )
-    }
-  }
-
 }