BertoGBG · BertoGBG · Jan 27, 2026 · Mar 13, 2026 · Mar 13, 2026 · Mar 13, 2026
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/checkout@v6
 
     - name: Setup micromamba
-      uses: mamba-org/setup-micromamba@v2
+      uses: mamba-org/setup-micromamba@v3
       with:
         micromamba-version: latest
         environment-file: environment.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.14.10
+  rev: v0.15.9
   hooks:
     # Run the linter.
   - id: ruff
@@ -27,7 +27,7 @@ repos:
 
   # Find common spelling mistakes in comments and docstrings
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.4.1
+  rev: v2.4.2
   hooks:
   - id: codespell
     args: ['--ignore-regex="(\b[A-Z]+\b)"', '--ignore-words-list=fom,appartment,bage,ore,setis,tabacco,berfore,vor,pris,WEGE,Wege,Eletricity'] # Ignore capital case words, e.g. country codes
@@ -36,14 +36,14 @@ repos:
 
   # YAML formatting
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.15.0
+  rev: v2.16.0
   hooks:
   - id: pretty-format-yaml
     exclude: pinned\.yaml$
     args: [--autofix, --indent, "2", --preserve-quotes]
 
   # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.11.2
+  rev: v1.0.0
   hooks:
   - id: snakefmt
diff --git a/Snakefile b/Snakefile
@@ -30,13 +30,13 @@ rule compile_cost_assumptions:
         manual_input="inputs/manual_input.csv",
     output:
         expand("outputs/costs_{year}.csv", year=config["years"]),
+    log:
+        pathlib.Path("logs", "compile_cost_assumptions.log"),
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
-    log:
-        pathlib.Path("logs", "compile_cost_assumptions.log"),
     script:
         "scripts/compile_cost_assumptions.py"
 
@@ -54,13 +54,13 @@ rule compile_cost_assumptions_usa:
         nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
     output:
         expand("outputs/US/costs_{year}.csv", year=config["years"]),
+    log:
+        pathlib.Path("logs", "compile_cost_assumptions_usa.log"),
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
-    log:
-        pathlib.Path("logs", "compile_cost_assumptions_usa.log"),
     script:
         "scripts/compile_cost_assumptions_usa.py"
 
@@ -82,20 +82,20 @@ rule convert_EWG:
         EWG="docu/EWG_LUT_100RE_All_Sectors_Global_Report_2019.pdf",
     output:
         costs="inputs/EWG_costs.csv",
+    conda:
+        "environment.yaml"
     threads: 1
     resources:
         mem=500,
-    conda:
-        "environment.yaml"
     script:
         "scripts/convert_pdf_EWG_to_dataframe.py"
 
 
 rule all:
+    default_target: True
     input:
         rules.compile_cost_assumptions.output,
         rules.compile_cost_assumptions_usa.output,
-    default_target: True
 
 
 rule purge:

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -10,15 +10,17 @@ Release Notes
 
 Upcoming Release
 ================
