Merge pull request #50 from NREL-Sienna/gks/variable_cost_refactor

Variable Cost Refactor Part 1: Function Data
NREL-Sienna · Feb 22, 2024 · 7262982 · 7262982
2 parents 3b2f71f + 321a11a
commit 7262982
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # PowerSystemsTestData
 
-This repository contains several data files in modeling packages in [SIIP](https://github.com/NREL-SIIP/).
+This repository contains several data files in modeling packages in [Sienna](https://github.com/NREL-Sienna).
 
 ## File directory
 
@@ -14,5 +14,5 @@ This repository contains several data files in modeling packages in [SIIP](https
 - psse_dyr: Data for PSSe dynamic models
 - psse_dyr: Data for PSSe power flow datasets
 - psy_data: Data directly typed in PowerSystems types.
-- RTS_GMLC: Slighlty modified data from the original [RTS-GMLC dataset](https://github.com/gridmod/rts-gmlc)
+- RTS_GMLC: Slightly modified data from the original [RTS-GMLC dataset](https://github.com/gridmod/rts-gmlc)
 - SyntheticUSA: TAMU PowerFlow Dataset of the whole continental United States (no timeseries)
diff --git a/psid_tests/data_examples/omib_sys.json b/psid_tests/data_examples/omib_sys.json
diff --git a/psid_tests/data_examples/omib_sys_metadata.json b/psid_tests/data_examples/omib_sys_metadata.json
@@ -4,6 +4,10 @@
     "frequency": 60,
     "time_series_resolution_milliseconds": 0,
     "component_counts": [
+        {
+            "type": "ACBus",
+            "count": 2
+        },
         {
             "type": "Arc",
             "count": 1
@@ -12,10 +16,6 @@
             "type": "Area",
             "count": 1
         },
-        {
-            "type": "Bus",
-            "count": 2
-        },
         {
             "type": "DynamicGenerator",
             "count": 1

diff --git a/psid_tests/data_examples/omib_sys_validation_descriptors.json b/psid_tests/data_examples/omib_sys_validation_descriptors.json
diff --git a/psid_tests/data_examples/threebus_sys.json b/psid_tests/data_examples/threebus_sys.json
diff --git a/psid_tests/data_examples/threebus_sys_metadata.json b/psid_tests/data_examples/threebus_sys_metadata.json
@@ -4,6 +4,10 @@
     "frequency": 60,
     "time_series_resolution_milliseconds": 0,
     "component_counts": [
+        {
+            "type": "ACBus",
+            "count": 3
+        },
         {
             "type": "Arc",
             "count": 3
@@ -12,10 +16,6 @@
             "type": "Area",
             "count": 1
         },
-        {
-            "type": "Bus",
-            "count": 3
-        },
         {
             "type": "DynamicGenerator",
             "count": 1

diff --git a/psid_tests/data_examples/threebus_sys_validation_descriptors.json b/psid_tests/data_examples/threebus_sys_validation_descriptors.json
diff --git a/psid_tests/data_tests/9BusSystem.json b/psid_tests/data_tests/9BusSystem.json
diff --git a/psid_tests/data_tests/9BusSystem_metadata.json b/psid_tests/data_tests/9BusSystem_metadata.json
@@ -0,0 +1,46 @@
+{
+    "name": "",
+    "description": "",
+    "frequency": 60,
+    "time_series_resolution_milliseconds": 0,
+    "component_counts": [
+        {
+            "type": "ACBus",
+            "count": 9
+        },
+        {
+            "type": "Arc",
+            "count": 9
+        },
+        {
+            "type": "Area",
+            "count": 1
+        },
+        {
+            "type": "DynamicGenerator",
+            "count": 3
+        },
+        {
+            "type": "Line",
+            "count": 6
+        },
+        {
+            "type": "LoadZone",
+            "count": 1
+        },
+        {
+            "type": "PowerLoad",
+            "count": 3
+        },
+        {
+            "type": "ThermalStandard",
+            "count": 3
+        },
+        {
+            "type": "Transformer2W",
+            "count": 3
+        }
+    ],
+    "time_series_counts": [
+    ]
+}
diff --git a/psid_tests/data_tests/9BusSystem_validation_descriptors.json b/psid_tests/data_tests/9BusSystem_validation_descriptors.json
diff --git a/psid_tests/data_tests/WECC_240_dynamic.json b/psid_tests/data_tests/WECC_240_dynamic.json
diff --git a/psid_tests/data_tests/WECC_240_dynamic_metadata.json b/psid_tests/data_tests/WECC_240_dynamic_metadata.json
@@ -4,6 +4,10 @@
     "frequency": 60,
     "time_series_resolution_milliseconds": 0,
     "component_counts": [
+        {
+            "type": "ACBus",
+            "count": 243
+        },
         {
             "type": "Arc",
             "count": 351
@@ -12,10 +16,6 @@
             "type": "Area",
             "count": 4
         },
-        {
-            "type": "Bus",
-            "count": 243
-        },
         {
             "type": "DynamicGenerator",
             "count": 6

diff --git a/psid_tests/data_tests/WECC_240_dynamic_validation_descriptors.json b/psid_tests/data_tests/WECC_240_dynamic_validation_descriptors.json
diff --git a/psy_data/data_10bus_ac_dc_pu.jl b/psy_data/data_10bus_ac_dc_pu.jl
@@ -226,7 +226,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -0.30, max = 0.30),
         ramp_limits = nothing,
         time_limits = nothing,
-        operation_cost = ThreePartCost((0.0, 14.0), 0.0, 4.0, 2.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 14.0, 0.0), 0.0, 4.0, 2.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -243,7 +243,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -1.275, max = 1.275),
         ramp_limits = (up = 0.02 * 2.2125, down = 0.02 * 2.2125),
         time_limits = (up = 2.0, down = 1.0),
-        operation_cost = ThreePartCost((0.0, 15.0), 0.0, 1.5, 0.75),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 15.0, 0.0), 0.0, 1.5, 0.75),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -260,7 +260,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -3.90, max = 3.90),
         ramp_limits = (up = 0.012 * 5.2, down = 0.012 * 5.2),
         time_limits = (up = 3.0, down = 2.0),
-        operation_cost = ThreePartCost((0.0, 30.0), 0.0, 3.0, 1.5),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 30.0, 0.0), 0.0, 3.0, 1.5),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -277,7 +277,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -1.5, max = 1.5),
         ramp_limits = (up = 0.015 * 2.5, down = 0.015 * 2.5),
         time_limits = (up = 2.0, down = 1.0),
-        operation_cost = ThreePartCost((0.0, 40.0), 0.0, 4.0, 2.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 40.0, 0.0), 0.0, 4.0, 2.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -294,7 +294,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -4.50, max = 4.50),
         ramp_limits = (up = 0.015 * 7.5, down = 0.015 * 7.5),
         time_limits = (up = 5.0, down = 3.0),
-        operation_cost = ThreePartCost((0.0, 10.0), 0.0, 1.5, 0.75),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 10.0, 0.0), 0.0, 1.5, 0.75),
         base_power = 100.0,
     ),
     ThermalStandard(;
@@ -311,7 +311,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -0.30, max = 0.30),
         ramp_limits = nothing,
         time_limits = nothing,
