Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addition of unsustainable biomass potentials #1139

Merged
merged 33 commits into from
Aug 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
16301e5
add columns to potential df defined by difference to eurostat
cpschau May 13, 2024
c50fc9f
add network components
cpschau May 16, 2024
f6b2557
add unsustainable bioliquids
cpschau May 17, 2024
4a81993
replaced stores by generators, still infeasible
cpschau Jun 7, 2024
26e771b
remove municipal waste
cpschau Jul 8, 2024
3246d0a
remove separate treatment of waste from biomass potential calculation
cpschau Jul 8, 2024
8f422aa
phase out unsustainble biomass potentials
cpschau Jul 8, 2024
1b761d0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 8, 2024
0b34283
phase-out unsustainable bioliquids
cpschau Jul 9, 2024
2dfe089
remove waste_incineration from build_sector rule
cpschau Jul 9, 2024
275f66c
multiple potential calculation for different planning horizons
cpschau Jul 12, 2024
7fc6fdc
raised costs of unsustainable solid biomass
cpschau Jul 12, 2024
82a9234
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 12, 2024
6d82ada
stores instead of generators
cpschau Jul 12, 2024
517db86
change snakemake inputs
cpschau Jul 23, 2024
5b1603a
add phas-eout to config
cpschau Jul 24, 2024
49d30ce
add techcolor for unsustainable bioliquids
cpschau Jul 24, 2024
e048e3e
add config parameter to disable inclusion of unsustainable bioenergy …
cpschau Jul 25, 2024
62173b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 25, 2024
d5b0963
add biomass to params
cpschau Jul 26, 2024
7065903
Merge branch 'master' into unsus_biomass
cpschau Jul 26, 2024
13bb7ad
remove call of snakemake object in define_spatial
cpschau Jul 26, 2024
d4a890d
Quick resolve of review part 1 (config parameters, if-clause-reductio…
cpschau Aug 2, 2024
b900c01
Quick resolve of review part 2 (config table, helper function, fixed …
cpschau Aug 2, 2024
deaa6cc
Cast of planning_horizon parameter to int type after test run
cpschau Aug 2, 2024
49eac35
added JRC fuel costs for solid and liquid biofuels, BtL VOM
cpschau Aug 5, 2024
4fd1ec8
Merge branch 'master' into unsus_biomass
cpschau Aug 6, 2024
9b944d3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 6, 2024
07d456d
clean-up after master merge
cpschau Aug 6, 2024
01f0318
Merge branch 'master' into unsus_biomass
lisazeyen Aug 7, 2024
d64917f
adressed review (increase threads for build_eurostat, fixed e_max_pu …
cpschau Aug 7, 2024
81ded81
Merge branch 'master' into unsus_biomass
cpschau Aug 7, 2024
fe2975c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 7, 2024
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
Prev Previous commit
Next Next commit
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
pre-commit-ci[bot] committed Jul 25, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 62173b6c295f01424b0999b799cc05fd1f394405
2 changes: 1 addition & 1 deletion scripts/prepare_sector_network.py
Original file line number Diff line number Diff line change
@@ -2339,7 +2339,7 @@ def add_biomass(n, costs):
if snakemake.params.biomass.get(
"include_unsustainable"
) and investment_year < snakemake.params.biomass.get("unsustainable_phase_out"):

n.madd(
"Store",
spatial.gas.biogas,