Merge remote-tracking branch 'origin/jd/hydro_remove' into jd/custom_…

…model_improvements
NREL-Sienna · Sep 6, 2023 · 2eb659a · 2eb659a
2 parents 1ebb9a7 + 8b445b9
commit 2eb659a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 898 deletions.
diff --git a/src/PowerSimulations.jl b/src/PowerSimulations.jl
@@ -69,10 +69,6 @@ export ThermalCompactDispatch
 export DeviceLimitedRegulation
 export ReserveLimitedRegulation
 
-###### Hydro #######
-export HydroDispatchRunOfRiver
-export HydroCommitmentRunOfRiver
-
 # feedforward models
 export UpperBoundFeedforward
 export LowerBoundFeedforward
@@ -516,7 +512,6 @@ include("devices_models/devices/thermal_generation.jl")
 include("devices_models/devices/electric_loads.jl")
 include("devices_models/devices/AC_branches.jl")
 include("devices_models/devices/DC_branches.jl")
-include("devices_models/devices/hydro_generation.jl")
 include("devices_models/devices/regulation_device.jl")
 
 # Services Models

diff --git a/src/core/formulations.jl b/src/core/formulations.jl
@@ -72,21 +72,6 @@ Formulation type to enable (continuous) load interruption dispatch
 """
 struct PowerLoadDispatch <: AbstractControllablePowerLoadFormulation end
 
-############################ Hydro Generation Formulations #################################
-abstract type AbstractHydroFormulation <: AbstractDeviceFormulation end
-abstract type AbstractHydroDispatchFormulation <: AbstractHydroFormulation end
-abstract type AbstractHydroUnitCommitment <: AbstractHydroFormulation end
-
-"""
-Formulation type to add injection variables constrained by a maximum injection time series for `HydroGen`
-"""
-struct HydroDispatchRunOfRiver <: AbstractHydroDispatchFormulation end
-
-"""
-Formulation type to add commitment and injection variables constrained by a maximum injection time series for `HydroGen`
-"""
-struct HydroCommitmentRunOfRiver <: AbstractHydroUnitCommitment end
-
 ############################ Regulation Device Formulations ################################
 abstract type AbstractRegulationFormulation <: AbstractDeviceFormulation end
 struct ReserveLimitedRegulation <: AbstractRegulationFormulation end