some additional changes for hydro

NREL-Sienna · Sep 6, 2023 · 3ad18e2 · 3ad18e2
1 parent 2113c55
commit 3ad18e2
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 141 deletions.
diff --git a/docs/make.jl b/docs/make.jl
@@ -33,7 +33,6 @@ pages = OrderedDict(
     "Formulation Library" => Any[
         "General" => "formulation_library/General.md",
         "Thermal Generation" => "formulation_library/ThermalGen.md",
-        "Hydro Generation" => "formulation_library/HydroGen.md",
         "Renewable Generation" => "formulation_library/RenewableGen.md",
         "Load" => "formulation_library/Load.md",
         "Network" => "formulation_library/Network.md",

diff --git a/docs/src/formulation_library/HydroGen.md b/docs/src/formulation_library/HydroGen.md
diff --git a/src/operation/operation_problem_templates.jl b/src/operation/operation_problem_templates.jl
@@ -8,8 +8,6 @@ function _default_devices_uc()
         DeviceModel(PSY.ThermalStandard, ThermalBasicUnitCommitment),
         DeviceModel(PSY.RenewableDispatch, RenewableFullDispatch),
         DeviceModel(PSY.RenewableFix, FixedOutput),
-        DeviceModel(PSY.HydroEnergyReservoir, HydroDispatchRunOfRiver),
-        DeviceModel(PSY.HydroDispatch, HydroDispatchRunOfRiver),
         DeviceModel(PSY.PowerLoad, StaticPowerLoad),
         DeviceModel(PSY.InterruptiblePowerLoad, PowerLoadInterruption),
         DeviceModel(PSY.Line, StaticBranch),

diff --git a/test/performance/performance_test.jl b/test/performance/performance_test.jl
@@ -7,6 +7,7 @@ const PSY = PowerSystems
 using Logging
 using PowerSystemCaseBuilder
 using PowerNetworkMatrices
+using HydroPowerSimulations
 using HiGHS
 using Dates
 

diff --git a/test/test_formulation_combinations.jl b/test/test_formulation_combinations.jl
@@ -10,10 +10,6 @@
            item["formulation"] == PSI.ThermalBasicCompactUnitCommitment
             found_valid_device = true
         end
-        if item["device_type"] == PSY.ThermalStandard &&
-           item["formulation"] == PSI.HydroDispatchRunOfRiver
-            found_invalid_device = true
-        end
     end
 
     for item in res["service_formulations"]