Merge pull request #60 from NREL-Sienna/jd/descriptor_fix

Jd/descriptor fix
NREL-Sienna · Jun 26, 2023 · 6acefc6 · 6acefc6
2 parents 1b2213f + 14c49ef
commit 6acefc6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Artifacts.toml b/Artifacts.toml
@@ -1,9 +1,9 @@
 [CaseData]
-git-tree-sha1 = "2fc84c9858b0cada3d37ffe198a4dd11ed54601d"
+git-tree-sha1 = "3d522279f3d1b233566dda9ad1f332ed9bb545a3"
 
     [[CaseData.download]]
-    url = "https://github.com/NREL-Sienna/PowerSystemsTestData/archive/refs/tags/1.0.2.tar.gz"
-    sha256 = "e58a881dc784be1c7edf6ebd57b7276232aab9b8e46bfb9f10365f902c8ede3d"
+    url = "https://github.com/NREL-Sienna/PowerSystemsTestData/archive/refs/tags/1.0.3.tar.gz"
+    sha256 = "1e55e2a5571bf5d144711ffb6def87c6fcfbc8056b3bb4bdce119b30151b28b1"
 
 [rts]
 git-tree-sha1 = "5098f357bad765bfefcff58f080818863ca776bd"

diff --git a/src/definitions.jl b/src/definitions.jl
@@ -1,5 +1,5 @@
 const PACKAGE_DIR = joinpath(dirname(dirname(pathof(PowerSystemCaseBuilder))))
-const DATA_DIR = "/Users/jlara/cache/PowerSystemsTestData" #joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-1.0.2")
+const DATA_DIR = joinpath(LazyArtifacts.artifact"CaseData", "PowerSystemsTestData-1.0.3")
 const RTS_DIR = joinpath(LazyArtifacts.artifact"rts", "RTS-GMLC-0.2.2")
 
 const SYSTEM_DESCRIPTORS_FILE = joinpath(PACKAGE_DIR, "src", "system_descriptor.jl")

diff --git a/src/library/psid_library.jl b/src/library/psid_library.jl
@@ -47,8 +47,8 @@ end
 
 function build_psid_14bus_multigen(; kwargs...)
     sys_kwargs = filter_kwargs(; kwargs...)
-    @show data_dir = get_raw_data(; kwargs...)
-    @show raw_file = joinpath(data_dir, "14bus.raw")
+    data_dir = get_raw_data(; kwargs...)
+    raw_file = joinpath(data_dir, "14bus.raw")
     dyr_file = joinpath(data_dir, "dyn_data.dyr")
 
     sys = System(raw_file, dyr_file; sys_kwargs...)

diff --git a/src/system_descriptor_data.jl b/src/system_descriptor_data.jl
@@ -1136,10 +1136,10 @@ const SYSTEM_CATALOG = [
         build_function = build_psid_14bus_multigen,
     ),
     SystemDescriptor(;
-    name = "3 Bus Inverter Base",
-    description = "3 Bus Base System for tutorials",
-    category = PSIDSystems,
-    raw_data = joinpath(DATA_DIR, "psid_tests", "data_examples"),
-    build_function = build_3bus_inverter,
-),
+        name = "3 Bus Inverter Base",
+        description = "3 Bus Base System for tutorials",
+        category = PSIDSystems,
+        raw_data = joinpath(DATA_DIR, "psid_tests", "data_examples"),
+        build_function = build_3bus_inverter,
+    ),
 ]