Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c630547
updated biochar logic as CDR technology
BertoGBG Jan 27, 2026
be1c642
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 27, 2026
4e7c22d
fix test: update expected row count for biochar pyrolysis (7 → 9 rows)
BertoGBG Mar 21, 2026
a4710b8
new paramaters name
BertoGBG Mar 21, 2026
5bd0c95
no output
BertoGBG Mar 24, 2026
89b8279
small
BertoGBG Mar 24, 2026
64c3e6a
[pre-commit.ci] pre-commit autoupdate (#268)
pre-commit-ci[bot] Apr 7, 2026
ae65c74
added outputs
BertoGBG Apr 9, 2026
2d742de
pre-merge on updated technolgy-data repo
BertoGBG Apr 27, 2026
f343014
Bump mamba-org/setup-micromamba (#267)
dependabot[bot] May 4, 2026
06924be
Add OCGT discount rates - US data (#269)
danielelerede-oet May 5, 2026
374ce53
update name, source and description of "electricity grid connection" …
lindnemi May 12, 2026
634cdc1
Correct CO2 Management Data (#273)
toniseibold May 15, 2026
d558ee1
Adjust currency_year with inflation adjustment (#275)
euronion May 21, 2026
6fbd900
Add biomass boiler to add_carbon_capture function and update outputs.…
jonathan-peel May 22, 2026
8766695
prepare release v0.15.0
fneum Jun 9, 2026
8692669
Merge remote-tracking branch 'upstream/master' into biochar_pyrolysis…
BertoGBG Jun 15, 2026
d87c0c4
Add Enhanced Weathering (#256)
BertoGBG Jun 18, 2026
07e4357
code: Fix failing tests (#278)
euronion Jun 18, 2026
41cdf8a
Merge branch 'master' into biochar_pyrolysis_update_PR
euronion Jun 18, 2026
1eeb928
fix currency year to 2025, and added comment for 70% carbon sequestra…
BertoGBG Jul 13, 2026
fefff24
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
22 changes: 11 additions & 11 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand All @@ -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:
Expand Down
24 changes: 23 additions & 1 deletion docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

..
SPDX-FileCopyrightText: Contributors to technology-data <https://github.com/pypsa/technology-data>

SPDX-License-Identifier: GPL-3.0-only

##########################################
Expand All @@ -16,6 +15,29 @@ 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.

* Updated Biochar pyrolysis: units updated with rebase on CO2 sequestered, biomass properties aligned with other biomass technolgies, 0.7 coefficient applied to calculate final CO2 sequestration beyond 100 years. (https://github.com/PyPSA/technology-data/pull/258)

* Adding `Enhanced Weathering` (or Rocks) as CDR technology. (https://github.com/PyPSA/technology-data/pull/256)

`v0.15.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.15.0>`__ (9th June 2026)
================================================================================================

**Breaking changes**

* Renamed ``electricity grid connection`` to ``distribution grid reinforcement`` and updated description for more clarity on the technology and consistency with the source.

**Changes**

* Added "Post-combustion carbon capture retrofit - 500 MW(th) biomass-fired boiler" as ``biomass boiler capture`` (https://github.com/PyPSA/technology-data/pull/253).

* Added VOM for carbon capture retrofits: ``biomass CHP capture`` and ``cement capture`` (https://github.com/PyPSA/technology-data/pull/253).

* Added technology data for ``CO2 dense phase compression`` step for transport in large pipelines which is different from the current ``CO2 liquefaction`` technology parameters that is taken for ship transport (https://github.com/PyPSA/technology-data/pull/273).

* Added missing discount rate for OCGT in US-specific data. (https://github.com/PyPSA/technology-data/pull/269)

* The ``currency_year`` column will now reflect the inflation adjusted currency year instead of the original currency year of the input data. (https://github.com/PyPSA/technology-data/pull/275)

`v0.14.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.14.0>`__ (13th February 2026)
================================================================================================

Expand Down
42 changes: 42 additions & 0 deletions inputs/US/discount_rates_usa.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions inputs/costs_PyPSA.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@ central solar thermal,2030,lifetime,20,years,HP
electricity distribution grid,2030,investment,500,EUR/kW,TODO
electricity distribution grid,2030,lifetime,40,years,TODO
electricity distribution grid,2030,FOM,2,%/year,TODO
electricity grid connection,2030,investment,140,EUR/kW,DEA
electricity grid connection,2030,lifetime,40,years,TODO
electricity grid connection,2030,FOM,2,%/year,TODO
decentral oil boiler,2030,investment,156.0140915953699,EUR/kWth,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf) (+eigene Berechnung)
decentral oil boiler,2030,lifetime,20.0,years,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
decentral oil boiler,2030,FOM,2.0,%/year,Palzer thesis (https://energiesysteme-zukunft.de/fileadmin/user_upload/Publikationen/PDFs/ESYS_Materialien_Optimierungsmodell_REMod-D.pdf)
Expand Down
Loading