From a2721e9bb4c262b32987be392af59596187f21be Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 1 Mar 2022 17:03:11 +0100 Subject: [PATCH 1/6] kilo volt ampere quantity uitls --- .../edu/ie3/powerFactory2psdm/util/QuantityUtils.scala | 5 +++++ .../ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/util/QuantityUtils.scala b/src/main/scala/edu/ie3/powerFactory2psdm/util/QuantityUtils.scala index d2b37518..36852ee6 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/util/QuantityUtils.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/util/QuantityUtils.scala @@ -93,6 +93,11 @@ object QuantityUtils { VOLTAMPERE ) + def asKiloVoltAmpere: ComparableQuantity[Power] = Quantities.getQuantity( + value, + MetricPrefix.KILO(VOLTAMPERE) + ) + def asMegaVoltAmpere: ComparableQuantity[Power] = Quantities.getQuantity( value, MetricPrefix.MEGA(VOLTAMPERE) diff --git a/src/test/scala/edu/ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala b/src/test/scala/edu/ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala index 767aaef8..a7ea1617 100644 --- a/src/test/scala/edu/ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala +++ b/src/test/scala/edu/ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala @@ -112,6 +112,15 @@ class QuantityUtilsSpec extends Matchers with AnyWordSpecLike { ) } + "convert a double to kilo volt ampere" in { + value.asKiloVoltAmpere should equalWithTolerance( + Quantities.getQuantity( + value, + MetricPrefix.KILO(VOLTAMPERE) + ) + ) + } + "convert a double to mega volt ampere" in { value.asMegaVoltAmpere should equalWithTolerance( Quantities.getQuantity( From fffbf9ae59e409d0ae58807831442b7a60d0c38a Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 1 Mar 2022 17:03:39 +0100 Subject: [PATCH 2/6] use kva for pv --- .../edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala b/src/main/scala/edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala index c55ee7cd..519bcbae 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala @@ -51,7 +51,7 @@ object PvInputGenerator { val height = sample(params.elevationAngle).asDegreeGeom val kG = sample(params.kG) val kT = sample(params.kT) - val sRated = input.sRated.asMegaVoltAmpere + val sRated = input.sRated.asKiloVoltAmpere val cosPhiRated = determineCosPhiRated(input) val qCharacteristics = convertQCharacteristic(params.qCharacteristic, cosPhiRated) From 22e7a203d5b75300914a0bf21aab3ede47852b43 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 1 Mar 2022 17:04:27 +0100 Subject: [PATCH 3/6] use kva for wec --- .../powerFactory2psdm/generator/types/WecTypeGenerator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/generator/types/WecTypeGenerator.scala b/src/main/scala/edu/ie3/powerFactory2psdm/generator/types/WecTypeGenerator.scala index 7e3f2130..5cfa9801 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/generator/types/WecTypeGenerator.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/generator/types/WecTypeGenerator.scala @@ -45,7 +45,7 @@ object WecTypeGenerator { val capex = RandomSampler.sample(params.capex).asEuro val opex = RandomSampler.sample(params.opex).asEuroPerMegaWattHour - val sRated = statGen.sRated.asMegaVoltAmpere + val sRated = statGen.sRated.asKiloVoltAmpere val cosPhiRated = ConversionHelper.determineCosPhiRated(statGen) val cpCharacteristic = new WecCharacteristicInput( params.cpCharacteristic From aca23eac0617e46cdcbd4c41850e8c0e0eab6ed9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 22 Mar 2022 11:57:55 +0100 Subject: [PATCH 4/6] fix test --- .../edu/ie3/powerFactory2psdm/common/ConverterTestData.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala index 8a7f7e3e..1e79388a 100644 --- a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala +++ b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala @@ -385,7 +385,7 @@ object ConverterTestData extends LazyLogging { 1d, 0.9, false, - 11.asMegaVoltAmpere, + 11.asKiloVoltAmpere, 0.91 ) ) From 851a452fa01cea6f299e5418cd5bd5a84add4495 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 22 Mar 2022 12:04:39 +0100 Subject: [PATCH 5/6] fix wec test --- .../edu/ie3/powerFactory2psdm/common/ConverterTestData.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala index 1e79388a..fb11a265 100644 --- a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala +++ b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala @@ -444,7 +444,7 @@ object ConverterTestData extends LazyLogging { "someWecType", 100.asEuro, 50.asEuroPerMegaWattHour, - 11.asMegaVoltAmpere, + 11.asKiloVoltAmpere, 0.91, new WecCharacteristicInput("cP:{(10.00,0.05),(15.00,0.10),(20.00,0.20)}"), 96.asPercent, From a124db39f4f9c70b96a1c2d2756446bfb732932f Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 28 Mar 2022 13:49:15 +0200 Subject: [PATCH 6/6] fixed feed in in mega volt ampere --- .../ie3/powerFactory2psdm/converter/FixedFeedInConverter.scala | 2 +- .../edu/ie3/powerFactory2psdm/common/ConverterTestData.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/edu/ie3/powerFactory2psdm/converter/FixedFeedInConverter.scala b/src/main/scala/edu/ie3/powerFactory2psdm/converter/FixedFeedInConverter.scala index 9d72827c..5bb67261 100644 --- a/src/main/scala/edu/ie3/powerFactory2psdm/converter/FixedFeedInConverter.scala +++ b/src/main/scala/edu/ie3/powerFactory2psdm/converter/FixedFeedInConverter.scala @@ -40,7 +40,7 @@ object FixedFeedInConverter { val cosPhiRated = determineCosPhiRated(input) val reactivePowerCharacteristic = convertQCharacteristic(qCharacteristic, cosPhiRated) - val s = input.sRated.asMegaVoltAmpere + val s = input.sRated.asKiloVoltAmpere new FixedFeedInInput( UUID.randomUUID(), diff --git a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala index 2586e011..4d277c2c 100644 --- a/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala +++ b/src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala @@ -410,7 +410,7 @@ object ConverterTestData extends LazyLogging { "someStatGen", getNodePair("someNode").result, new CosPhiFixed("cosPhiFixed:{(0.0, 0.91)}"), - 11.asMegaVoltAmpere, + 11.asKiloVoltAmpere, 0.91 ) )