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

Add energy import options #620

Closed
wants to merge 431 commits into from
Closed

Add energy import options #620

wants to merge 431 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 14, 2023

  1. plot resources: powerplants

    @fneum
    fneum committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    a4c368a View commit details
    Browse the repository at this point in the history

  2. plot resources: salt caverns unclustered

    @fneum
    fneum committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    1906be9 View commit details
    Browse the repository at this point in the history

  3. plot resources: salt caverns clustered

    @fneum
    fneum committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    7a1c84b View commit details
    Browse the repository at this point in the history

  4. plot resources: biomass potentials

    @fneum
    fneum committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    f2d2440 View commit details
    Browse the repository at this point in the history

  5. plot resources: add collection rule

    @fneum
    fneum committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    1432703 View commit details
    Browse the repository at this point in the history

  6. [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 14, 2023
    Configuration menu
    Copy the full SHA
    ba44b81 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. merge master

    @fneum
    fneum committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    fb2c381 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. bugfix: safe aggregation of cluster heat buses (cf. pandas-dev/pandas… 

    …#54161)
    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    8595f78 View commit details
    Browse the repository at this point in the history

  2. separate configs for methanol_reforming w/wo CC

    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    e049563 View commit details
    Browse the repository at this point in the history

  3. endogenous_hvdc_imports: align calculation of efficiencies

    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    4f6c58b View commit details
    Browse the repository at this point in the history

  4. prepare_sector_network: skip unnecessary geocoding

    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    60c618e 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 Aug 19, 2023
    Configuration menu
    Copy the full SHA
    e0eae24 View commit details
    Browse the repository at this point in the history

  6. methanol-to-kerosene: add carrier

    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    d65501d View commit details
    Browse the repository at this point in the history

  7. cluster_heat_buses: avoid error with duplicate index

    @fneum
    fneum committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    b0dd551 View commit details
    Browse the repository at this point in the history

  8. [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 19, 2023
    Configuration menu
    Copy the full SHA
    270a012 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. tsam: improve logging of segmentation clustering

    @fneum
    fneum committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    41fb6a3 View commit details
    Browse the repository at this point in the history

  2. prepare_sector_network: remove duplicate methanol steam reforming

    @fneum
    fneum committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    310f09c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. bugfix: cluster heat buses, pd.Series.sum can cause problems with tim… 

    …e-dependent data
    @fneum
    fneum committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7c0b6ff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'import-trial' of github.com:pypsa/pypsa-eur into import… 

    …-trial
    @fneum
    fneum committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    f9e1da9 View commit details
    Browse the repository at this point in the history

  3. increase memory requirements of prepare_sector_network due to segment… 

    …ation clustering
    @fneum
    fneum committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    b8d8127 View commit details
    Browse the repository at this point in the history

  4. env: update dependency versions

    @fneum
    fneum committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    603e9a4 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge remote-tracking branch 'origin/master' into import-trial

    @fneum
    fneum committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    fa74ddb 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 24, 2023
    Configuration menu
    Copy the full SHA
    2fddbff View commit details
    Browse the repository at this point in the history

  3. consider grid connection costs for endogenous hvdc import

    @fneum
    fneum committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    232ac83 View commit details
    Browse the repository at this point in the history

  4. add future links for import data

    @fneum
    fneum committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    bec727f View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. add option to set maximum capacity of HVDC import links

    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    2580aaa View commit details
    Browse the repository at this point in the history

  2. consider maximum RES potential in exporting countries

    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    590eea0 View commit details
    Browse the repository at this point in the history

  3. add option to set maximum capacity of import links/generators

    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    474415d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'import-trial' of github.com:pypsa/pypsa-eur into import… 

    …-trial
    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5168987 View commit details
    Browse the repository at this point in the history

  5. add option to consider waste heat from Sabatier in DH network

    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    51e288b View commit details
    Browse the repository at this point in the history

  6. make waste heat recovery of electrolysis the default

    @fneum
    fneum committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    afb99a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. tech_colors for when cluster_heat_buses is activated

    @fneum
    fneum committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    bf4399a View commit details
    Browse the repository at this point in the history

  2. plot_balance_timeseries: initial version

    @fneum
    fneum committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    448cba5 View commit details
    Browse the repository at this point in the history

  3. add missing import_config

    @fneum
    fneum committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    635dd68 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. plot_heatmap: initial version

    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    8ea7ba8 View commit details
    Browse the repository at this point in the history

  2. plot_network: remove function plot_map_without()

    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    c052246 View commit details
    Browse the repository at this point in the history

  3. plot_network: remove function plot_series() 

    This function is superseded by plot_balance_timeseries rule.
    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    ead390b View commit details
    Browse the repository at this point in the history

  4. plot_network: split into separate scripts for power, hydrogen, gas

    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    2b6f169 View commit details
    Browse the repository at this point in the history

  5. plot_network: multiext() for network plots

    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    ff99719 View commit details
    Browse the repository at this point in the history

  6. plot_network: allocate required params

    @fneum
    fneum committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    67b9bd4 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. plot_import_options: initial version

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    a39cc41 View commit details
    Browse the repository at this point in the history

  2. prepare_sector_network: set p_nom_max for imports

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    ae8c826 View commit details
    Browse the repository at this point in the history

  3. do not consider entrypoints from RU or BY for pipeline imports

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    69b0239 View commit details
    Browse the repository at this point in the history

  4. import p_nom_max formatting

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    87916b5 View commit details
    Browse the repository at this point in the history

  5. prepare release 0.8.1

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    9c93a77 View commit details
    Browse the repository at this point in the history

  6. plot_power_network: also assign locations to buses

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    088d40f View commit details
    Browse the repository at this point in the history

  7. remove outdated localrule definition of copy_conda_env

    @fneum
    fneum committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    7bfed3b View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. lossy_bidirectional_links: set length of reversed lines to 0 to avoid… 

    … double counting in line volume limit
    @fneum
    fneum committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    4a82399 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. biomass_boiler: add pelletizing cost

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    327d437 View commit details
    Browse the repository at this point in the history

  2. biomass upgrading: include biogas plant costs and add option to captu… 

    …re CO2
    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    4ca3d0f View commit details
    Browse the repository at this point in the history

  3. add option for electrobiofuels

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    9629b9a View commit details
    Browse the repository at this point in the history

  4. separate configs for BtL and BtMeOH w/wo CC

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    d1ccc13 View commit details
    Browse the repository at this point in the history

  5. clean up format of biogas upgrading with CC and electrobiofuels

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    7650ccd View commit details
    Browse the repository at this point in the history

  6. bugfix: electrobiofuels bus numbering

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    bc9ca8f View commit details
    Browse the repository at this point in the history

  7. bugfix: amend biogas_to_gas_cc to spatial namespace if gas is regiona… 

    …lly resolved
    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    b331f60 View commit details
    Browse the repository at this point in the history

  8. separate configs for bioSNG w/wo CC

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    43db2a6 View commit details
    Browse the repository at this point in the history

  9. bugfix: allow meoh-to-power ccgt_cc run without ccgt

    @fneum
    fneum committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2b312c8 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. bugfix: electrobiofuels ensure oil carrier exists

    @fneum
    fneum committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    c1e98f6 View commit details
    Browse the repository at this point in the history

  2. bugfix: add unit conversion from tHBI to tSteel (inconsequential)

    @fneum
    fneum committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    e505e6a View commit details
    Browse the repository at this point in the history

  3. bugfix: optimize European DRI+EAF capacities capped locationally to c… 

    …urrent capacities to allow for competition with imports
    @fneum
    fneum committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    baec3aa View commit details
    Browse the repository at this point in the history

  4. add tech_color biogas to gas CC

    @fneum
    fneum committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    8fb0a91 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. plot_capacity_factors: first version

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    8e20f64 View commit details
    Browse the repository at this point in the history

  2. plot_choropleth_prices: first version

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    417bcd7 View commit details
    Browse the repository at this point in the history

  3. plot_choropleth_capacities: first version

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    c138345 View commit details
    Browse the repository at this point in the history

  4. plot_balance_timeseries: tidy code

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    d1132f7 View commit details
    Browse the repository at this point in the history

  5. plot_choropleth*: move into subdirectories

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    4d208ab View commit details
    Browse the repository at this point in the history

  6. plot_heatmap: ensure directory exists

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    32c0c74 View commit details
    Browse the repository at this point in the history

  7. plot_choropleth_potential_used: first version

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    752d66f View commit details
    Browse the repository at this point in the history

  8. plot_choropleth_demand: first version

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    1602415 View commit details
    Browse the repository at this point in the history

  9. plot.smk: formatting

    @fneum
    fneum committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    a090529 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. endogenous_steel: add config options for process flexibility and relo… 

    …cation#
    @fneum
    fneum committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    d8b284c View commit details
    Browse the repository at this point in the history

  2. energy_import_limit: consider steel in import volume limit by using 2… 

    ….1 MWh/t energy content of iron as proxy
    @fneum
    fneum committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    69cc059 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. add option for haber-bosch waste heat

    @fneum
    fneum committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    c099613 View commit details
    Browse the repository at this point in the history

  2. reactivate co2 vent by default 

    this is to prevent negative marginal prices for the bus co2 stored
    @fneum
    fneum committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    120591a View commit details
    Browse the repository at this point in the history

  3. plot_import_shares: initial version

    @fneum
    fneum committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2a6d8f9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. plot_import_world_map: initial version

    @fneum
    fneum committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    dff8cfe View commit details
    Browse the repository at this point in the history

  2. add option to specify minimum part load for methanation

    @fneum
    fneum committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    979588b View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. update import option colors

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    993e045 View commit details
    Browse the repository at this point in the history

  2. plot_import_world_map: stylistic updates, include Namibia

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    55d09ae View commit details
    Browse the repository at this point in the history

  3. prepare_sector_network: hanlde 'NA' for namibia

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    23607dc View commit details
    Browse the repository at this point in the history

  4. add options 'nowasteheat' and 'nobiogascc' to sector_opts wildcard

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    51747b5 View commit details
    Browse the repository at this point in the history

  5. switch to Helvetica as default font

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    ce85ed1 View commit details
    Browse the repository at this point in the history

  6. plot_import_network: initial version

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8cc6764 View commit details
    Browse the repository at this point in the history

  7. choropleth_capacity_factors: ensure directory exists

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    19df04d View commit details
    Browse the repository at this point in the history

  8. plot_import_options: adjust borders

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    5d33720 View commit details
    Browse the repository at this point in the history

  9. plot: minor formatting changes

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    e63a6ca View commit details
    Browse the repository at this point in the history

  10. plot_import_shares: add minor ticks

    @fneum
    fneum committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8a4f2a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. import_links: ensure to drop potential duplicate connections

    @fneum
    fneum committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    2b976ba View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. add collection rules for plotting scripts

    @fneum
    fneum committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    b925c02 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. update import options plotting (stripplot)

    @fneum
    fneum committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    8f46ba3 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. plot_import_shares: add import mix as subplot

    @fneum
    fneum committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    0c1274a View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. add wildcard options nosteelrelocation

    @fneum
    fneum committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    a576120 View commit details
    Browse the repository at this point in the history

  2. lossy_bidirectional_links: use original length for loss calculation

    @fneum
    fneum committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    85882fe View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. build_pop_weighted_energy: don't reduce district heat share 

    Previously the DH share was being multiplied by the population
weighting, reducing the DH share with multiple nodes.
    @nworbmot
    nworbmot committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    6417c7a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. move building of daily heat profile to its own script 

    Previously this was handled inside prepare_sector_network.py.
    @nworbmot
    nworbmot committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    4560338 View commit details
    Browse the repository at this point in the history

  2. build_energy_totals: output district heat share to separate file

    @nworbmot
    nworbmot committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    15488ed View commit details
    Browse the repository at this point in the history

  3. move calculation of district heating share to its own script 

    Now the script build_district_heat_share.py does what the old function
create_nodes_for_heating() in prepare_sector_networks.py did.

There is no need to build nodes lists for each heating sector, since
all nodes have district heating now.
    @nworbmot
    nworbmot committed Jan 15, 2024
    4 Configuration menu
    Copy the full SHA
    0022a88 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. only add district heating (DH) for nodes with non-zero DH share

    @nworbmot
    nworbmot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    63f393e View commit details
    Browse the repository at this point in the history

  2. move building of distribution of existing heating to own script 

    This makes the distribution of existing heating to urban/rural,
residential/services and spatially more transparent.
    @nworbmot
    nworbmot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    88f6122 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. existing_heating: bugfix, missing Albania due to spacing error

    @nworbmot
    nworbmot committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b2539a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. solve_network: make sure infeasibilities are printed properly 

    Without this formatting, there is an error adding a string to a list.
    @nworbmot
    nworbmot committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    2cc816d View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Update scripts/base_network.py 

    Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
    @fneum @FabianHofmann
    fneum and FabianHofmann committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    1ee4bf2 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. correctly source the existing heating technologies for buildings 

    The source URL has changed. It represents the year 2012 and is only
for buildings, not district heating. So the capacities for urban
central are now set to zero from this source.
    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    2807811 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ariadne2' of github.com:PyPSA/pypsa-eur into ariadne2

    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    720b0e7 View commit details
    Browse the repository at this point in the history

  3. for existing heating use new default_heating_lifetime 

    This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.

Now existing boilers are smoothly distributed across 20 years.
    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    8db5603 View commit details
    Browse the repository at this point in the history

  4. add new default to overdimension heating in individual buildings 

    This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.

The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.

Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    879e94c View commit details
    Browse the repository at this point in the history

  5. separate domestic and international aviation 

    This is required so that other models can do CO2 limits on each type
of aviation separately.
    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    29e0978 View commit details
    Browse the repository at this point in the history

  6. add colours for domestic and international aviation

    @nworbmot
    nworbmot committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    b1ba64a View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. fix whitespace

    @lindnemi
    lindnemi committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e9be203 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. changes to allow german chp plants to be added as custom powerplant .csv

    @toniseibold
    toniseibold committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    16ff6c5 View commit details
    Browse the repository at this point in the history

  2. merge with ariadne2 branch

    @toniseibold
    toniseibold committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    87f3152 View commit details
    Browse the repository at this point in the history

  3. mock snakemake for pypsa-eur as submodule

    @toniseibold
    toniseibold committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    8ed9981 View commit details
    Browse the repository at this point in the history

  4. minor revert

    @toniseibold
    toniseibold committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    9bd9135 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 Jan 31, 2024
    Configuration menu
    Copy the full SHA
    07430b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Revert "add colours for domestic and international aviation" 

    This reverts commit b1ba64a.
    @nworbmot
    nworbmot committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    276a79c View commit details
    Browse the repository at this point in the history

  2. Revert "separate domestic and international aviation" 

    This reverts commit 29e0978.
    @nworbmot
    nworbmot committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    dcae9e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. pre-commit formatting [no ci]

    @fneum
    fneum committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    cc299f9 View commit details
    Browse the repository at this point in the history

  2. update git-blame-ignore-revs to exclude autoformat

    @fneum
    fneum committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    7c0c843 View commit details
    Browse the repository at this point in the history

  3. add KWKs with the corresponding efficiencies from Triebs et al.

    @toniseibold
    toniseibold committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    2c67142 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. cluster_gas_network: generalise so it can be used elsewhere

    @fneum
    fneum committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    747dd52 View commit details
    Browse the repository at this point in the history

  2. allow mock_snakemake to run in submodule setup

    @fneum
    fneum committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    5880642 View commit details
    Browse the repository at this point in the history

  3. lossy_bidirectional_links: allow to specify subset of links

    @fneum
    fneum committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    f1420e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. minor change to use the custom_powerplants parameters

    @toniseibold
    toniseibold committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    19e9867 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Merge branch 'master' into ariadne2

    @fneum
    fneum committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    c00390e View commit details
    Browse the repository at this point in the history

  2. add logs to plot_*_network rules

    @fneum
    fneum committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    f124520 View commit details
    Browse the repository at this point in the history

  3. fix wrong merge decision - code block was removed on purpose

    @fneum
    fneum committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    70f4f1d View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. implement statistics post processing for csv creation and plotting.

    @p-glaum
    p-glaum committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e2bd392 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:PyPSA/pypsa-eur into improve-plot… 

    …ting-routine
    @p-glaum
    p-glaum committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    5718877 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ariadne2' into de_chp

    @fneum
    fneum committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    9c19451 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 Feb 9, 2024
    Configuration menu
    Copy the full SHA
    1d77dc0 View commit details
    Browse the repository at this point in the history

  5. bugfix: coal emissions for industry weren't tracked 

    Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
    @nworbmot
    nworbmot committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b67b025 View commit details
    Browse the repository at this point in the history

  6. limit changes to add_existing_baseyear

    @fneum
    fneum committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    df1e273 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'de_chp' of github.com:PyPSA/pypsa-eur into de_chp

    @fneum
    fneum committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    53a0cc8 View commit details
    Browse the repository at this point in the history

  8. bugfix: make sure coal demand is there with regional demand

    @nworbmot
    nworbmot committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6dbb395 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. MaStR CHP revision

    @fneum
    fneum committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    03e82d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ariadne2' into de_chp

    @fneum
    fneum committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    53e52ba View commit details
    Browse the repository at this point in the history

  3. [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 Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3553685 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. add release note and documentation

    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    ba11c2b View commit details
    Browse the repository at this point in the history

  2. change statistics script name

    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    5b2cbcd View commit details
    Browse the repository at this point in the history

  3. simplify statistics plotting

    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4702f69 View commit details
    Browse the repository at this point in the history

  4. improve and clean-up statistic plots

    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    0e734fd View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into improve-plotting-… 

    …routine
    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d537f67 View commit details
    Browse the repository at this point in the history

  6. revert changes in STATISTICS_BARPLOTS

    @p-glaum
    p-glaum committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    b3ab9bb View commit details
    Browse the repository at this point in the history

  7. bugfix: include all countries in ammonia production resource 

    This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.

No other downstream scripts are affected by this change.
    @nworbmot
    nworbmot committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    b300681 View commit details
    Browse the repository at this point in the history

  8. bugfix: correct units of subtracted chlorine and methanol 

    in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
    @nworbmot
    nworbmot committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    882d52f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. cluster nice names as well

    @lindnemi
    lindnemi committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    cdbe0f5 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 Feb 13, 2024
    Configuration menu
    Copy the full SHA
    0baeaaa View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. for today's industry energy demand, separate MeOH, Cl and HVC 

    I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.

This now agrees with scheme for industrial sectors tomorrow.
    @nworbmot
    nworbmot committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    13cff1e View commit details
    Browse the repository at this point in the history

  2. industrial prod: use EU28 total for denominator for distribution key 

    This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.

Without this change, industry production is overestimated when using
subsets of countries.

Or the user has to adjust the totals for industrial production
themselves.
    @nworbmot
    nworbmot committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    13412fd View commit details
    Browse the repository at this point in the history

  3. use production to determine today's energy demand for basic chemicals 

    This uniformises how demand for basic chemicals is calculated.

We also avoid unnecessary use of ammonia production separately.
    @nworbmot
    nworbmot committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    958dacb View commit details
    Browse the repository at this point in the history

  4. including oil and waste CHPs

    @toniseibold
    toniseibold committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    51a7589 View commit details
    Browse the repository at this point in the history

  5. new script to interpolate industry sector ratios today to tomorrow 

    For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.

This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
    @nworbmot
    nworbmot committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    6a65cf9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Oil CHPs are now also added to heating sector

    @toniseibold
    toniseibold committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    bca2700 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #928 from PyPSA/fix_nice_name 

    cluster nice names as well
    @lindnemi
    lindnemi committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    11bac2e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'improve-plotting-routine' of github.com:p-glaum/pypsa-e… 

    …ur into ariadne2
    @nworbmot
    nworbmot committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    bf0c1ec View commit details
    Browse the repository at this point in the history

  4. plot_statistics_single: fix read csv file when file had only single e… 

    …ntry, adjust axis label
    @p-glaum
    p-glaum committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    e7b5a0b View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge branch 'improve-plotting-routine' of github.com:p-glaum/pypsa-e… 

    …ur into ariadne2
    @nworbmot
    nworbmot committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e7fdd8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ariadne2' of github.com:PyPSA/pypsa-eur into ariadne2

    @nworbmot
    nworbmot committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    2dfca6e View commit details
    Browse the repository at this point in the history

  3. filter for German industry CHP moved to add_existing_baseyear.py

    @toniseibold
    toniseibold committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    9ae6463 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into… 

    … ariadne2
    @nworbmot
    nworbmot committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    6c34be0 View commit details
    Browse the repository at this point in the history

  2. update build_existing_heating_distribution for scenario management 

    Temporarily comment out plot_statistics until conflicts with scenario
management are sorted.
    @nworbmot
    nworbmot committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    c86d2ea View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. bug fixing

    @toniseibold
    toniseibold committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    10c0e16 View commit details
    Browse the repository at this point in the history

  2. bug fix chp DateOut query

    @toniseibold
    toniseibold committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    a460ea5 View commit details
    Browse the repository at this point in the history

  3. improvement of DateOut query for chps

    @toniseibold
    toniseibold committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    51f394e View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. adding biomass boilers to existing base network

    @toniseibold
    toniseibold committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    655bc85 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 Feb 27, 2024
    Configuration menu
    Copy the full SHA
    73dcadf View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Update scripts/add_existing_baseyear.py

    @fneum
    fneum committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d9116c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #951 from PyPSA/biomass_boilers 

    Biomass boilers
    @fneum
    fneum committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    9203081 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. change technology data version to 0.8.1

    @lisazeyen @lindnemi
    lisazeyen authored and lindnemi committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    fb85891 View commit details
    Browse the repository at this point in the history

  2. compute lifetime after grouping DateIn

    @lindnemi
    lindnemi committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    d4c3e6e View commit details
    Browse the repository at this point in the history

  3. add grouping years 1960-1975

    @lindnemi
    lindnemi committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    179ff06 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. merge master

    @fneum
    fneum committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    1a3181d View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge branch 'ariadne2' into de_chp

    @toniseibold
    toniseibold committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    72ef2d0 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 Mar 14, 2024
    Configuration menu
    Copy the full SHA
    dd0176d View commit details
    Browse the repository at this point in the history

  3. Update scripts/add_existing_baseyear.py

    @fneum
    fneum committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    572ce18 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 Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b7cec1b View commit details
    Browse the repository at this point in the history

  5. group existing capacities to the earlier grouping_year for consistenc… 

    …y with optimized capacities
    @lindnemi
    lindnemi committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d50e713 View commit details
    Browse the repository at this point in the history

  6. add more grouping years to avoid errors

    @lindnemi
    lindnemi committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ed4416c View commit details
    Browse the repository at this point in the history

  7. [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 Mar 14, 2024
    Configuration menu
    Copy the full SHA
    7ff3b87 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. various operational fixes

    @fneum
    fneum committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    c3e36ea View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. provide Path object as input to ConfigSettings

    @lindnemi
    lindnemi committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b1dc976 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Fill in missing eurostat data on domestic aviation energy demand

    @koen-vg @lindnemi
    koen-vg authored and lindnemi committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4c9243d View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. fail early on warning

    @lindnemi
    lindnemi committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    321075e View commit details
    Browse the repository at this point in the history

  2. more memory for simplify_network

    @lindnemi
    lindnemi committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3a736ba View commit details
    Browse the repository at this point in the history

  3. remove name to fix key error

    @lindnemi
    lindnemi committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9c62755 View commit details
    Browse the repository at this point in the history

  4. Revert "Fill in missing eurostat data on domestic aviation energy dem… 

    …and"

This reverts commit 4c9243d.
    @lindnemi
    lindnemi committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    a93fbcd View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. snakefile: move copy_default_files and process_run_config to helpers

    @FabianHofmann @lindnemi
    FabianHofmann authored and lindnemi committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b87d9bf View commit details
    Browse the repository at this point in the history

  2. snakefile + helpers: separate scenario and rdir getter

    @FabianHofmann @lindnemi
    FabianHofmann authored and lindnemi committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    49b28ee View commit details
    Browse the repository at this point in the history

  3. Snakefile: reinsert shutil and os functions

    @FabianHofmann @lindnemi
    FabianHofmann authored and lindnemi committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    61831e3 View commit details
    Browse the repository at this point in the history

  4. initial implementation

    @p-glaum @lindnemi
    p-glaum authored and lindnemi committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    fbd5852 View commit details
    Browse the repository at this point in the history

  5. move prefix from Snakefile to get_dir function

    @p-glaum @lindnemi
    p-glaum authored and lindnemi committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    48929e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. add check if minimum grouping year< min build year

    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6459d8d View commit details
    Browse the repository at this point in the history

  2. adjust valid_grouping_years 

    change sign, split up conditions for better readibility
    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    0bfd44a View commit details
    Browse the repository at this point in the history

  3. Add release note for serendipitous bugfix

    @lindnemi
    lindnemi committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    13245c3 View commit details
    Browse the repository at this point in the history

  4. rename _intervals to _years, shorten definition

    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    797e812 View commit details
    Browse the repository at this point in the history

  5. define active assets consitently

    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b0d9828 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ariadne2' into reform-existing-grouping-year-logic

    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    9968ad9 View commit details
    Browse the repository at this point in the history

  7. [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 Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ca47b3e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #967 from PyPSA/reform-existing-grouping-year-logic 

    Reform existing grouping year logic
    @lisazeyen
    lisazeyen committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    6334f3f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. allow different aviation growth factors for each investment year

    @toniseibold
    toniseibold committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8ed006a View commit details
    Browse the repository at this point in the history

  2. scaling of land transport

    @toniseibold
    toniseibold committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    de93326 View commit details
    Browse the repository at this point in the history

  3. [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 Apr 15, 2024
    Configuration menu
    Copy the full SHA
    de60ac2 View commit details
    Browse the repository at this point in the history

  4. raise Exception if scenario file is empty

    @lindnemi
    lindnemi committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    006730e View commit details
    Browse the repository at this point in the history

  5. fill nan for case of industry exclusion; adapt bus names to handle ga… 

    …s network; adapt biomass CHP index to include grouping year
    @cpschau
    cpschau committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    bef81a2 View commit details
    Browse the repository at this point in the history

  6. Warning instead of Exception

    @lindnemi
    lindnemi committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    25b03fc View commit details
    Browse the repository at this point in the history

  7. no gas boiler expansion before 2024

    @cpschau
    cpschau committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9219cb9 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. writing documentation and release notes

    @toniseibold
    toniseibold committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c9e1dff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'transport_growth' of https://github.com/PyPSA/pypsa-eur … 

    …into transport_growth
    @toniseibold
    toniseibold committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    bab4555 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/PyPSA/pypsa-eur into tran… 

    …sport_growth
    @toniseibold
    toniseibold committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    4a136d5 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. adjusted CHP indices to avoid NaN efficiencies; removed gas boiler re… 

    …strictions
    @cpschau
    cpschau committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    df6707d View commit details
    Browse the repository at this point in the history

  2. patch from @pglaum

    @lindnemi
    lindnemi committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d90f395 View commit details
    Browse the repository at this point in the history

  3. [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 Apr 17, 2024
    Configuration menu
    Copy the full SHA
    77ff7df View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into ariadne2

    @lindnemi
    lindnemi committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    ad40779 View commit details
    Browse the repository at this point in the history

  5. fix biogas and biomass

    @lindnemi
    lindnemi committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    7fd9014 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'ariadne2' into transport_growth

    @lindnemi
    lindnemi committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    69ecf05 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 Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3367963 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ariadne2' into transport_growth

    @lindnemi
    lindnemi committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3d49935 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 Apr 19, 2024
    Configuration menu
    Copy the full SHA
    ae7948a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1026 from PyPSA/transport_growth 

    Transport growth
    @lindnemi
    lindnemi committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    bb4ebed View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'master' into import-trial

    @toniseibold
    toniseibold committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f040afe View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. allow excluding files from shared_resources

    @toniseibold
    toniseibold committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a4dc874 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 May 3, 2024
    Configuration menu
    Copy the full SHA
    911f75e View commit details
    Browse the repository at this point in the history

  3. documentation

    @toniseibold
    toniseibold committed May 3, 2024
    Configuration menu
    Copy the full SHA
    8439d59 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. add WDPA, convert to 2020EUR, plot adjustments

    @fneum
    fneum committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f57b3b9 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. rearrange config settings under 'run: shared_resources:'

    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    ccbefe2 View commit details
    Browse the repository at this point in the history

  2. extend release notes [no ci]

    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    01eba77 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1050 from PyPSA/exclude_shared_resources 

    allow excluding files from shared_resources
    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    8a45e66 View commit details
    Browse the repository at this point in the history

  4. fix missed renaming of mode to policy

    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    16b3175 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ariadne2' into de_chp

    @lindnemi
    lindnemi committed May 13, 2024
    Configuration menu
    Copy the full SHA
    65826d4 View commit details
    Browse the repository at this point in the history

  6. rebasing to current master

    @toniseibold
    toniseibold committed May 13, 2024
    Configuration menu
    Copy the full SHA
    477f0c6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'import-trial' of https://github.com/PyPSA/pypsa-eur int… 

    …o import-trial
    @toniseibold
    toniseibold committed May 13, 2024
    Configuration menu
    Copy the full SHA
    ee4cc08 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'ariadne2' into de_chp

    @lindnemi
    lindnemi committed May 13, 2024
    Configuration menu
    Copy the full SHA
    6c95595 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'ariadne2' into plot-statistics-fix

    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    1e4aa63 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1032 from PyPSA/plot-statistics-fix 

    patch for statistics plotting from @p-glaum
    @fneum
    fneum committed May 13, 2024
    Configuration menu
    Copy the full SHA
    02bd53f View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge remote-tracking branch 'origin/ariadne2' into import-trial

    @toniseibold
    toniseibold committed May 14, 2024
    Configuration menu
    Copy the full SHA
    1c0df98 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'master' into ariadne2

    @lindnemi
    lindnemi committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cb8ee0d View commit details
    Browse the repository at this point in the history

  2. renaming only power generating biomass plants and moving the chps to … 

    …electricity function
    @toniseibold
    toniseibold committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c11b17a View commit details
    Browse the repository at this point in the history

  3. [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 May 23, 2024
    Configuration menu
    Copy the full SHA
    568b16e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. improve ordering of RuntimeErrors

    @lindnemi
    lindnemi committed May 24, 2024
    Configuration menu
    Copy the full SHA
    dfb27b8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ariadne2

    @lindnemi
    lindnemi committed May 24, 2024
    Configuration menu
    Copy the full SHA
    5d36ed7 View commit details
    Browse the repository at this point in the history

  3. deleting acient code

    @toniseibold
    toniseibold committed May 24, 2024
    Configuration menu
    Copy the full SHA
    3ac586e View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/ariadne2' into de_chp

    @lindnemi
    lindnemi committed May 24, 2024
    Configuration menu
    Copy the full SHA
    051bf57 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 May 24, 2024
    Configuration menu
    Copy the full SHA
    65153f5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #907 from PyPSA/de_chp 

    Adding CHPs to the existing heating baseyear
    @lindnemi
    lindnemi committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0a227e5 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge branch 'master' into ariadne2

    @lindnemi
    lindnemi committed May 27, 2024
    Configuration menu
    Copy the full SHA
    962e5d4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. adding hbi and making it work in ariadne workflow

    @toniseibold
    toniseibold committed May 31, 2024
    Configuration menu
    Copy the full SHA
    469be05 View commit details
    Browse the repository at this point in the history

  2. merging latest ariadne2 branch into import-trial

    @toniseibold
    toniseibold committed May 31, 2024
    Configuration menu
    Copy the full SHA
    749f5f7 View commit details
    Browse the repository at this point in the history

  3. [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 May 31, 2024
    Configuration menu
    Copy the full SHA
    81ea082 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge remote-tracking branch 'origin/master' into import-trial

    @toniseibold
    toniseibold committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    69f4204 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 Jun 6, 2024
    Configuration menu
    Copy the full SHA
    dfdcfc8 View commit details
    Browse the repository at this point in the history