Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pv power fix #210

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+20 −6
Open

Pv power fix #210

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a2721e9
kilo volt ampere quantity uitls
t-ober Mar 1, 2022
fffbf9a
use kva for pv
t-ober Mar 1, 2022
22e7a20
use kva for wec
t-ober Mar 1, 2022
aca23ea
fix test
t-ober Mar 22, 2022
851a452
fix wec test
t-ober Mar 22, 2022
6767c82
Merge branch 'main' into to/#208-pv-power-fix
t-ober Mar 24, 2022
6dbbf76
Merge branch 'main' into to/#208-pv-power-fix
t-ober Mar 28, 2022
a124db3
fixed feed in in mega volt ampere
t-ober Mar 28, 2022
140d553
Merge branch 'main' into to/#208-pv-power-fix
t-ober Apr 3, 2022
37b8e93
Merge branch 'main' into to/#208-pv-power-fix
t-ober May 6, 2022
b674a61
Merge branch 'main' into to/#208-pv-power-fix
t-ober Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/edu/ie3/powerFactory2psdm/generator/PvInputGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/edu/ie3/powerFactory2psdm/generator/types/WecTypeGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/main/scala/edu/ie3/powerFactory2psdm/util/QuantityUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/edu/ie3/powerFactory2psdm/common/ConverterTestData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ object ConverterTestData extends LazyLogging {
1d,
0.9,
false,
11.asMegaVoltAmpere,
11.asKiloVoltAmpere,
0.91
)
)
Expand Down Expand Up @@ -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,
Expand Down
9 changes: 9 additions & 0 deletions src/test/scala/edu/ie3/powerFactory2psdm/util/QuantityUtilsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down