Merge remote-tracking branch 'origin/dev' into jb/#671-externaldatase…

…rvice

# Conflicts:
#	src/main/scala/edu/ie3/simona/sim/SimonaSim.scala
#	src/main/scala/edu/ie3/simona/sim/setup/ExtSimSetupData.scala
#	src/main/scala/edu/ie3/simona/sim/setup/SimonaStandaloneSetup.scala
#	src/main/scala/edu/ie3/util/scala/quantities/DefaultQuantities.scala

.gitignore

@@ -232,3 +232,6 @@ deploy.properties
 
 # Ignore Gradle build output directory
 build
+
+# Ignore unwanted input directories
+input/ext_sim

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Config possibility for transformer control groups [#90](https://github.com/ie3-institute/simona/issues/90)
 - Implemented scaling of all relevant input parameters [#764](https://github.com/ie3-institute/simona/issues/764)
 - Consider scaling factor with flex options [#734](https://github.com/ie3-institute/simona/issues/734)
+- Implementation of Energy Management Agents [#204](https://github.com/ie3-institute/simona/issues/204)
 
 ### Changed
 - Adapted to changed data source in PSDM [#435](https://github.com/ie3-institute/simona/issues/435)

input/samples/vn_simona/vn_simona.conf

@@ -158,6 +158,18 @@ simona.runtime.participant.hp = {
   individualConfigs = []
 }
 
+# # # # #
+# ATTENTION: calculateMissingReactivePowerWithModel and scaling is ignored here.
+# # # # #
+simona.runtime.participant.em = {
+  defaultConfig = {
+    calculateMissingReactivePowerWithModel = false
+    uuids = ["default"]
+    scaling = 1.0
+  }
+  individualConfigs = []
+}
+
 ##################################################################
 # Event Configuration
 ##################################################################

src/main/resources/config/config-template.conf

@@ -54,6 +54,18 @@ EvcsRuntimeConfig {
   lowestEvSoc: Double | 0.2 # Defines the lowest possible state of charge (SoC) that an EV is allowed to uncharge in vehicle to grid (V2G) mode
 }
 
+#@define extends BaseRuntimeConfig
+EmRuntimeConfig {
+  # # # # #
+  # ATTENTION: calculateMissingReactivePowerWithModel and scaling is ignored here.
+  # Cleaner solution is possible with different config framework.
+  # # # # #
+  baseRuntimeConfig: BaseRuntimeConfig # this entry is ignored by the config generator,
+  # but cannot removed bc otherwise EmRuntimeConfig is handled as String
+  curtailRegenerative: Boolean | false
+  aggregateFlex: String | "SELF_OPT_EXCL_REG"
+}
+
 #@define extends BaseRuntimeConfig
 HpRuntimeConfig {
   baseRuntimeConfig: BaseRuntimeConfig # this entry is ignored by the config generator,
@@ -312,6 +324,10 @@ simona.runtime.participant = {
     defaultConfig = HpRuntimeConfig # Mandatory default config (uuids are ignored, best provide "default")
     individualConfigs = [HpRuntimeConfig]
   }
+  em = {
+    defaultConfig = EmRuntimeConfig # Mandatory default config (uuids are ignored, best provide "default")
+    individualConfigs = [EmRuntimeConfig]
+  }
 }
 
 ##################################################################