Merge branch 'dev' into ck/#22-dbfsMultipleConnections

# Conflicts:
#	src/main/scala/edu/ie3/simona/agent/grid/GridAgentData.scala

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

@@ -565,10 +565,12 @@ private[grid] trait GridResultsSupport {
           imag
         )
       case Complex(real, imag) =>
-        /* Both real and imaginary part are != 0. This means atan can be used to
-        compute an angle between -90 and 90 degrees. To compute the actual angle
-        (between -180 and 180 degrees), 180 degrees have to be added in case that
-        the real part is negative. */
+        /* Both real and imaginary parts are != 0. This means that the angle
+         * related to the positive real axis is to be determined. To do this,
+         * atan can be used to calculate an angle between -90 and 90 degrees.
+         * To calculate the real angle (between -180 and 180 degrees) with
+         * respect to the real axis, 180 degrees must be added if the real
+         * part is negative. */
         val baseAngle = atan(imag / real).toDegrees
         angleOffsetCorrection(
           Quantities.getQuantity(baseAngle, PowerSystemUnits.DEGREE_GEOM),

src/main/scala/edu/ie3/simona/model/participant/SystemParticipant.scala

@@ -154,10 +154,10 @@ abstract class SystemParticipant[CD <: CalcRelevantData](
         KILOVOLTAMPERE
       )
 
-      if (apparentPower.isGreaterThan(sMax.multiply(1.05))) {
+      if (apparentPower.isGreaterThan(sMax)) {
         logger.warn(
           s"The var characteristics \'$qControl\' of model \'$id\' ($uuid) imposes an apparent " +
-            s"power (= $apparentPower) that exceeds 105 % of " +
+            s"power (= $apparentPower) that exceeds " +
             s"rated apparent power specifications (= $sMax). " +
             s"Therefore, setting reactive power output to the to the upper limit " +
             s"in correspondence to the existing active power $activePower."