Merge branch 'refs/heads/dev' into df/#856-tap-water

# Conflicts:
#	src/test/scala/edu/ie3/simona/test/common/input/CylindricalStorageInputTestData.scala

src/test/scala/edu/ie3/simona/test/common/input/CylindricalStorageInputTestData.scala

@@ -1,30 +0,0 @@
-/*
- * © 2020. TU Dortmund University,
- * Institute of Energy Systems, Energy Efficiency and Energy Economics,
- * Research group Distribution grid planning and operation
- */
-
-package edu.ie3.simona.test.common.input
-
-import java.util.UUID
-import edu.ie3.datamodel.models.StandardUnits
-import edu.ie3.datamodel.models.input.thermal.{
-  CylindricalStorageInput,
-  ThermalBusInput,
-}
-import edu.ie3.util.quantities.PowerSystemUnits
-import tech.units.indriya.quantity.Quantities.getQuantity
-
-trait CylindricalStorageInputTestData {
-
-  protected val csInputModel = new CylindricalStorageInput(
-    UUID.randomUUID(),
-    "ThermalStorage",
-    new ThermalBusInput(UUID.randomUUID(), "ThermalBus"),
-    getQuantity(100, StandardUnits.VOLUME),
-    getQuantity(30, StandardUnits.TEMPERATURE),
-    getQuantity(40, StandardUnits.TEMPERATURE),
-    getQuantity(1.15, StandardUnits.SPECIFIC_HEAT_CAPACITY),
-    getQuantity(11d, PowerSystemUnits.KILOWATT),
-  )
-}