Commit Graph

747 Commits

Author SHA1 Message Date
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
AmosSchledorn
2e35bef480 rename "enums" to "definitions" and write modules in snake case 2024-08-05 15:08:05 +02:00
Philipp Glaum
b298d58d61 fix missing biomass-to-methanol due to wrong if statement 2024-08-05 13:27:43 +02:00
Philipp Glaum
975716250a add bus0 for methanol-to-kerosene process 2024-08-05 12:00:15 +02:00
AmosSchledorn
7bd0c16ddd Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-05 11:42:18 +02:00
AmosSchledorn
5362c37696 update myopic mode to heat system declarations 2024-08-05 11:27:52 +02:00
pre-commit-ci[bot]
e0b5fe9048 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-05 08:46:30 +00:00
lisazeyen
a56834e51e add switch for msw waste 2024-08-05 10:38:11 +02:00
Philipp Glaum
8579689f2a Merge remote-tracking branch 'upstream/master' into bio_methanol 2024-08-05 10:11:55 +02:00
Philipp Glaum
acb0a8d7af get methanol to kerosene cost form technology data 2024-08-05 10:08:04 +02:00
pre-commit-ci[bot]
6b924ecfb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
3ccdde3467 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:14:31 +02:00
AmosSchledorn
e5152897e1 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-08-02 17:03:51 +02:00
AmosSchledorn
bbf64a2fde Refactor module structure 2024-08-02 17:03:34 +02:00
pre-commit-ci[bot]
f58322c3e5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:02:11 +00:00
lisazeyen
b62db80435 fix bug with e_max_pu 2024-08-02 17:01:22 +02:00
pre-commit-ci[bot]
3149bfd926 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 14:47:24 +00:00
lisazeyen
69c6a4dca4 set e_max_pu to force municipal waste to be used 2024-08-02 16:45:57 +02:00
AmosSchledorn
318e05c9fb refactor naming 2024-08-02 16:29:54 +02:00
lisazeyen
68e9593b01 merge master 2024-08-02 15:58:01 +02:00
AmosSchledorn
4a6dd2fe33 fix naming bugs 2024-08-02 15:56:37 +02:00
pre-commit-ci[bot]
e28c66e43c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
2d79673d5e merge master 2024-08-02 15:23:35 +02:00
lisazeyen
eb81cfb714 change units from EJ->TWh and clean up 2024-08-02 15:13:47 +02:00
lisazeyen
8c5cd4be83
Merge branch 'master' into becc_energy_penalty 2024-08-02 14:35:01 +02:00
pre-commit-ci[bot]
c7a186863e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 12:07:18 +00:00
lisazeyen
8bfca9ce69 enable electrobiofuels also without biomass spatially resolved 2024-08-02 14:05:42 +02:00
lisazeyen
8efa832f95 Merge remote-tracking branch 'origin' into ebiofuels 2024-08-02 13:39:02 +02:00
lisazeyen
648ea20ec1
Merge branch 'master' into msw_incineration 2024-08-02 13:34:31 +02:00
pre-commit-ci[bot]
de3f679f33 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-01 15:54:24 +00:00
lisazeyen
b2d346f02c some simplifications 2024-08-01 17:47:21 +02:00