Merge pull request #13 from NREL-Sienna/jd/psy3

Jd/psy3
NREL-Sienna · Sep 15, 2023 · 5dd42b3 · 5dd42b3 · jd-lara · Sep 15, 2023
2 parents 802ab15 + d04fc05
commit 5dd42b3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PowerAnalytics"
 uuid = "56ce1300-00bc-47e4-ba8c-b166ccc19f51"
 authors = ["cbarrows <clayton.barrows@nrel.gov>"]
-version = "0.4.0"
+version = "0.5.0"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -18,8 +18,8 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 DataFrames = "1"
 DataStructures = "0.18"
 InfrastructureSystems = "1"
-PowerSimulations = "^0.21"
-PowerSystems = "2"
+PowerSimulations = "^0.23"
+PowerSystems = "3"
 TimeSeries = "0.23"
 YAML = "0.4"
 julia = "1.6"
diff --git a/src/fuel_results.jl b/src/fuel_results.jl
@@ -100,8 +100,8 @@ function make_fuel_dictionary(
         else
             fuel = hasmethod(PSY.get_fuel, Tuple{typeof(gen)}) ? PSY.get_fuel(gen) : nothing
             pm =
-                hasmethod(PSY.get_prime_mover, Tuple{typeof(gen)}) ?
-                PSY.get_prime_mover(gen) : nothing
+                hasmethod(PSY.get_prime_mover_type, Tuple{typeof(gen)}) ?
+                PSY.get_prime_mover_type(gen) : nothing
             ext = get(PSY.get_ext(gen), "ext_category", nothing)
             category = get_generator_category(typeof(gen), fuel, pm, ext, mapping)
         end

diff --git a/src/get_data.jl b/src/get_data.jl
@@ -288,7 +288,7 @@ function get_generation_data(
     results::R;
     # aggregation::Union{
     #     Type{PSY.StaticInjection},
-    #     Type{PSY.Bus},
+    #     Type{PSY.ACBus},
     #     Type{PSY.System},
     #     Type{<:PSY.AggregationTopology},
     # } = PSY.StaticInjection,
@@ -402,7 +402,7 @@ end
 
 ################################### INPUT DEMAND #################################
 
-function _get_loads(system::PSY.System, bus::PSY.Bus)
+function _get_loads(system::PSY.System, bus::PSY.ACBus)
     return [
         load for load in PSY.get_components(PSY.get_available, PSY.StaticLoad, system) if
         PSY.get_bus(load) == bus
@@ -426,7 +426,7 @@ function get_load_data(
     system::PSY.System;
     aggregation::Union{
         Type{PSY.StaticLoad},
-        Type{PSY.Bus},
+        Type{PSY.ACBus},
         Type{PSY.System},
         Type{<:PSY.AggregationTopology},
     } = PSY.StandardLoad,

diff --git a/test/test_data/results_data.jl b/test/test_data/results_data.jl
@@ -2,7 +2,7 @@ function add_re!(sys)
     re = RenewableDispatch(
         "WindBusA",
         true,
-        get_component(Bus, sys, "bus5"),
+        get_component(ACBus, sys, "bus5"),
         0.0,
         0.0,
         1.200,
@@ -18,7 +18,7 @@ function add_re!(sys)
     fx = RenewableFix(
         "RoofTopSolar",
         true,
-        get_component(Bus, sys, "bus5"),
+        get_component(ACBus, sys, "bus5"),
         0.0,
         0.0,
         1.100,
@@ -45,7 +45,7 @@ function add_re!(sys)
     batt = GenericBattery(
         "test_batt",
         true,
-        get_component(Bus, sys, "bus4"),
+        get_component(ACBus, sys, "bus4"),
         PrimeMovers.BA,
         0.0,
         (min = 0.0, max = 1.0),
@@ -100,7 +100,7 @@ function _execute_simulation(base_path, sim_name)
     set_device_model!(template_hydro_st_uc, RenewableFix, FixedOutput)
     set_device_model!(template_hydro_st_uc, RenewableDispatch, RenewableFullDispatch)
     set_device_model!(template_hydro_st_uc, HydroDispatch, FixedOutput)
-    set_device_model!(template_hydro_st_uc, GenericBattery, BookKeeping)
+    set_device_model!(template_hydro_st_uc, GenericBattery, StorageDispatchWithReserves)
     set_device_model!(
         template_hydro_st_uc,
         HydroEnergyReservoir,
@@ -120,7 +120,7 @@ function _execute_simulation(base_path, sim_name)
     set_device_model!(template_hydro_st_ed, RenewableFix, FixedOutput)
     set_device_model!(template_hydro_st_ed, RenewableDispatch, RenewableFullDispatch)
     set_device_model!(template_hydro_st_ed, HydroDispatch, FixedOutput)
-    set_device_model!(template_hydro_st_ed, GenericBattery, BookKeeping)
+    set_device_model!(template_hydro_st_ed, GenericBattery, StorageDispatchWithReserves)
     set_device_model!(
         template_hydro_st_ed,
         HydroEnergyReservoir,

diff --git a/test/test_result_sorting.jl b/test/test_result_sorting.jl
@@ -102,7 +102,7 @@ end
 
 @testset "Test system data getters" begin
     sys = PSI.get_system(results_uc)
-    load_data1 = PA.get_load_data(sys; aggregation = Bus)
+    load_data1 = PA.get_load_data(sys; aggregation = ACBus)
     @test length(load_data1.data) == 3
     @test length(load_data1.time) == 24