Add final supply curve output columns

NREL · Jun 14, 2024 · 1199dc6 · 1199dc6
1 parent 1d1daab
commit 1199dc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/reV/supply_curve/supply_curve.py b/reV/supply_curve/supply_curve.py
@@ -36,13 +36,15 @@
     SupplyCurveField.TOTAL_LCOE: 12,
 }
 _REQUIRED_OUTPUT_COLS = {SupplyCurveField.DIST_EXPORT_KM: 4,
+                         SupplyCurveField.REINFORCEMENT_DIST_KM: 5,
+                         SupplyCurveField.TIE_LINE_COST_PER_MW: 6,
+                         SupplyCurveField.CONNECTION_COST_PER_MW: 7,
                          SupplyCurveField.EXPORT_COST_PER_MW: 8,
+                         SupplyCurveField.REINFORCEMENT_COST_PER_MW: 9,
                          SupplyCurveField.POI_LAT: 13,
                          SupplyCurveField.POI_LON: 14,
                          SupplyCurveField.REINFORCEMENT_POI_LAT: 15,
-                         SupplyCurveField.REINFORCEMENT_POI_LON: 16,
-                         SupplyCurveField.REINFORCEMENT_COST_PER_MW: 9,
-                         SupplyCurveField.REINFORCEMENT_DIST_KM: 5}
+                         SupplyCurveField.REINFORCEMENT_POI_LON: 16}
 DEFAULT_COLUMNS = tuple(str(field)
                         for field in chain(_REQUIRED_COMPUTE_AND_OUTPUT_COLS,
                                            _REQUIRED_OUTPUT_COLS))

diff --git a/reV/utilities/__init__.py b/reV/utilities/__init__.py
@@ -183,6 +183,8 @@ class SupplyCurveField(FieldEnum):
     TRANS_CAPACITY = "trans_capacity_m"
     DIST_SPUR_KM = "dist_km_m" # "dist_spur_km"
     DIST_EXPORT_KM = "dist_export_km_m"
+    TIE_LINE_COST_PER_MW = "tie_line_cost_per_mw_m"
+    CONNECTION_COST_PER_MW = "connection_cost_per_mw_m"
     EXPORT_COST_PER_MW = "cost_export_usd_per_mw_m"
     LCOT = "lcot_m"
     TOTAL_TRANS_CAP_COST_PER_MW = "trans_cap_cost_per_mw_m"
@@ -231,6 +233,9 @@ class _LegacySCAliases(Enum):
     TRANS_CAPACITY = "trans_capacity", "avail_cap"
     DIST_SPUR_KM = "dist_km"
     DIST_EXPORT_KM = "dist_export_km"
+    TIE_LINE_COST_PER_MW = "tie_line_cost_per_mw"
+    CONNECTION_COST_PER_MW = "connection_cost_per_mw"
+    EXPORT_COST_PER_MW = "cost_export_usd_per_mw"
     LCOT = "lcot"
     TOTAL_TRANS_CAP_COST_PER_MW = "trans_cap_cost_per_mw"
     N_PARALLEL_TRANS = "n_parallel_trans"
@@ -240,7 +245,6 @@ class _LegacySCAliases(Enum):
     REINFORCEMENT_POI_LON = "reinforcement_poi_lon"
     REINFORCEMENT_COST_PER_MW = "reinforcement_cost_per_mw"
     REINFORCEMENT_DIST_KM = "reinforcement_dist_km"
-    EXPORT_COST_PER_MW = "cost_export_usd_per_mw"
 
 
 class ModuleName(str, Enum):