Commit Graph

777 Commits

Author SHA1 Message Date
Lukas Trippe
24e0ddd5a6
prepare for new n.add (#1316)
* prepare for new `n.add`

* Update scripts/prepare_sector_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-25 15:45:32 +02:00
Fabian Neumann
8ed7654294
myopic: ensure all links with capital costs have lifetime (#1319)
* myopic: ensure all links with capital costs have lifetime

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-23 15:53:11 +02:00
Fabian Neumann
343aba1db9
Methanol-to-kerosene: correct efficiency and add VOM (#1320)
* MtK: add VOM

* MtK: fix methanol input efficiency
2024-09-23 15:52:57 +02:00
Fabian Neumann
e2be4d730e
bugfix: account for kerosene emissions in methanol-to-kerosene link (#1317)
* bugfix: account for kerosene emissions in methanol-to-kerosene link

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-23 11:52:54 +02:00
Fabian Neumann
08548dc738 remove unnecessary [-4:] from snakemake.wildcards.planning 2024-09-17 07:39:23 +02:00
Fabian Neumann
d8f8a828f9
options: biosng_cc, biomass_to_liquid_cc, 98% capture rate Allam gas,… (#1298)
* options: biosng_cc, biomass_to_liquid_cc, 98% capture rate Allam gas, avoid option.get

* fix duplicated bus port
2024-09-16 15:04:24 +02:00
Philipp Glaum
df71b1a64c
remove MtO as long as there is no HVC bus (#1299) 2024-09-16 15:02:42 +02:00
Fabian Neumann
013b705ee4
Clustering: build renewable profiles and add all assets after clustering (#1201)
* Cluster first: build renewable profiles and add all assets after clustering

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

for more information, see https://pre-commit.ci

* correction: pass landfall_lengths through functions

* assign landfall_lenghts correctly

* remove parameter add_land_use_constraint

* fix network_dict

* calculate distance to shoreline, remove underwater_fraction

* adjust simplification parameter to exclude Crete from offshore wind connections

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

for more information, see https://pre-commit.ci

* remove unused geth2015 hydro capacities

* removing remaining traces of {simpl} wildcard

* add release notes and update workflow graphics

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2024-09-13 15:37:01 +02:00
lisazeyen
1b97a16bfa
add option to vary parameter (#1244)
* add option to vary parameter

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

for more information, see https://pre-commit.ci

* remove logger.info

* adjust maybe_adjust_costs_and_potentials

* update configtables

* revert removed cost_factor

* reset build_energy_totals to master

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

for more information, see https://pre-commit.ci

* add release notes

* Revert "revert removed cost_factor"

This reverts commit b7154f046954bd6de34c2910f3f9f52b44d5f233.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-12 16:02:10 +02:00
cpschau
65054ae903
Simplify integration of unsustainable solid biomass (#1275)
* remove extra bus and link; remove redundant addition of oil carrier_bus

* remove redundant addition of oil carrier buses

* changed PyPSA requirement in envs/environment.yaml
2024-09-11 17:20:00 +02:00
lisazeyen
8e068c8a67
Merge branch 'master' into add_methanol_techs 2024-09-11 15:34:28 +02:00
lisazeyen
c017211700 use snakemake.params 2024-09-11 10:16:09 +02:00
Philipp Glaum
6cb68b191a address Lisa's comments 2024-09-11 09:32:42 +02:00
lisazeyen
086beb7bd7
Merge branch 'master' into fix_building_fec 2024-09-10 18:29:38 +02:00
lisazeyen
424ae3b5e6
Merge branch 'master' into add_methanol_techs 2024-09-10 16:51:52 +02:00
cpschau
8a0b6ba911
Hot fix: Rename reindex transport costs for unsustainable biomass (#1271)
* reindex transport costs for unsus biomass

* change index of potential dataframe for unsustainable solid potentials
2024-09-10 16:21:14 +02:00
Philipp Glaum
3f4a7a1e1e Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-09-10 13:52:42 +02:00
lisazeyen
d9c872031c
Merge branch 'master' into fix_building_fec 2024-09-09 18:32:09 +02:00
pre-commit-ci[bot]
5465d8cc75 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-09 16:28:09 +00:00
Fabian Hofmann
0423366db6
prepare_sector_network: fix e_max_pu in unsustainable biomass stores (#1266) 2024-09-09 14:14:16 +02:00
cpschau
53f84f7eea
Follow-Up: Unsustainable Biomass (#1254)
* add oil bus; extend global biomass limit; set unsustainable potentials to zero for overnight

* keep sustainable potentials for switzerland

* remove potential distinction for overnight; additional global constraint for unsustainable solid biomass

* add unsustainable generator suffix

* added unsustainable solid biomass bus; changed global constraints to equality; removed forced emptying of unsustainable solid biomass store

* restored equality constraint for sustainable solid biomass; restored forced emptying of unsustainable store

* remove directory change for debugger

* added tech_color for unsustainable solid biomass

* modified spatial namespaces and removed suffixes
2024-09-08 11:59:37 +02:00
Amos Schledorn
4a3e7924d2
Make overdimensioning factor for heating systems specific to central/decentral heating (#1259)
* chore: make overdim_factor heat-system-specific

* doc: update configtables

* doc: update release notes

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

for more information, see https://pre-commit.ci

* fix: read overdimensioning factor for industrial oil boilers from options

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-08 11:50:25 +02:00
Philipp Glaum
e940e4b73a
Merge branch 'master' into fix_msw 2024-09-04 08:26:50 +02:00
Michael Lindner
34f5d2eb68 bugfix missing oil generator: remove else clause 2024-09-03 16:37:22 +02:00
Philipp Glaum
7b98afc85a fix if condition to add msw 2024-09-03 16:02:28 +02:00
Philipp Glaum
30bcddb66a prepare_sector_networks: account correctely for msw co2
environment.yaml: add license comment
2024-09-03 14:10:20 +02:00
Tom Brown
0bcb215597 use JRC-IDEES thermal energy service instead of FE for buildings
This change consists of:

- reading the final energy (FE) to thermal energy service (TES)
  efficiency for each each country, seperately for gas and oil (this
  efficiency represents e.g. the losses in older non-condensing
  boilers)

- using TES instead of FE for the n.loads, so that it is pure energy
  service instead of including losses in legacy equipment

- using the stored efficiencies for baseyear equipment in
  add_existing_baseyear

In the baseyear (e.g. 2020) this should have no effect on FE, since
the reduction to TES is conpensated by the lower efficiencies of
existing equipment.

In the future (e.g. 2050) this leads to a reduction in heating demand,
since new equipment is more efficient than existing.
2024-09-02 19:32:13 +02:00
Fabian Neumann
56f2b581bf
Add emissions and fuel consumption from fuel refinieries (#1253)
* Add emissions and fuel consumption from fuel refinieries

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 18:06:41 +02:00
Philipp Glaum
51c5e39e2d cleanup 2024-08-30 16:54:55 +02:00
Philipp Glaum
cae63a3578 prepare_sector_network: get tech data for allam cycle from data base 2024-08-30 16:47:46 +02:00
Philipp Glaum
6a76aa4c6c Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-08-30 16:33:29 +02:00
Philipp Glaum
d2f8162d7b
prepare_sector_network: correct if statement (#1252) 2024-08-30 15:56:21 +02:00
Fabian Neumann
88d28de3a1
resolve Kosovo (XK) as separate country (#1249)
* resolve Kosovo (XK) as separate country

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

for more information, see https://pre-commit.ci

* fillna

* add missing key in data/existing_infrastructure/existing_heating_raw.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 15:36:03 +02:00
Philipp Glaum
4f8d583d38
prepare_sector_network: fix municipal waste transport links (#1250) 2024-08-30 13:34:06 +00:00
Philipp Glaum
bc09f1df77
prepare_sector_network.py: add oil bus whenever industry is added (#1247)
* prepare_sector_network.py: add oil bus whenever industry is added

* prepare_sector_network: Move added oil and methnaol buses to top of "add_industry", and add oil buses where used in "add_biomass"
2024-08-30 12:06:11 +02:00
Philipp Glaum
7665de61d3 prepare_sector_network: convert e_max_pu timeseries for msw stores to pd.DataFrame. 2024-08-29 15:34:44 +02:00
Philipp Glaum
25f6c014e7 adress review comments 2024-08-26 15:15:02 +02:00
Fabian Neumann
a357ba11e9
add capital cost for liquid carbonaceous fuel stores (closes #489) (#1234)
* add capital cost for liquid carbonaceous fuel stores (closes #489)

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

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-26 11:21:15 +02:00
Philipp Glaum
0b0de7ba77 Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-08-26 09:12:55 +02:00
pre-commit-ci[bot]
18759053f0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-16 11:42:20 +00:00
lisazeyen
02fec080ee
Merge branch 'master' into country-specific-dh-forward-temperatures 2024-08-16 13:40:59 +02:00
Markus Millinger
ebbb75491b
Solid biomass to hydrogen process (#1213)
* Added solid biomass to hydrogen, bioH2, process

* Add doc for new config

* add release notes

* enable bioH2 also without biomass spatially resolved

* Update doc/release_notes.rst

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

* Added overnight cost

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-16 13:18:10 +02:00
Philipp Glaum
d14ced2549 cleanup 2024-08-12 10:43:13 +02:00
Philipp Glaum
5c577b6290 remove methanol transport because it has no impact 2024-08-12 10:38:01 +02:00
Philipp Glaum
77385721b6 Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-08-12 09:52:25 +02:00
AmosSchledorn
6c9bcae6f0 Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures 2024-08-08 17:20:23 +02:00
pre-commit-ci[bot]
cfed67f794 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-08 14:46:09 +00:00
AmosSchledorn
69c6ea0e12 use relative imports of scripts.definitions where possible 2024-08-07 17:55:29 +02:00
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials (#1139)
* add columns to potential df defined by difference to eurostat

* add network components

* add unsustainable bioliquids

* replaced stores by generators, still infeasible

* remove municipal waste

* remove separate treatment of waste from biomass potential calculation

* phase out unsustainble biomass potentials

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

for more information, see https://pre-commit.ci

* phase-out unsustainable bioliquids

* remove waste_incineration from build_sector rule

* multiple potential calculation for different planning horizons

* raised costs of unsustainable solid biomass

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

for more information, see https://pre-commit.ci

* stores instead of generators

* change snakemake inputs

* add phas-eout to config

* add techcolor for unsustainable bioliquids

* add config parameter to disable inclusion of unsustainable bioenergy potentials

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

for more information, see https://pre-commit.ci

* add biomass to params

* remove call of snakemake object in define_spatial

* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity

* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)

* Cast of planning_horizon parameter to int type after test run

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

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

for more information, see https://pre-commit.ci

* clean-up after master merge

* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-08-07 15:52:00 +00:00
AmosSchledorn
0e8fb80bc4 clean up, improve docs 2024-08-05 16:11:18 +02:00