Reenable HydroEnergyReservoir in test simulation

NREL-Sienna · Jul 9, 2024 · 931298c · 931298c
1 parent cfac230
commit 931298c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/test/test_data/results_data.jl b/test/test_data/results_data.jl
@@ -117,19 +117,16 @@ function _execute_simulation(base_path, sim_name)
     set_device_model!(template_hydro_st_uc, RenewableNonDispatch, FixedOutput)
     set_device_model!(template_hydro_st_uc, RenewableDispatch, RenewableFullDispatch)
     set_device_model!(template_hydro_st_uc, HydroDispatch, FixedOutput)
-    # TODO uncomment when PSI is fixed
     set_device_model!(
         template_hydro_st_uc,
         EnergyReservoirStorage,
         StorageDispatchWithReserves,
     )
-    #=
     set_device_model!(
         template_hydro_st_uc,
         HydroEnergyReservoir,
         HydroDispatchReservoirStorage,
     )
-    =#
     set_service_model!(template_hydro_st_uc, VariableReserve{ReserveUp}, RangeReserve)
 
     template_hydro_st_ed = ProblemTemplate(
@@ -144,19 +141,16 @@ function _execute_simulation(base_path, sim_name)
     set_device_model!(template_hydro_st_ed, RenewableNonDispatch, FixedOutput)
     set_device_model!(template_hydro_st_ed, RenewableDispatch, RenewableFullDispatch)
     set_device_model!(template_hydro_st_ed, HydroDispatch, FixedOutput)
-    # TODO uncomment when PSI is fixed
     set_device_model!(
         template_hydro_st_ed,
         EnergyReservoirStorage,
         StorageDispatchWithReserves,
     )
-    #=
     set_device_model!(
         template_hydro_st_ed,
         HydroEnergyReservoir,
         HydroDispatchReservoirStorage,
     )
-    =#
     models = SimulationModels(;
         decision_models = [
             DecisionModel(

diff --git a/test/test_result_sorting.jl b/test/test_result_sorting.jl
@@ -3,7 +3,7 @@ problem_results = run_test_prob()
 
 @testset "test filter results" begin
     gen = PA.get_generation_data(results_uc; curtailment = false)
-    @test length(gen.data) == 6  # TODO will be 7 when storage and hydro are reenabled
+    @test length(gen.data) == 7
     @test length(gen.time) == 48
 
     gen = PA.get_generation_data(
@@ -65,7 +65,7 @@ problem_results = run_test_prob()
     # TODO: make tests for subsetting data
     sub_gen =
         get_generation_data(results_uc; filter_func = x -> get_name(get_bus(x)) == "bus1")
-    @test length(sub_gen.data) == 7  # TODO will be 8 when storage and hydro are reenabled
+    @test length(sub_gen.data) == 8
 end
 
 @testset "test curtailment calculations" begin