Psy3

Artifacts.toml

@@ -1,9 +1,10 @@
 [CaseData]
-git-tree-sha1 = "b67da2ffbab324574933c89f5da8037a8a837373"
+git-tree-sha1 = "5b593e426b15da3f43a99e823041e9d06387fc3a"
+lazy = true
 
     [[CaseData.download]]
-    url = "https://github.com/NREL-Sienna/PowerSystemsTestData/archive/refs/tags/1.0.4.tar.gz"
-    sha256 = "222560226fda72ee8a9ebca5c44b96c7fa92048e1088725dba1ea7f63214e83c"
+    url = "https://github.com/NREL-SIIP/PowerSystemsTestData/archive/refs/tags/2.0-alpha3.tar.gz"
+    sha256 = "a2db32c3ad4a4b5f2191ca6d2b7fd6210b94945ca3986341133f7fc5216901f1"
 
 [rts]
 git-tree-sha1 = "5098f357bad765bfefcff58f080818863ca776bd"

Project.toml

@@ -1,7 +1,7 @@
 name = "PowerSystemCaseBuilder"
 uuid = "f00506e0-b84f-492a-93c2-c0a9afc4364e"
 authors = ["Sourabh Dalvi", "Jose Daniel Lara"]
-version = "1.1.0"
+version = "1.2.0"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -23,7 +23,7 @@ DataFrames = "1"
 DataStructures = "~0.18"
 HDF5 = "0.16"
 InfrastructureSystems = "^1.21"
-PowerSystems = "2"
+PowerSystems = "3"
 PrettyTables = "2"
 TimeSeries = "~0.22, 0.23"
 julia = "^1.6"

src/definitions.jl

@@ -1,5 +1,5 @@
 const PACKAGE_DIR = joinpath(dirname(dirname(pathof(PowerSystemCaseBuilder))))
-const DATA_DIR = joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-1.0.4")
+const DATA_DIR = joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-2.0-alpha3")
 const RTS_DIR = joinpath(LazyArtifacts.artifact"rts", "RTS-GMLC-0.2.2")
 
 const SYSTEM_DESCRIPTORS_FILE = joinpath(PACKAGE_DIR, "src", "system_descriptor.jl")

src/library/psi_library.jl

@@ -530,7 +530,7 @@ function make_modified_RTS_GMLC_sys(resolution::Dates.TimePeriod = Hour(1); kwar
     spin_reserve_R2 = PSY.get_component(PSY.VariableReserve, sys, "Spin_Up_R2")
     spin_reserve_R3 = PSY.get_component(PSY.VariableReserve, sys, "Spin_Up_R3")
     for g in PSY.get_components(
-        x -> PSY.get_prime_mover(x) in [PSY.PrimeMovers.CT, PSY.PrimeMovers.CC],
+        x -> PSY.get_prime_mover_type(x) in [PSY.PrimeMovers.CT, PSY.PrimeMovers.CC],
         PSY.ThermalStandard,
         sys,
     )
@@ -602,7 +602,7 @@ function make_modified_RTS_GMLC_sys(resolution::Dates.TimePeriod = Hour(1); kwar
     end
 
     for g in PSY.get_components(
-        x -> PSY.get_prime_mover(x) == PSY.PrimeMovers.PVe,
+        x -> PSY.get_prime_mover_type(x) == PSY.PrimeMovers.PVe,
         PSY.RenewableDispatch,
         sys,
     )
@@ -611,7 +611,7 @@ function make_modified_RTS_GMLC_sys(resolution::Dates.TimePeriod = Hour(1); kwar
     end
 
     for g in PSY.get_components(
-        x -> PSY.get_prime_mover(x) == PSY.PrimeMovers.PVe,
+        x -> PSY.get_prime_mover_type(x) == PSY.PrimeMovers.PVe,
         PSY.RenewableFix,
         sys,
     )
@@ -674,16 +674,16 @@ function build_two_zone_5_bus(; kwargs...)
 
     # Buses
     nodes10() = [
-        Bus(1, "nodeA", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(2, "nodeB", "PQ", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(3, "nodeC", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(4, "nodeD", "REF", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(5, "nodeE", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(6, "nodeA2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(7, "nodeB2", "PQ", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(8, "nodeC2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(9, "nodeD2", "REF", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
-        Bus(10, "nodeE2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(1, "nodeA", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(2, "nodeB", "PQ", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(3, "nodeC", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(4, "nodeD", "REF", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(5, "nodeE", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(6, "nodeA2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(7, "nodeB2", "PQ", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(8, "nodeC2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(9, "nodeD2", "REF", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
+        ACBus(10, "nodeE2", "PV", 0, 1.0, (min = 0.9, max = 1.05), 230, nothing, nothing),
     ]
 
     # Lines
@@ -832,7 +832,7 @@ function build_two_zone_5_bus(; kwargs...)
             2.00,
             (min = -0.7, max = 0.7),
         ),
-        HVDCLine(
+        TwoTerminalHVDCLine(
             "nodeC-nodeC2",
             true,
             0.0,
@@ -855,7 +855,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 0.40,
             reactive_power = 0.010,
             rating = 0.5,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 0.40),
             reactive_power_limits = (min = -0.30, max = 0.30),
@@ -872,7 +872,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 1.70,
             reactive_power = 0.20,
             rating = 2.2125,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 1.70),
             reactive_power_limits = (min = -1.275, max = 1.275),
@@ -889,7 +889,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 5.2,
             reactive_power = 1.00,
             rating = 5.2,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 5.20),
             reactive_power_limits = (min = -3.90, max = 3.90),
@@ -906,7 +906,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 2.0,
             reactive_power = 0.40,
             rating = 2.5,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 2.0),
             reactive_power_limits = (min = -1.5, max = 1.5),
@@ -923,7 +923,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 6.0,
             reactive_power = 1.50,
             rating = 0.75,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 6.0),
             reactive_power_limits = (min = -4.50, max = 4.50),
@@ -940,7 +940,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 0.40,
             reactive_power = 0.010,
             rating = 0.5,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 0.40),
             reactive_power_limits = (min = -0.30, max = 0.30),
@@ -957,7 +957,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 1.70,
             reactive_power = 0.20,
             rating = 2.2125,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 1.70),
             reactive_power_limits = (min = -1.275, max = 1.275),
@@ -974,7 +974,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 5.2,
             reactive_power = 1.00,
             rating = 5.2,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 5.20),
             reactive_power_limits = (min = -3.90, max = 3.90),
@@ -991,7 +991,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 2.0,
             reactive_power = 0.40,
             rating = 2.5,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 2.0),
             reactive_power_limits = (min = -1.5, max = 1.5),
@@ -1008,7 +1008,7 @@ function build_two_zone_5_bus(; kwargs...)
             active_power = 6.0,
             reactive_power = 1.50,
             rating = 0.75,
-            prime_mover = PrimeMovers.ST,
+            prime_mover_type = PrimeMovers.ST,
             fuel = ThermalFuels.COAL,
             active_power_limits = (min = 0.0, max = 6.0),
             reactive_power_limits = (min = -4.50, max = 4.50),