+* Added Afforestation costs as Carbon Dioxide Removal technology (https://github.com/PyPSA/technology-data/pull/254)
 
 .. .. warning:: 
 
 ..   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.
 
+* Add missing discount rate for OCGT in US-specific data. (https://github.com/PyPSA/technology-data/pull/269)
+
 `v0.14.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.14.0>`__ (13th February 2026)
 ================================================================================================
-
 * Changed currency year from 2020 to 2025 for all cost assumptions using updated Eurostat inflation rates. (https://github.com/PyPSA/technology-data/pull/263)
 
 * Updated electricity transmission and offshore wind connection costs based on latest DEA data (https://ens.dk/en/analyses-and-statistics/technology-data-transport-energy, July 2025).

diff --git a/inputs/US/discount_rates_usa.csv b/inputs/US/discount_rates_usa.csv
@@ -833,3 +833,45 @@ solar-utility,discount rate,2050,0.0507126462365808,per unit,2022,Market,Conserv
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
 solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
+OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
diff --git a/inputs/manual_input.csv b/inputs/manual_input.csv
@@ -725,8 +725,11 @@ H2 production biomass gasification CC,VOM,2020,0.46,EUR/MWh_H2,2010,"JRC, 01_JRC
 grey methanol synthesis,efficiency,2030,0.569,MWh_MeOH/MWh_gas,2020,"From https://www.sciencedirect.com/science/article/pii/S0016236119311767, table 2, Methanol Synthesis with integrated autothermal reforming. Efficiency is the exergetic efficiency ",
 grey methanol synthesis,carbondioxide-output,2030,0.0567742,t_CO2/MWh_gas,2020,"Calculated from the carbon content of gas (0.198 t_CO2/MWh) compared to the carbon content of MeOH (0.2482 t_CO2/MWh)",
 grey methanol synthesis,investment,2030,1001188,EUR/MW_MeOH,2020,"Calculated from https://www.irena.org/-/media/Files/IRENA/Agency/Publication/2021/Jan/IRENA_Innovation_Renewable_Methanol_2021.pdf) Table 25 with an exchange rate of 0.8775 EUR/USD and energy content of 5.528 MWh_MeOH/t_MeOH",
+Afforestation,lifetime,2025,30,years,-,"https://onlinelibrary.wiley.com/doi/full/10.1111/rec.13515"," general assumption on duration of fast-growth phase for new forests"
+Afforestation,FOM,2025,5,%/year,2020,"https://onlinelibrary.wiley.com/doi/epdf/10.1111/rec.13515","recalculated from the maintenance cost for the assumption on the investment"
+Afforestation,investment,2025,7749,EUR/ha,2020,"https://onlinelibrary.wiley.com/doi/epdf/10.1111/rec.13515","assumed to be 1/3 of the upper bound for the range of active restoration costs, NOTE: the investment cost is per hectare of new forests"
 oil,fuel,2020,21.3,EUR/MWh,2020,"World Bank (2025) Commodity Markets, https://www.worldbank.org/en/research/commodity-markets","average monthly prices, 1 MWh = 0.564 BBL, 0.85 USD/EUR, +5% markup for heavy oil"
 oil,fuel,2025,34.2,EUR/MWh,2025,"World Bank (2025) Commodity Markets, https://www.worldbank.org/en/research/commodity-markets","average monthly prices, 1 MWh = 0.564 BBL, 0.836 USD/EUR, +5% markup for heavy oil"
 oil,fuel,2030,34.7,EUR/MWh,2021,"ENTSO-E & ENTSOG TYNDP 2024 Scenarios Inputs Commodity Prices, https://2024-data.entsos-tyndp-scenarios.eu/files/scenarios-inputs/Prices.zip, accessed: 2026-02-03.","Based on IEA 2022 (APS) data, 3.6 GJ/MWh, heavy oil, modelled from crude oil price (+5%)"
 oil,fuel,2040,33.6,EUR/MWh,2021,"ENTSO-E & ENTSOG TYNDP 2024 Scenarios Inputs Commodity Prices, https://2024-data.entsos-tyndp-scenarios.eu/files/scenarios-inputs/Prices.zip, accessed: 2026-02-03.","Based on IEA 2022 (APS) data, 3.6 GJ/MWh, heavy oil, modelled from crude oil price (+5%)"
-oil,fuel,2050,32.5,EUR/MWh,2021,"ENTSO-E & ENTSOG TYNDP 2024 Scenarios Inputs Commodity Prices, https://2024-data.entsos-tyndp-scenarios.eu/files/scenarios-inputs/Prices.zip, accessed: 2026-02-03.","Based on IEA 2022 (APS) data, 3.6 GJ/MWh, heavy oil, modelled from crude oil price (+5%)"
+oil,fuel,2050,32.5,EUR/MWh,2021,"ENTSO-E & ENTSOG TYNDP 2024 Scenarios Inputs Commodity Prices, https://2024-data.entsos-tyndp-scenarios.eu/files/scenarios-inputs/Prices.zip, accessed: 2026-02-03.","Based on IEA 2022 (APS) data, 3.6 GJ/MWh, heavy oil, modelled from crude oil price (+5%)"
diff --git a/outputs/US/costs_2020.csv b/outputs/US/costs_2020.csv
@@ -1,4 +1,7 @@
 technology,parameter,value,unit,source,further description,currency_year,financial_case,scenario
+Afforestation,FOM,5.0,%/year,https://onlinelibrary.wiley.com/doi/epdf/10.1111/rec.13515,recalculated from the maintenance cost for the assumption on the investment,2020.0,,
+Afforestation,investment,9743.0858,EUR/ha,https://onlinelibrary.wiley.com/doi/epdf/10.1111/rec.13515,"assumed to be 1/3 of the upper bound for the range of active restoration costs, NOTE: the investment cost is per hectare of new forests",2020.0,,
+Afforestation,lifetime,30.0,years,https://onlinelibrary.wiley.com/doi/full/10.1111/rec.13515, general assumption on duration of fast-growth phase for new forests,,,
 Alkaline electrolyzer large size,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
 Alkaline electrolyzer large size,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
 Alkaline electrolyzer large size,FOM,4.0,%/year,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
@@ -2023,6 +2026,12 @@ Nuclear - Small,investment,9842.3099,USD/kW,NREL/ATB-https://data.openei.org/s3_
 Nuclear - Small,investment,9842.3099,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Moderate
 OCGT,FOM,1.7772,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Fixed O&M,2015.0,,
 OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Variable O&M,2015.0,,
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Advanced
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Conservative
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Moderate
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Advanced
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Conservative
+OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Moderate
 OCGT,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas:  Electricity efficiency, annual average",2015.0,,
 OCGT,investment,606.4012,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Specific investment,2015.0,,
 OCGT,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas:  Technical lifetime,2015.0,,