PyPSA · fneum · Nov 17, 2025 · Sep 23, 2025 · Sep 23, 2025 · Sep 23, 2025
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -16,6 +16,8 @@ Upcoming Release
 ..   The features listed below are not released yet, but will be part of the next release! 
 ..   To use the features already you have to use the ``master`` branch.
 
+* Align cost units for NREL battery data with PyPSA modeling, fetching investment cost and FOM for both `battery storage` and `battery inverter` instead of a single value for `battery storage`, which was instead representative of the full plant (battery storage + battery inverter).
+
 * Add excess heat output rates for Fischer-Tropsch and Haber-Bosch processes.
 
 * Updated indexing of DEA Excel data for PTES and revised capital cost and FOM assumptions for 2045 and 2050.

diff --git a/inputs/US/manual_input_usa.csv b/inputs/US/manual_input_usa.csv
diff --git a/outputs/US/costs_2020.csv b/outputs/US/costs_2020.csv
diff --git a/outputs/US/costs_2025.csv b/outputs/US/costs_2025.csv
diff --git a/outputs/US/costs_2030.csv b/outputs/US/costs_2030.csv
diff --git a/outputs/US/costs_2035.csv b/outputs/US/costs_2035.csv
diff --git a/outputs/US/costs_2040.csv b/outputs/US/costs_2040.csv
diff --git a/outputs/US/costs_2045.csv b/outputs/US/costs_2045.csv
diff --git a/outputs/US/costs_2050.csv b/outputs/US/costs_2050.csv
diff --git a/scripts/compile_cost_assumptions_usa.py b/scripts/compile_cost_assumptions_usa.py
@@ -69,7 +69,6 @@ def get_conversion_dictionary(flag: str) -> dict:
             "Offshore Wind - Class 3": "offwind",
             "Utility PV - Class 5": "solar-utility",
             "Commercial PV - Class 1": "solar-rooftop",
-            "Utility-Scale Battery Storage - 6Hr": "battery storage",
             "Biopower": "biomass",
             "Biopower - Dedicated": "biomass",
             "CSP - Class 2": "csp-tower",

diff --git a/test/test_compile_cost_assumptions_usa.py b/test/test_compile_cost_assumptions_usa.py
@@ -381,13 +381,13 @@ def test_duplicate_fuel_cost(config):
 @pytest.mark.parametrize(
     "year, expected",
     [
-        (2020, (96, 9)),
-        (2025, (96, 9)),
-        (2030, (96, 9)),
-        (2035, (96, 9)),
-        (2040, (96, 9)),
-        (2045, (96, 9)),
-        (2050, (96, 9)),
+        (2020, (122, 9)),
+        (2025, (122, 9)),
+        (2030, (122, 9)),
+        (2035, (122, 9)),
+        (2040, (122, 9)),
+        (2045, (122, 9)),
+        (2050, (122, 9)),
     ],
 )
 def test_pre_process_manual_input_usa(config, year, expected):