-        operation_cost = ThreePartCost((0.0, 14.0), 0.0, 4.0, 2.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 14.0, 0.0), 0.0, 4.0, 2.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -328,7 +328,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -1.275, max = 1.275),
         ramp_limits = (up = 0.02 * 2.2125, down = 0.02 * 2.2125),
         time_limits = (up = 2.0, down = 1.0),
-        operation_cost = ThreePartCost((0.0, 15.0), 0.0, 1.5, 0.75),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 15.0, 0.0), 0.0, 1.5, 0.75),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -345,7 +345,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -3.90, max = 3.90),
         ramp_limits = (up = 0.012 * 5.2, down = 0.012 * 5.2),
         time_limits = (up = 3.0, down = 2.0),
-        operation_cost = ThreePartCost((0.0, 30.0), 0.0, 3.0, 1.5),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 30.0, 0.0), 0.0, 3.0, 1.5),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -362,7 +362,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -1.5, max = 1.5),
         ramp_limits = (up = 0.015 * 2.5, down = 0.015 * 2.5),
         time_limits = (up = 2.0, down = 1.0),
-        operation_cost = ThreePartCost((0.0, 40.0), 0.0, 4.0, 2.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 40.0, 0.0), 0.0, 4.0, 2.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -379,7 +379,7 @@ thermal_generators10(nodes10) = [
         reactive_power_limits = (min = -4.50, max = 4.50),
         ramp_limits = (up = 0.015 * 7.5, down = 0.015 * 7.5),
         time_limits = (up = 5.0, down = 3.0),
-        operation_cost = ThreePartCost((0.0, 10.0), 0.0, 1.5, 0.75),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0, 10.0, 0.0), 0.0, 1.5, 0.75),
         base_power = 100.0,
     ),
 ];

diff --git a/psy_data/data_14bus_pu.jl b/psy_data/data_14bus_pu.jl
@@ -654,7 +654,7 @@ thermal_generators14(nodes14) = [
         reactive_power_limits = (min = 0.0, max = 0.1),
         time_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost((0.0430292599, 20.0), 0.0, 0.0, 0.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.0430292599, 20.0, 0.0), 0.0, 0.0, 0.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -671,7 +671,7 @@ thermal_generators14(nodes14) = [
         reactive_power_limits = (min = -0.4, max = 0.5),
         time_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost((0.25, 20.0), 0.0, 0.0, 0.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.25, 20.0, 0.0), 0.0, 0.0, 0.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -688,7 +688,7 @@ thermal_generators14(nodes14) = [
         reactive_power_limits = (min = 0.0, max = 0.4),
         time_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost((0.01, 40.0), 0.0, 0.0, 0.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.01, 40.0, 0.0), 0.0, 0.0, 0.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -705,7 +705,7 @@ thermal_generators14(nodes14) = [
         reactive_power_limits = (min = -0.06, max = 0.24),
         time_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost((0.01, 40.0), 0.0, 0.0, 0.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.01, 40.0, 0.0), 0.0, 0.0, 0.0),
         base_power = 100.0,
     ),
     ThermalStandard(
@@ -722,7 +722,7 @@ thermal_generators14(nodes14) = [
         reactive_power_limits = (min = -0.06, max = 0.24),
         time_limits = nothing,
         ramp_limits = nothing,
-        operation_cost = ThreePartCost((0.01, 40.0), 0.0, 0.0, 0.0),
+        operation_cost = ThreePartCost(QuadraticFunctionData(0.01, 40.0, 0.0), 0.0, 0.0, 0.0),
         base_power = 100.0,
     ),
 ]