Skip to content

Commit 5bfa64d

Browse files
committed
FIX: gens rated information.
1 parent 2b388d6 commit 5bfa64d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/data_model/transformations/ravens2math.jl

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@ function _map_ravens2math_rotating_machine!(data_math::Dict{String,<:Any}, data_
17601760
math_obj["pmax"] = ((get(ravens_obj["RotatingMachine.GeneratingUnit"], "GeneratingUnit.maxOperatingP", Inf) * ones(nconductors)) ./ nconductors)./(power_scale_factor)
17611761
else
17621762
math_obj["pmin"] = (zeros(nconductors) ./ nconductors)./(power_scale_factor)
1763-
math_obj["pmax"] = ((get(ravens_obj, "RotatingMachine.ratedS", Inf) * ones(nconductors)) ./ nconductors)./(power_scale_factor)
1763+
math_obj["pmax"] = ((get(ravens_obj, "RotatingMachine.ratedS", Inf) * get(ravens_obj, "RotatingMachine.ratedPowerFactor", 1.0) * ones(nconductors)) ./ nconductors)./(power_scale_factor)
17641764
end
17651765

17661766
# Set bus type
@@ -1790,6 +1790,11 @@ function _map_ravens2math_rotating_machine!(data_math::Dict{String,<:Any}, data_
17901790
math_obj["qmin"] = ((ravens_obj["RotatingMachine.minQ"] * ones(nconductors)) ./ nconductors)./(power_scale_factor)
17911791
elseif haskey(ravens_obj, "SynchronousMachine.minQ")
17921792
math_obj["qmin"] = ((ravens_obj["SynchronousMachine.minQ"] * ones(nconductors)) ./ nconductors)./(power_scale_factor)
1793+
elseif haskey(ravens_obj, "RotatingMachine.ratedPowerFactor")
1794+
Srated = get(ravens_obj, "RotatingMachine.ratedS", Inf)
1795+
PFrated = get(ravens_obj, "RotatingMachine.ratedPowerFactor", 1.0)
1796+
Prated = Srated*PFrated
1797+
math_obj["qmax"] = -((sqrt(Srated^2 - Prated^2) * ones(nconductors)) ./ nconductors) ./ (power_scale_factor)
17931798
else
17941799
math_obj["qmin"] = fill(-Inf, nconductors)
17951800
end
@@ -1798,6 +1803,11 @@ function _map_ravens2math_rotating_machine!(data_math::Dict{String,<:Any}, data_
17981803
math_obj["qmax"] = ((ravens_obj["RotatingMachine.maxQ"] * ones(nconductors)) ./ nconductors)./(power_scale_factor)
17991804
elseif haskey(ravens_obj, "SynchronousMachine.maxQ")
18001805
math_obj["qmax"] = ((ravens_obj["SynchronousMachine.maxQ"] * ones(nconductors)) ./ nconductors)./(power_scale_factor)
1806+
elseif haskey(ravens_obj, "RotatingMachine.ratedPowerFactor")
1807+
Srated = get(ravens_obj, "RotatingMachine.ratedS", Inf)
1808+
PFrated = get(ravens_obj, "RotatingMachine.ratedPowerFactor", 1.0)
1809+
Prated = Srated*PFrated
1810+
math_obj["qmax"] = ((sqrt(Srated^2 - Prated^2) * ones(nconductors)) ./ nconductors) ./ (power_scale_factor)
18011811
else
18021812
math_obj["qmax"] = fill(Inf, nconductors)
18031813
end

0 commit comments

Comments
 (0)