update tests

NREL-Sienna · May 17, 2024 · c5e62b2 · c5e62b2
1 parent 7248d17
commit c5e62b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/test/test_device_thermal_generation_constructors.jl b/test/test_device_thermal_generation_constructors.jl
@@ -43,7 +43,7 @@ end
         "quadratic_fuel_test_ts",
         "pwl_io_fuel_test_ts",
         "pwl_incremental_fuel_test_ts",
-        "market_bid_cost"
+        "market_bid_cost",
     ]
     for i in test_cases
         @testset "$i" begin

diff --git a/test/test_model_decision.jl b/test/test_model_decision.jl
@@ -432,11 +432,11 @@ end
     check_duration_off_initial_conditions_values(model, ThermalMultiStart)
     @test solve!(model) == PSI.RunStatus.SUCCESSFULLY_FINALIZED
 
-    ######## Test with ThermalCompactUnitCommitment ########
+    ######## Test with ThermalStandardUnitCommitment ########
     template = get_thermal_standard_uc_template()
     c_sys5_uc = PSB.build_system(PSITestSystems, "c_sys5_pglib"; force_build = true)
-    set_device_model!(template, ThermalMultiStart, ThermalCompactUnitCommitment)
-    set_device_model!(template, ThermalStandard, ThermalCompactUnitCommitment)
+    set_device_model!(template, ThermalMultiStart, ThermalStandardUnitCommitment)
+    set_device_model!(template, ThermalStandard, ThermalStandardUnitCommitment)
     model = DecisionModel(template, c_sys5_uc; optimizer = HiGHS_optimizer)
     @test build!(model; output_dir = mktempdir(; cleanup = true)) ==
           PSI.ModelBuildStatus.BUILT
@@ -654,7 +654,7 @@ end
     template = get_thermal_dispatch_template_network()
     c_sys5_bat = PSB.build_system(PSITestSystems, "c_sys5_bat_ems"; force_build = true)
     device_model = DeviceModel(
-        BatteryEMS,
+        EnergyReservoirStorage,
         StorageDispatchWithReserves;
         attributes = Dict{String, Any}(
             "reservation" => true,

diff --git a/test/test_model_emulation.jl b/test/test_model_emulation.jl
@@ -64,15 +64,15 @@ end
     check_duration_off_initial_conditions_values(model, ThermalMultiStart)
     @test run!(model) == PSI.RunStatus.SUCCESSFULLY_FINALIZED
 
-    ######## Test with ThermalCompactUnitCommitment ########
+    ######## Test with ThermalStandardUnitCommitment ########
     template = get_thermal_standard_uc_template()
     c_sys5_uc = PSB.build_system(
         PSITestSystems,
         "c_sys5_pglib";
         add_single_time_series = true,
         force_build = true,
     )
-    set_device_model!(template, ThermalMultiStart, ThermalCompactUnitCommitment)
+    set_device_model!(template, ThermalMultiStart, ThermalStandardUnitCommitment)
     model = EmulationModel(template, c_sys5_uc; optimizer = HiGHS_optimizer)
     @test build!(model; executions = 1, output_dir = mktempdir(; cleanup = true)) ==
           PSI.ModelBuildStatus.BUILT
@@ -82,15 +82,15 @@ end
     check_duration_off_initial_conditions_values(model, ThermalMultiStart)
     @test run!(model) == PSI.RunStatus.SUCCESSFULLY_FINALIZED
 
-    ######## Test with ThermalCompactDispatch ########
+    ######## Test with ThermalStandardDispatch ########
     template = get_thermal_standard_uc_template()
     c_sys5_uc = PSB.build_system(
         PSITestSystems,
         "c_sys5_pglib";
         add_single_time_series = true,
         force_build = true,
     )
-    device_model = DeviceModel(PSY.ThermalStandard, PSI.ThermalCompactDispatch)
+    device_model = DeviceModel(PSY.ThermalStandard, PSI.ThermalStandardDispatch)
     set_device_model!(template, device_model)
     model = EmulationModel(template, c_sys5_uc; optimizer = HiGHS_optimizer)
     @test build!(model; executions = 10, output_dir = mktempdir(; cleanup = true)) ==