From 86e3fc87df1492975bbb8d0d243e69ac71518b5a Mon Sep 17 00:00:00 2001
From: "Streitmatter, Lauren" <Lauren.Streitmatter@nrel.gov>
Date: Wed, 10 Jan 2024 11:25:26 -0700
Subject: [PATCH 1/2] device_hvdc and network_const updates

---
 Project.toml                      |  1 +
 test/test_device_hvdc.jl          |  2 +-
 test/test_network_constructors.jl | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Project.toml b/Project.toml
index b5f04a5b6e..3f2a71e17f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -11,6 +11,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
+HydroPowerSimulations = "fc1677e0-6ad7-4515-bf3a-bd6bf20a0b1b"
 InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
diff --git a/test/test_device_hvdc.jl b/test/test_device_hvdc.jl
index 42ce383876..2db47195ba 100644
--- a/test/test_device_hvdc.jl
+++ b/test/test_device_hvdc.jl
@@ -15,7 +15,7 @@
     set_device_model!(template_uc, DeviceModel(TModelHVDCLine, LossLessLine))
     model = DecisionModel(template_uc, sys_5; name = "UC", optimizer = HiGHS_optimizer)
     @test build!(model; output_dir = mktempdir()) == PSI.BuildStatus.BUILT
-    moi_tests(model, 1656, 0, 1536, 816, 888, true)
+    moi_tests(model, 1656, 288, 1248, 528, 888, true)
     @test solve!(model) == RunStatus.SUCCESSFUL
 
     template_uc = ProblemTemplate(NetworkModel(
diff --git a/test/test_network_constructors.jl b/test/test_network_constructors.jl
index 4de655700b..6e4860a9d3 100644
--- a/test/test_network_constructors.jl
+++ b/test/test_network_constructors.jl
@@ -265,9 +265,9 @@ end
         PSI.ConstraintKey(PSI.NodalBalanceActiveConstraint, PSY.ACBus),
     ]
     test_results = IdDict{System, Vector{Int}}(
-        c_sys5 => [384, 0, 408, 408, 288],
-        c_sys14 => [936, 0, 1080, 1080, 840],
-        c_sys14_dc => [984, 0, 1080, 984, 840],
+        c_sys5 => [384, 144, 264, 264, 288],
+        c_sys14 => [936, 480, 600, 600, 840],
+        c_sys14_dc => [984, 432, 648, 552, 840],
     )
     test_obj_values = IdDict{System, Float64}(
         c_sys5 => 342000.0,
@@ -313,9 +313,9 @@ end
         PSI.ConstraintKey(PSI.NodalBalanceReactiveConstraint, PSY.ACBus),
     ]
     test_results = IdDict{System, Vector{Int}}(
-        c_sys5 => [1056, 0, 384, 384, 264],
-        c_sys14 => [2832, 0, 720, 720, 696],
-        c_sys14_dc => [2832, 0, 768, 672, 744],
+        c_sys5 => [1056, 144, 240, 240, 264],
+        c_sys14 => [2832, 480, 240, 240, 696],
+        c_sys14_dc => [2832, 432, 336, 240, 744],
     )
     test_obj_values = IdDict{System, Float64}(
         c_sys5 => 340000.0,
@@ -409,9 +409,9 @@ end
         c_sys14_dc => [2832, 0, 336, 240, 744],
     )
     ACT_test_results = Dict{System, Vector{Int}}(
-        c_sys5 => [1344, 0, 384, 384, 840],
-        c_sys14 => [3792, 0, 720, 720, 2616],
-        c_sys14_dc => [3696, 0, 768, 672, 2472],
+        c_sys5 => [1344, 144, 240, 240, 840],
+        c_sys14 => [3792, 480, 240, 240, 2616],
+        c_sys14_dc => [3696, 432, 336, 240, 2472],
     )
     test_results = Dict(zip(networks, [ACR_test_results, ACT_test_results]))
     for network in networks, sys in systems
@@ -448,14 +448,14 @@ end
         c_sys14_dc => 142000.0,
     )
     DCPLL_test_results = Dict{System, Vector{Int}}(
-        c_sys5 => [528, 0, 408, 408, 288],
-        c_sys14 => [1416, 0, 1080, 1080, 840],
-        c_sys14_dc => [1416, 0, 1080, 984, 840],
+        c_sys5 => [528, 144, 264, 264, 288],
+        c_sys14 => [1416, 480, 600, 600, 840],
+        c_sys14_dc => [1416, 432, 648, 552, 840],
     )
     LPACC_test_results = Dict{System, Vector{Int}}(
-        c_sys5 => [1200, 0, 384, 384, 840],
-        c_sys14 => [3312, 0, 720, 720, 2616],
-        c_sys14_dc => [3264, 0, 768, 672, 2472],
+        c_sys5 => [1200, 144, 240, 240, 840],
+        c_sys14 => [3312, 480, 240, 240, 2616],
+        c_sys14_dc => [3264, 432, 336, 240, 2472],
     )
     test_results = Dict(zip(networks, [DCPLL_test_results, LPACC_test_results]))
     for network in networks, (ix, sys) in enumerate(systems)

From 78336773bfa58838684342332b0f237ada273c21 Mon Sep 17 00:00:00 2001
From: lpstreitmatter <lpstreitmatter@gmail.com>
Date: Wed, 10 Jan 2024 11:58:28 -0700
Subject: [PATCH 2/2] removing HydroPowerSimulations from Project.toml

---
 Project.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 3f2a71e17f..b5f04a5b6e 100644
--- a/Project.toml
+++ b/Project.toml
@@ -11,7 +11,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
-HydroPowerSimulations = "fc1677e0-6ad7-4515-bf3a-bd6bf20a0b1b"
 InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"