update hvdc loss model

Artifacts.toml

@@ -1,10 +1,10 @@
 [CaseData]
-git-tree-sha1 = "afb608473cf4d5eb22147856de1a1a651f36d40b"
+git-tree-sha1 = "790e4a66bbce8b8bafd4fb2fbf9e494545211264"
 lazy = true
 
     [[CaseData.download]]
-    url = "https://github.com/NREL-Sienna/PowerSystemsTestData/archive/refs/tags/3.1.tar.gz"
-    sha256 = "4ac6ccd9dc9690b52ad6d0f46eeb759608e04ef8bc871732ff54bdbb0493dcea"
+    url = "https://github.com/NREL-Sienna/PowerSystemsTestData/archive/refs/tags/3.3.tar.gz"
+    sha256 = "93f103ea62de8026760368de3f959cd8cd52d8ccd27178c3df873bff6b204af0"
 
 [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.3.5"
+version = "1.3.11"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -29,7 +29,7 @@ HDF5 = "0.17"
 InfrastructureSystems = "2"
 JSON3 = "1"
 LazyArtifacts = "1"
-PowerSystems = "^4.1.1"
+PowerSystems = "^4.5"
 PrettyTables = "2"
 Random = "1"
 SHA = "0.7"

src/build_system.jl

@@ -58,7 +58,10 @@ function _build_system(
     assign_new_uuids::Bool = false,
     skip_serialization::Bool = false,
 )
-    if !is_serialized(name, case_args) || force_build
+    # We skip serialization/de-serialization if sys_args are passed because we currently
+    # cannot encode information about some of them into file paths
+    # (such as lambda functions).
+    if !isempty(sys_args) || !is_serialized(name, case_args) || force_build
         check_serialized_storage()
         download_function = get_download_function(sys_descriptor)
         if !isnothing(download_function)
@@ -76,7 +79,7 @@ function _build_system(
         #construct_time = time() - start
         serialized_filepath = get_serialized_filepath(name, case_args)
         start = time()
-        if !skip_serialization
+        if !skip_serialization && isempty(sys_args)
             PSY.to_json(sys, serialized_filepath; force = true)
             #serialize_time = time() - start
             serialize_case_parameters(case_args)

src/definitions.jl

@@ -1,6 +1,6 @@
 const PACKAGE_DIR = joinpath(dirname(dirname(pathof(PowerSystemCaseBuilder))))
 const DATA_DIR =
-    joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-3.1")
+    joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-3.3")
 
 const RTS_DIR = joinpath(LazyArtifacts.artifact"rts", "RTS-GMLC-0.2.2")
 

src/library/psi_library.jl

@@ -805,7 +805,7 @@ function build_two_zone_5_bus(; kwargs...)
             (min = -2.0, max = 2.0),
             (min = -2.0, max = 2.0),
             (min = -2.0, max = 2.0),
-            (l0 = 0.0, l1 = 0.0),
+            LinearCurve(0.0),
         ),
     ]
 
@@ -1361,7 +1361,7 @@ function _duplicate_system(main_sys::PSY.System, twin_sys::PSY.System, HVDC_line
             active_power_limits_to = (min = -1000.0, max = 1000.0),
             reactive_power_limits_from = (min = -1000.0, max = 1000.0),
             reactive_power_limits_to = (min = -1000.0, max = 1000.0),
-            loss = (l0 = 0.0, l1 = 0.1),
+            loss = PSY.LinearCurve(0.1),
             services = Vector{Service}[],
             ext = Dict{String, Any}(),
         )

src/library/psid_library.jl

@@ -62,6 +62,92 @@ function build_3bus_inverter(; raw_data, kwargs...)
     return sys
 end
 
+function build_psid_wecc_9_dynamic(; raw_data, kwargs...)
+    sys_kwargs = filter_kwargs(; kwargs...)
+    sys = System(raw_data; runchecks = false, sys_kwargs...)
+
+    # Manually change reactance of three branches to match Sauer & Pai (2007) Figure 7.4
+    set_x!(get_component(Branch, sys, "Bus 5-Bus 4-i_1"), 0.085)
+    set_x!(get_component(Branch, sys, "Bus 9-Bus 6-i_1"), 0.17)
+    set_x!(get_component(Branch, sys, "Bus 7-Bus 8-i_1"), 0.072)
+
+    # Loads from raw file are constant power, consistent with Sauer & Pai (p169)
+
+    ############### Data Dynamic devices ########################
+
+    # --- Machine models ---
+    # All parameters are from Sauer & Pai (2007) Table 7.3 M/C columns 1,2,3
+    function machine_sauerpai(i)
+        R = [0.0, 0.0, 0.0] # <-- not specified in Table 7.3
+        Xd = [0.146, 0.8958, 1.3125]
+        Xq = [0.0969, 0.8645, 1.2578]
+        Xd_p = [0.0608, 0.1198, 0.1813]
+        Xq_p = [0.0969, 0.1969, 0.25]
+        Td0_p = [8.96, 6.0, 5.89]
+        Tq0_p = [0.31, 0.535, 0.6]
+        return PSY.OneDOneQMachine(;
+            R = R[i],
+            Xd = Xd[i],
+            Xq = Xq[i],
+            Xd_p = Xd_p[i],
+            Xq_p = Xq_p[i],
+            Td0_p = Td0_p[i],
+            Tq0_p = Tq0_p[i],
+        )
+    end
+
+    # --- Shaft models ---
+    # All parameters are from Sauer & Pai (2007)
+    function shaft_sauerpai(i)
+        D_M = [0.1, 0.2, 0.3] # D/M from bottom of p165
+        H = [23.64, 6.4, 3.01] # H from Table 7.3
+        D = (2 * D_M .* H) / get_frequency(sys)
+        return PSY.SingleMass(;
+            H = H[i],
+            D = D[i],
+        )
+    end
+
+    # --- AVR models ---
+    # All parameters are from Sauer & Pai (2007) Table 7.3 exciter columns 1,2,3
+    # All S&P exciters are IEEE-Type I (p165)
+    # NOTE: In S&P, terminal voltage seen by AVR is same as the bus voltage.
+    #  In AVRTypeI, it is a measurement if the bus voltage with a sampling rate. 
+    #  Thus, Tr is set to be very small to account for this difference.
+    avr_typei() = PSY.AVRTypeI(;
+        Ka = 20,
+        Ke = 1.0,
+        Kf = 0.063,
+        Ta = 0.2,
+        Te = 0.314,
+        Tf = 0.35,
+        Tr = 0.0001, # <-- not specified in Table 7.3
+        Va_lim = (-0.5, 0.5), # <-- not specified in Table 7.3 
+        Ae = 0.0039,
+        Be = 1.555,
+    )
+
+    function dyn_gen_sauerpai(generator)
+        i = get_number(get_bus(generator))
+        return PSY.DynamicGenerator(;
+            name = PSY.get_name(generator),
+            ω_ref = 1.0,
+            machine = machine_sauerpai(i),
+            shaft = shaft_sauerpai(i),
+            avr = avr_typei(),
+            prime_mover = tg_none(),
+            pss = pss_none(),
+        )
+    end
+
+    for g in get_components(Generator, sys)
+        case_gen = dyn_gen_sauerpai(g)
+        add_component!(sys, case_gen, g)
+    end
+
+    return sys
+end
+
 ##################################
 # Add Load tutorial systems here #
 ##################################