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.

Sign up for GitHub

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

Jump to bottom

Addition of unsustainable biomass potentials #1139

Merged
merged 33 commits into from
Aug 7, 2024
Merged

Addition of unsustainable biomass potentials #1139

merged 33 commits into from
Aug 7, 2024

Commits on Jul 4, 2024

  1. add columns to potential df defined by difference to eurostat

    @cpschau
    cpschau committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    16301e5 View commit details
    Browse the repository at this point in the history

  2. add network components

    @cpschau
    cpschau committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    c50fc9f View commit details
    Browse the repository at this point in the history

  3. add unsustainable bioliquids

    @cpschau
    cpschau committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f6b2557 View commit details
    Browse the repository at this point in the history

  4. replaced stores by generators, still infeasible

    @cpschau
    cpschau committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    4a81993 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. remove municipal waste

    @cpschau
    cpschau committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    26e771b View commit details
    Browse the repository at this point in the history

  2. remove separate treatment of waste from biomass potential calculation

    @cpschau
    cpschau committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3246d0a View commit details
    Browse the repository at this point in the history

  3. phase out unsustainble biomass potentials

    @cpschau
    cpschau committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    8f422aa View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1b761d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. phase-out unsustainable bioliquids

    @cpschau
    cpschau committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    0b34283 View commit details
    Browse the repository at this point in the history

  2. remove waste_incineration from build_sector rule

    @cpschau
    cpschau committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    2dfe089 View commit details
    Browse the repository at this point in the history

  3. multiple potential calculation for different planning horizons

    @cpschau
    cpschau committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    275f66c View commit details
    Browse the repository at this point in the history

  4. raised costs of unsustainable solid biomass

    @cpschau
    cpschau committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    7fc6fdc View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    82a9234 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. stores instead of generators

    @cpschau
    cpschau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    6d82ada View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. change snakemake inputs

    @cpschau
    cpschau committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    517db86 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. add phas-eout to config

    @cpschau
    cpschau committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    5b1603a View commit details
    Browse the repository at this point in the history

  2. add techcolor for unsustainable bioliquids

    @cpschau
    cpschau committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    49d30ce View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. add config parameter to disable inclusion of unsustainable bioenergy … 

    …potentials
    @cpschau
    cpschau committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    e048e3e View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    62173b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. add biomass to params

    @cpschau
    cpschau committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d5b0963 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into unsus_biomass

    @cpschau
    cpschau committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    7065903 View commit details
    Browse the repository at this point in the history

  3. remove call of snakemake object in define_spatial

    @cpschau
    cpschau committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    13bb7ad View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Quick resolve of review part 1 (config parameters, if-clause-reductio… 

    …n, bioliquid spatial, fix bioliquid link capacity
    @cpschau
    cpschau committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    d4a890d View commit details
    Browse the repository at this point in the history

  2. Quick resolve of review part 2 (config table, helper function, fixed … 

    …build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)
    @cpschau
    cpschau committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b900c01 View commit details
    Browse the repository at this point in the history

  3. Cast of planning_horizon parameter to int type after test run

    @cpschau
    cpschau committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    deaa6cc View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. added JRC fuel costs for solid and liquid biofuels, BtL VOM

    @cpschau
    cpschau committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    49eac35 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'master' into unsus_biomass

    @cpschau
    cpschau authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    4fd1ec8 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    9b944d3 View commit details
    Browse the repository at this point in the history

  3. clean-up after master merge

    @cpschau
    cpschau committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    07d456d View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Merge branch 'master' into unsus_biomass

    @lisazeyen
    lisazeyen authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    01f0318 View commit details
    Browse the repository at this point in the history

  2. adressed review (increase threads for build_eurostat, fixed e_max_pu … 

    …of Stores, changed version of technology-data); added release note
    @cpschau
    cpschau committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    d64917f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into unsus_biomass

    @cpschau
    cpschau authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    81ded81 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    fe2975c View commit details
    Browse the repository at this point in the history