Skip to content

Jd/remove hydroenergyreservoir #158

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

Merged
jd-lara merged 13 commits into from
Sep 15, 2025
Merged

Jd/remove hydroenergyreservoir #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8bf702c
remove references to hydroenergyreservoir
jd-lara Sep 9, 2025
16331df
upodate psi tests systems
jd-lara Sep 9, 2025
012a260
use existing function
jd-lara Sep 9, 2025
0537fd4
Update src/library/psitest_library.jl
jd-lara Sep 9, 2025
d72fba1
Update src/library/psitest_library.jl
jd-lara Sep 9, 2025
3f7eef0
Update src/library/psitest_library.jl
jd-lara Sep 9, 2025
01b1400
fix vector
jd-lara Sep 9, 2025
a5afe94
Merge branch 'jd/remove_hydroenergyreservoir' of https://github.com/N…
jd-lara Sep 9, 2025
e5b615b
last changes to reservoirs
jd-lara Sep 9, 2025
ec74331
one more test
jd-lara Sep 9, 2025
177a53a
Update src/utils/utils.jl
jd-lara Sep 13, 2025
fe4bb73
Update src/library/psitest_library.jl
jd-lara Sep 13, 2025
a22940d
add supports services check
jd-lara Sep 15, 2025
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
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e"
[compat]
CSV = "~0.10"
DataFrames = "1"
DataStructures = "~0.18"
DataStructures = "^0.18, ^0.19"
Dates = "1"
Downloads = "1.6"
HDF5 = "0.17"
Expand All @@ -33,5 +33,5 @@ PowerSystems = "^4.5"
PrettyTables = "2"
Random = "1"
SHA = "0.7"
TimeSeries = "~0.23, 0.24"
TimeSeries = "^0.24, ^0.25"
julia = "^1.6"
10 changes: 5 additions & 5 deletions src/library/psi_library.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function build_5_bus_hydro_uc_sys_targets(; add_forecasts, raw_data, sys_kwargs.
c_sys5_hy_uc = PSY.System(rawsys; sys_kwargs...)
end
cost = HydroGenerationCost(CostCurve(LinearCurve(0.15)), 0.0)
for hy in get_components(HydroEnergyReservoir, c_sys5_hy_uc)
for hy in get_components(HydroTurbine, c_sys5_hy_uc)
set_operation_cost!(hy, cost)
end
return c_sys5_hy_uc
Expand Down Expand Up @@ -335,7 +335,7 @@ function build_5_bus_hydro_ed_sys_targets(; raw_data, kwargs...)
sys_kwargs...,
)
cost = HydroGenerationCost(CostCurve(LinearCurve(0.15)), 0.0)
for hy in get_components(HydroEnergyReservoir, c_sys5_hy_ed)
for hy in get_components(HydroTurbine, c_sys5_hy_ed)
set_operation_cost!(hy, cost)
end
PSY.transform_single_time_series!(c_sys5_hy_ed, Hour(2), Hour(1))
Expand Down Expand Up @@ -387,7 +387,7 @@ function build_5_bus_hydro_wk_sys_targets(; raw_data, kwargs...)
sys_kwargs...,
)
cost = HydroGenerationCost(CostCurve(LinearCurve(0.15)), 0.0)
for hy in get_components(HydroEnergyReservoir, c_sys5_hy_wk)
for hy in get_components(HydroTurbine, c_sys5_hy_wk)
set_operation_cost!(hy, cost)
end
PSY.transform_single_time_series!(c_sys5_hy_wk, Hour(48), Hour(48))
Expand Down Expand Up @@ -565,7 +565,7 @@ function make_modified_RTS_GMLC_sys(
end

# Add Hydro to regulation reserves
for d in PSY.get_components(PSY.HydroEnergyReservoir, sys)
for d in PSY.get_components(PSY.HydroTurbine, sys)
PSY.remove_component!(sys, d)
end

Expand Down Expand Up @@ -1426,7 +1426,7 @@ function _duplicate_system(main_sys::PSY.System, twin_sys::PSY.System, HVDC_line
!PSY.has_time_series(b) && PSY.copy_time_series!(b, main_comp)

# add service to the device to be added to main_sys
if length(PSY.get_services(main_comp)) > 0
if length(PSY.get_services(main_comp)) > 0 && supports_services(b)
PSY.get_name(b)
srvc_ = PSY.get_services(main_comp)
for ss in srvc_
Expand Down
Loading
Loading